steven/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: add some new flake inputs for other nixpkgs

Browse source 
lix: remove lix module
ghc: fix nixvim installGhc trace
libreoffice: switch to binary distribution
This commit is contained in:
Zhongheng Liu 2024-11-24 13:08:08 +02:00
commit 6eb3bb0b70
Signed by: steven
GPG key ID: 805A28B071DAD84B
5 changed files with 45 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

17
flake.nix
View file

@ -3,7 +3,9 @@
inputs = { inputs = {
# Nixpkgs # Nixpkgs
nixpkgs-master.url = "github:nixos/nixpkgs/master";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
nixvim = { nixvim = {
url = "github:nix-community/nixvim"; url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -13,10 +15,13 @@
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
/*
lix-module = { lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz"; url =
"https://git.lix.systems/lix-project/nixos-module/archive/2.91.0.tar.gz";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
*/
stylix = {url = "github:danth/stylix";}; stylix = {url = "github:danth/stylix";};
spicetify-nix = { spicetify-nix = {
url = "github:Gerg-L/spicetify-nix"; url = "github:Gerg-L/spicetify-nix";
@ -30,7 +35,6 @@
home-manager, home-manager,
stylix, stylix,
spicetify-nix, spicetify-nix,
lix-module,
... ...
} @ inputs: let } @ inputs: let
inherit (self) outputs; inherit (self) outputs;
@ -42,7 +46,10 @@
nixosConfigurations = { nixosConfigurations = {
"${myHostName}" = nixpkgs.lib.nixosSystem { "${myHostName}" = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs;}; specialArgs = {inherit inputs outputs;};
modules = [./nixos/configuration.nix lix-module.nixosModules.default]; modules = [
./nixos/configuration.nix
#lix-module.nixosModules.default
];
}; };
}; };
@ -56,8 +63,8 @@
modules = [ modules = [
./home-manager/${stevenUserName}/home.nix ./home-manager/${stevenUserName}/home.nix
inputs.nixvim.homeManagerModules.nixvim inputs.nixvim.homeManagerModules.nixvim
inputs.stylix.homeManagerModules.stylix stylix.homeManagerModules.stylix
inputs.spicetify-nix.homeManagerModules.default spicetify-nix.homeManagerModules.default
]; ];
}; };
}; };

44
home-manager/stvnliu/hypr/hyprlock.nix
View file

@ -14,29 +14,29 @@
no_fade_in = false; no_fade_in = false;
}; };
background = [ #background = [
{ # {
path = "screenshot"; # path = "screenshot";
blur_passes = 3; # blur_passes = 3;
blur_size = 8; # blur_size = 8;
} # }
]; #];
input-field = [ #input-field = [
{ # {
size = "200, 50"; # size = "200, 50";
position = "0, -80"; # position = "0, -80";
monitor = ""; # monitor = "";
dots_center = true; # dots_center = true;
fade_on_empty = false; # fade_on_empty = false;
font_color = "rgb(202, 211, 245)"; # font_color = "rgb(202, 211, 245)";
inner_color = "rgb(91, 96, 120)"; # inner_color = "rgb(91, 96, 120)";
outer_color = "rgb(24, 25, 38)"; # outer_color = "rgb(24, 25, 38)";
outline_thickness = 5; # outline_thickness = 5;
#placeholder_text = '\'<span foreground="##cad3f5">Password...</span>'\'; # #placeholder_text = '\'<span foreground="##cad3f5">Password...</span>'\';
shadow_passes = 2; # shadow_passes = 2;
} # }
]; #];
}; };
}; };
} }

5
home-manager/stvnliu/nixvim/lsp.nix
View file

@ -32,7 +32,10 @@
}; };
# Haskell # Haskell
hls.enable = true; hls = {
enable = true;
installGhc = false;
};
# For TypeScript # For TypeScript
ts_ls.enable = true; ts_ls.enable = true;

2
home-manager/stvnliu/packages/office-programs.nix
View file

@ -5,7 +5,7 @@
... ...
}: { }: {
home.packages = with pkgs; [ home.packages = with pkgs; [
libreoffice-fresh libreoffice
kdePackages.okular kdePackages.okular
]; ];
} }

7
nixos/configuration.nix
View file

@ -21,6 +21,7 @@
environment.sessionVariables = { environment.sessionVariables = {
GDK_SCALE = config.displayScale; GDK_SCALE = config.displayScale;
FLAKE = config.myConfigLocation; FLAKE = config.myConfigLocation;
MANPAGER = "$EDITOR +Man!";
# GTK_IM_MODULE = lib.mkForce ""; # GTK_IM_MODULE = lib.mkForce "";
}; };
services.pcscd.enable = true; services.pcscd.enable = true;
@ -151,7 +152,7 @@
in { in {
settings = { settings = {
experimental-features = "nix-command flakes"; experimental-features = "nix-command flakes";
flake-registry = ""; # flake-registry = "";
nix-path = config.nix.nixPath; nix-path = config.nix.nixPath;
}; };
extraOptions = '' extraOptions = ''
@ -161,9 +162,13 @@
registry = lib.mapAttrs (_: flake: {inherit flake;}) flakeInputs; registry = lib.mapAttrs (_: flake: {inherit flake;}) flakeInputs;
nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs; nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
}; };
systemd.network.wait-online.enable = false;
networking = { networking = {
hostName = "${config.myHostName}"; hostName = "${config.myHostName}";
networkmanager.enable = true; networkmanager.enable = true;
useNetworkd = lib.mkDefault true;
useDHCP = lib.mkDefault true;
}; };
users.users = { users.users = {
"${config.myUserName}" = { "${config.myUserName}" = {