diff options
author | Minijackson <minijackson@riseup.net> | 2024-12-12 19:22:53 +0100 |
---|---|---|
committer | Minijackson <minijackson@riseup.net> | 2024-12-12 19:41:25 +0100 |
commit | 262e6ca26de0bbf7191477eb387dc06a506d16b1 (patch) | |
tree | d3e3cd73475c81b5de787795accabc239147618d | |
parent | 5cc889d066862ed881361a9cec3a593ffab53842 (diff) | |
download | nixos-config-reborn-262e6ca26de0bbf7191477eb387dc06a506d16b1.tar.gz nixos-config-reborn-262e6ca26de0bbf7191477eb387dc06a506d16b1.zip |
flake: upgrade NixOS 24.05 -> 24.11
-rw-r--r-- | common/commandline.nix | 2 | ||||
-rw-r--r-- | flake.lock | 16 | ||||
-rw-r--r-- | flake.nix | 12 | ||||
-rw-r--r-- | profiles/desktop.nix | 2 | ||||
-rw-r--r-- | templates/desktop/flake.nix | 8 | ||||
-rw-r--r-- | usecases/desktop/graphical.nix | 16 | ||||
-rw-r--r-- | usecases/desktop/graphical/gaming.nix | 2 | ||||
-rw-r--r-- | usecases/desktop/graphical/gtk.nix | 2 | ||||
-rw-r--r-- | usecases/server/jellyfin.nix | 2 |
9 files changed, 30 insertions, 32 deletions
diff --git a/common/commandline.nix b/common/commandline.nix index 2ff6291..25ab404 100644 --- a/common/commandline.nix +++ b/common/commandline.nix | |||
@@ -82,7 +82,7 @@ in { | |||
82 | cpr = "${pkgs.rsync}/bin/rsync -ah --inplace --info=progress2"; | 82 | cpr = "${pkgs.rsync}/bin/rsync -ah --inplace --info=progress2"; |
83 | }; | 83 | }; |
84 | 84 | ||
85 | programs.bash.enableCompletion = true; | 85 | programs.bash.completion.enable = true; |
86 | 86 | ||
87 | programs.less = { | 87 | programs.less = { |
88 | envVariables = { | 88 | envVariables = { |
@@ -151,16 +151,16 @@ | |||
151 | ] | 151 | ] |
152 | }, | 152 | }, |
153 | "locked": { | 153 | "locked": { |
154 | "lastModified": 1726989464, | 154 | "lastModified": 1733951536, |
155 | "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", | 155 | "narHash": "sha256-Zb5ZCa7Xj+0gy5XVXINTSr71fCfAv+IKtmIXNrykT54=", |
156 | "owner": "nix-community", | 156 | "owner": "nix-community", |
157 | "repo": "home-manager", | 157 | "repo": "home-manager", |
158 | "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", | 158 | "rev": "1318c3f3b068cdcea922fa7c1a0a1f0c96c22f5f", |
159 | "type": "github" | 159 | "type": "github" |
160 | }, | 160 | }, |
161 | "original": { | 161 | "original": { |
162 | "owner": "nix-community", | 162 | "owner": "nix-community", |
163 | "ref": "release-24.05", | 163 | "ref": "release-24.11", |
164 | "repo": "home-manager", | 164 | "repo": "home-manager", |
165 | "type": "github" | 165 | "type": "github" |
166 | } | 166 | } |
@@ -253,16 +253,16 @@ | |||
253 | }, | 253 | }, |
254 | "nixpkgs": { | 254 | "nixpkgs": { |
255 | "locked": { | 255 | "locked": { |
256 | "lastModified": 1733730953, | 256 | "lastModified": 1733808091, |
257 | "narHash": "sha256-dlK7n82FEyZlHH7BFHQAM5tua+lQO1Iv7aAtglc1O5s=", | 257 | "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", |
258 | "owner": "NixOS", | 258 | "owner": "NixOS", |
259 | "repo": "nixpkgs", | 259 | "repo": "nixpkgs", |
260 | "rev": "7109b680d161993918b0a126f38bc39763e5a709", | 260 | "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", |
261 | "type": "github" | 261 | "type": "github" |
262 | }, | 262 | }, |
263 | "original": { | 263 | "original": { |
264 | "owner": "NixOS", | 264 | "owner": "NixOS", |
265 | "ref": "nixos-24.05", | 265 | "ref": "nixos-24.11", |
266 | "repo": "nixpkgs", | 266 | "repo": "nixpkgs", |
267 | "type": "github" | 267 | "type": "github" |
268 | } | 268 | } |
@@ -2,11 +2,11 @@ | |||
2 | description = "My NixOS configurations"; | 2 | description = "My NixOS configurations"; |
3 | 3 | ||
4 | inputs = { | 4 | inputs = { |
5 | nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; | 5 | nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; |
6 | nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; | 6 | nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; |
7 | flake-utils.url = "github:numtide/flake-utils"; | 7 | flake-utils.url = "github:numtide/flake-utils"; |
8 | home-manager = { | 8 | home-manager = { |
9 | url = "github:nix-community/home-manager/release-24.05"; | 9 | url = "github:nix-community/home-manager/release-24.11"; |
10 | inputs.nixpkgs.follows = "nixpkgs"; | 10 | inputs.nixpkgs.follows = "nixpkgs"; |
11 | }; | 11 | }; |
12 | rycee-nur = { | 12 | rycee-nur = { |
@@ -42,8 +42,8 @@ | |||
42 | test = { config, ... }: { | 42 | test = { config, ... }: { |
43 | imports = [ self.nixosModules.default ]; | 43 | imports = [ self.nixosModules.default ]; |
44 | 44 | ||
45 | home-manager.users.minijackson.home.stateVersion = "24.05"; | 45 | home-manager.users.minijackson.home.stateVersion = "24.11"; |
46 | home-manager.users.root.home.stateVersion = "24.05"; | 46 | home-manager.users.root.home.stateVersion = "24.11"; |
47 | 47 | ||
48 | users.users.minijackson.initialHashedPassword = ""; | 48 | users.users.minijackson.initialHashedPassword = ""; |
49 | users.users.root.initialHashedPassword = ""; | 49 | users.users.root.initialHashedPassword = ""; |
@@ -262,8 +262,8 @@ | |||
262 | isoImage.makeEfiBootable = true; | 262 | isoImage.makeEfiBootable = true; |
263 | isoImage.makeUsbBootable = true; | 263 | isoImage.makeUsbBootable = true; |
264 | 264 | ||
265 | home-manager.users.minijackson.home.stateVersion = "24.05"; | 265 | home-manager.users.minijackson.home.stateVersion = "24.11"; |
266 | home-manager.users.root.home.stateVersion = "24.05"; | 266 | home-manager.users.root.home.stateVersion = "24.11"; |
267 | 267 | ||
268 | users.users.minijackson.initialHashedPassword = ""; | 268 | users.users.minijackson.initialHashedPassword = ""; |
269 | users.users.root.initialHashedPassword = ""; | 269 | users.users.root.initialHashedPassword = ""; |
diff --git a/profiles/desktop.nix b/profiles/desktop.nix index 6691d48..03705a3 100644 --- a/profiles/desktop.nix +++ b/profiles/desktop.nix | |||
@@ -6,7 +6,6 @@ inputs: {pkgs, ...}: { | |||
6 | users.extraUsers.minijackson.packages = with pkgs; [ | 6 | users.extraUsers.minijackson.packages = with pkgs; [ |
7 | aria2 | 7 | aria2 |
8 | tmuxp | 8 | tmuxp |
9 | taskwarrior | ||
10 | tokei | 9 | tokei |
11 | neofetch | 10 | neofetch |
12 | ffmpeg | 11 | ffmpeg |
@@ -17,7 +16,6 @@ inputs: {pkgs, ...}: { | |||
17 | aspell | 16 | aspell |
18 | aspellDicts.en | 17 | aspellDicts.en |
19 | aspellDicts.en-computers | 18 | aspellDicts.en-computers |
20 | aspellDicts.en-science | ||
21 | aspellDicts.fr | 19 | aspellDicts.fr |
22 | ]; | 20 | ]; |
23 | 21 | ||
diff --git a/templates/desktop/flake.nix b/templates/desktop/flake.nix index 12f0898..3025434 100644 --- a/templates/desktop/flake.nix +++ b/templates/desktop/flake.nix | |||
@@ -1,7 +1,7 @@ | |||
1 | { | 1 | { |
2 | description = "Flake for the myHostname host"; | 2 | description = "Flake for the myHostname host"; |
3 | 3 | ||
4 | inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; | 4 | inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; |
5 | inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; | 5 | inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; |
6 | inputs.nixos-config-reborn = { | 6 | inputs.nixos-config-reborn = { |
7 | url = "git+https://git.huh.gdn/NixOS/nixos-config-reborn"; | 7 | url = "git+https://git.huh.gdn/NixOS/nixos-config-reborn"; |
@@ -35,10 +35,10 @@ | |||
35 | ./tinc.nix | 35 | ./tinc.nix |
36 | 36 | ||
37 | ({ ... }: { | 37 | ({ ... }: { |
38 | home-manager.users.minijackson.home.stateVersion = "24.05"; | 38 | home-manager.users.minijackson.home.stateVersion = "24.11"; |
39 | home-manager.users.root.home.stateVersion = "24.05"; | 39 | home-manager.users.root.home.stateVersion = "24.11"; |
40 | 40 | ||
41 | system.stateVersion = "24.05"; | 41 | system.stateVersion = "24.11"; |
42 | }) | 42 | }) |
43 | ]; | 43 | ]; |
44 | }; | 44 | }; |
diff --git a/usecases/desktop/graphical.nix b/usecases/desktop/graphical.nix index 0e909ae..6a74ac1 100644 --- a/usecases/desktop/graphical.nix +++ b/usecases/desktop/graphical.nix | |||
@@ -17,12 +17,12 @@ inputs: { | |||
17 | users.extraUsers.minijackson.packages = with pkgs; [ | 17 | users.extraUsers.minijackson.packages = with pkgs; [ |
18 | arandr | 18 | arandr |
19 | dconf | 19 | dconf |
20 | gnome3.eog | 20 | eog |
21 | gnome3.evince | 21 | evince |
22 | gnome3.file-roller | 22 | file-roller |
23 | gnome3.gnome-disk-utility | 23 | gnome-disk-utility |
24 | gnome3.gucharmap | 24 | gucharmap |
25 | gnome3.nautilus | 25 | nautilus |
26 | qutebrowser | 26 | qutebrowser |
27 | xdg-utils | 27 | xdg-utils |
28 | xsel | 28 | xsel |
@@ -42,7 +42,7 @@ inputs: { | |||
42 | freefont_ttf | 42 | freefont_ttf |
43 | liberation_ttf | 43 | liberation_ttf |
44 | libertinus | 44 | libertinus |
45 | noto-fonts-cjk | 45 | noto-fonts-cjk-sans |
46 | #fira-mono-italic | 46 | #fira-mono-italic |
47 | lmodern | 47 | lmodern |
48 | # Symbols | 48 | # Symbols |
@@ -79,7 +79,7 @@ inputs: { | |||
79 | }; | 79 | }; |
80 | }; | 80 | }; |
81 | 81 | ||
82 | hardware.opengl.enable = true; | 82 | hardware.graphics.enable = true; |
83 | programs.dconf.enable = true; | 83 | programs.dconf.enable = true; |
84 | 84 | ||
85 | qt = { | 85 | qt = { |
diff --git a/usecases/desktop/graphical/gaming.nix b/usecases/desktop/graphical/gaming.nix index ec47ed2..898a013 100644 --- a/usecases/desktop/graphical/gaming.nix +++ b/usecases/desktop/graphical/gaming.nix | |||
@@ -8,7 +8,7 @@ inputs: { | |||
8 | enable = true; | 8 | enable = true; |
9 | package = pkgs.steam.override { | 9 | package = pkgs.steam.override { |
10 | extraLibraries = pkgs: | 10 | extraLibraries = pkgs: |
11 | with config.hardware.opengl; | 11 | with config.hardware.graphics; |
12 | if pkgs.hostPlatform.is64bit | 12 | if pkgs.hostPlatform.is64bit |
13 | then [package] ++ extraPackages | 13 | then [package] ++ extraPackages |
14 | else [package32] ++ extraPackages32; | 14 | else [package32] ++ extraPackages32; |
diff --git a/usecases/desktop/graphical/gtk.nix b/usecases/desktop/graphical/gtk.nix index f07d57e..13e0918 100644 --- a/usecases/desktop/graphical/gtk.nix +++ b/usecases/desktop/graphical/gtk.nix | |||
@@ -110,7 +110,7 @@ in { | |||
110 | }; | 110 | }; |
111 | 111 | ||
112 | theme = { | 112 | theme = { |
113 | package = pkgs.gnome.gnome-themes-extra; | 113 | package = pkgs.gnome-themes-extra; |
114 | name = "Adwaita-dark"; | 114 | name = "Adwaita-dark"; |
115 | }; | 115 | }; |
116 | 116 | ||
diff --git a/usecases/server/jellyfin.nix b/usecases/server/jellyfin.nix index 6c891fe..177bb2d 100644 --- a/usecases/server/jellyfin.nix +++ b/usecases/server/jellyfin.nix | |||
@@ -51,7 +51,7 @@ inputs: | |||
51 | "/etc/static/ssl/certs" | 51 | "/etc/static/ssl/certs" |
52 | 52 | ||
53 | "/etc/resolv.conf" | 53 | "/etc/resolv.conf" |
54 | ] ++ lib.optional config.hardware.opengl.enable [ | 54 | ] ++ lib.optional config.hardware.graphics.enable [ |
55 | "/run/opengl-driver" | 55 | "/run/opengl-driver" |
56 | ] ++ config.services.jellyfin.allowedPaths; | 56 | ] ++ config.services.jellyfin.allowedPaths; |
57 | 57 | ||