From 3764a857575a74303d2f2a13c89e3a6a301cfd61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Sun, 8 Dec 2024 15:38:56 +0100 Subject: [PATCH] chore: upgrade to NixOS 24.11 --- desktop/gnome.nix | 25 +++--- flake.lock | 156 +++++++++++++-------------------- flake.nix | 4 +- home/editors/lsp.nix | 1 - services/samba/home-server.nix | 16 ++-- system/fonts.nix | 2 +- system/i18n.nix | 3 +- virtualisation/libvirt.nix | 2 +- 8 files changed, 90 insertions(+), 119 deletions(-) diff --git a/desktop/gnome.nix b/desktop/gnome.nix index e40db5c..98463ec 100644 --- a/desktop/gnome.nix +++ b/desktop/gnome.nix @@ -5,9 +5,10 @@ with pkgs; with gnomeExtensions; [ - gnome.dconf-editor - gnome.gnome-tweaks - gnome.zenity + dconf-editor + gnome-tweaks + zenity + gnome-sound-recorder native-window-placement appindicator pop-shell @@ -31,15 +32,15 @@ # exclude some default applications environment.gnome.excludePackages = with pkgs; [ - gnome.gnome-system-monitor - gnome.gnome-weather - gnome.gnome-calendar - gnome.gnome-maps - gnome.gnome-contacts - gnome.gnome-software - gnome.totem - gnome.epiphany - gnome.evince + gnome-system-monitor + gnome-weather + gnome-calendar + gnome-maps + gnome-contacts + gnome-software + totem + epiphany + evince ]; programs.gnome-terminal.enable = false; programs.geary.enable = false; diff --git a/flake.lock b/flake.lock index 7630384..e333714 100644 --- a/flake.lock +++ b/flake.lock @@ -26,11 +26,11 @@ "arkenfox-userjs": { "flake": false, "locked": { - "lastModified": 1722919020, - "narHash": "sha256-tTKGJXg/yicwpCI9WwFmbKYL6cyQ0OOetbvT9i/psUk=", + "lastModified": 1731156949, + "narHash": "sha256-0qwqVc3hrpbQMMJOhbelSrR8cZOqLLWs4T+qyeHfiAc=", "owner": "arkenfox", "repo": "user.js", - "rev": "11582f905a21971eb5869b48ef8c3f2d4eac4d89", + "rev": "eae5762d29f18115fbffd73d89bd9e2510b25427", "type": "github" }, "original": { @@ -72,11 +72,11 @@ ] }, "locked": { - "lastModified": 1718194053, - "narHash": "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY=", + "lastModified": 1727447169, + "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=", "owner": "serokell", "repo": "deploy-rs", - "rev": "3867348fa92bc892eba5d9ddb2d7a97b9e127a8a", + "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76", "type": "github" }, "original": { @@ -109,11 +109,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1724731400, - "narHash": "sha256-klgzVGrczaklPJTVL2ZvmvzmwmuMpcskTKBywG3IHow=", + "lastModified": 1733630610, + "narHash": "sha256-ygrT4DEeQ4fFpDXIT53ZTsr6cA3pvQTAwQp1GMMq3dI=", "owner": "rycee", "repo": "nur-expressions", - "rev": "f642fc3ebf2524acf95b49456375c9e61d4b0447", + "rev": "8a0b6c1bb922a406f3ce4debe5823d7b4850b6dc", "type": "gitlab" }, "original": { @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -210,17 +210,16 @@ "flake-parts_2": { "inputs": { "nixpkgs-lib": [ - "nixos-cosmic", - "nix-update", + "openwrt-imagebuilder", "nixpkgs" ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -249,11 +248,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -311,16 +310,16 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1733572789, + "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -348,29 +347,6 @@ "type": "gitlab" } }, - "nix-update": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ], - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1724271552, - "narHash": "sha256-xn0dC4M3mfItxP+s3/v3Hz/CSKp74VH/gMfufKxl9/4=", - "owner": "Mic92", - "repo": "nix-update", - "rev": "737121eccb67542e8c004c64da833fede2e80c64", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "nix-update", - "type": "github" - } - }, "nixlib": { "locked": { "lastModified": 1643502816, @@ -389,7 +365,6 @@ "nixos-cosmic": { "inputs": { "flake-compat": "flake-compat_3", - "nix-update": "nix-update", "nixpkgs": [ "nixpkgs" ], @@ -397,11 +372,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1724727194, - "narHash": "sha256-1qfV4NTz3SnuVAat9SfXzu2Jdu5156ZwODOeSZpF6xk=", + "lastModified": 1733621779, + "narHash": "sha256-oeBPiHmg8T/Qsf4qMkUqOrn6/xkJwREGo1jA+4xDssk=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "1b1bdf467e6f638889ea6a5f30e8d6182a7a16e3", + "rev": "b9ec66ed4e1430061ca044e938bb10f3ab629ba3", "type": "github" }, "original": { @@ -412,11 +387,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1724575805, - "narHash": "sha256-OB/kEL3GAhUZmUfkbPfsPhKs0pRqJKs0EEBiLfyKZw8=", + "lastModified": 1733481457, + "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9fc19be21f0807d6be092d70bf0b1de0c00ac895", + "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", "type": "github" }, "original": { @@ -427,43 +402,43 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724316499, - "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", + "lastModified": 1733412085, + "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", + "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1724316499, - "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", + "lastModified": 1733412085, + "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", + "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1724479785, - "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", + "lastModified": 1733581040, + "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be", + "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", "type": "github" }, "original": { @@ -491,16 +466,18 @@ }, "openwrt-imagebuilder": { "inputs": { + "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs" - ] + ], + "systems": "systems_3" }, "locked": { - "lastModified": 1724662557, - "narHash": "sha256-JwnFWP5IzrSF+Dy4ZDaVz+H3/HdN9J395atYU+JWRAE=", + "lastModified": 1733649297, + "narHash": "sha256-ChaGFWADd7fmQqDnTNt+YYwOy4imR4Qsf3dZXhV1rnQ=", "owner": "astro", "repo": "nix-openwrt-imagebuilder", - "rev": "e691c3ea3bd85df9b22cd21654c958bbcdb366bb", + "rev": "d97dfae8884eb05d5d7632ef40fabc8902a72c90", "type": "github" }, "original": { @@ -521,11 +498,11 @@ ] }, "locked": { - "lastModified": 1724440431, - "narHash": "sha256-9etXEOUtzeMgqg1u0wp+EdwG7RpmrAZ2yX516bMj2aE=", + "lastModified": 1733665616, + "narHash": "sha256-+XTFXYlFJBxohhMGLDpYdEnhUNdxN8dyTA8WAd+lh2A=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "c8a54057aae480c56e28ef3e14e4960628ac495b", + "rev": "d8c02f0ffef0ef39f6063731fc539d8c71eb463a", "type": "github" }, "original": { @@ -564,11 +541,11 @@ ] }, "locked": { - "lastModified": 1724349014, - "narHash": "sha256-y4/cGk8BghBc59JDDAJDSlNzp66Iq5QYSnokBmOjQjc=", + "lastModified": 1733386986, + "narHash": "sha256-1w+ccjplDEmW+D4ItEASnRUOkSx0jMGZUArK/h75EhQ=", "owner": "SofusA", "repo": "roslyn-language-server", - "rev": "678374269437bd2e8bf7491487cbc60131113ef9", + "rev": "6f3dec4c4a2eafabfc9b060bf26389262b50339f", "type": "github" }, "original": { @@ -585,11 +562,11 @@ ] }, "locked": { - "lastModified": 1724638882, - "narHash": "sha256-ap2jIQi/FuUHR6HCht6ASWhoz8EiB99XmI8Esot38VE=", + "lastModified": 1733538766, + "narHash": "sha256-FEDfBpM82XGdHDbLDJC4lV+QXSVN1rERt1MqtBGJZds=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "19b70f147b9c67a759e35824b241f1ed92e46694", + "rev": "66526479b295ad238843a8a7367d2da7ec102757", "type": "github" }, "original": { @@ -628,25 +605,18 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixos-cosmic", - "nix-update", - "nixpkgs" - ] - }, + "systems_3": { "locked": { - "lastModified": 1719887753, - "narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c", + "lastModified": 1680978846, + "narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=", + "owner": "nix-systems", + "repo": "x86_64-linux", + "rev": "2ecfcac5e15790ba6ce360ceccddb15ad16d08a8", "type": "github" }, "original": { - "owner": "numtide", - "repo": "treefmt-nix", + "owner": "nix-systems", + "repo": "x86_64-linux", "type": "github" } } diff --git a/flake.nix b/flake.nix index f9748a4..a48f95f 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ rec { }; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; @@ -29,7 +29,7 @@ rec { flake-utils.url = "github:numtide/flake-utils"; home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/editors/lsp.nix b/home/editors/lsp.nix index 48592db..1b8cea7 100644 --- a/home/editors/lsp.nix +++ b/home/editors/lsp.nix @@ -10,7 +10,6 @@ nil unstable.nixd nls - buf-language-server terraform-ls pyright nodePackages.bash-language-server diff --git a/services/samba/home-server.nix b/services/samba/home-server.nix index fdb38c0..26573a9 100644 --- a/services/samba/home-server.nix +++ b/services/samba/home-server.nix @@ -12,14 +12,14 @@ services.samba = { enable = true; openFirewall = true; - securityType = "user"; - extraConfig = '' - passdb backend = tdbsam - guest account = nobody - map to guest = bad user - use sendfile = true - ''; - shares = { + settings = { + global = { + security = "user"; + "passdb backend" = "tdbsam"; + "guest account" = "nobody"; + "map to guest" = "bad user"; + "use sendfile" = true; + }; media = { path = "/media"; public = "no"; diff --git a/system/fonts.nix b/system/fonts.nix index 13db85b..496155b 100644 --- a/system/fonts.nix +++ b/system/fonts.nix @@ -4,7 +4,7 @@ fonts.packages = with pkgs; [ noto-fonts noto-fonts-extra - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-emoji (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; }) fira-code diff --git a/system/i18n.nix b/system/i18n.nix index f43dac5..b9a2909 100644 --- a/system/i18n.nix +++ b/system/i18n.nix @@ -12,7 +12,8 @@ LC_MONETARY = "en_IE.UTF-8"; }; supportedLocales = [ "all" ]; - inputMethod.enabled = "ibus"; + inputMethod.enable = true; + inputMethod.type = "ibus"; inputMethod.ibus.engines = with pkgs.ibus-engines; [ uniemoji mozc diff --git a/virtualisation/libvirt.nix b/virtualisation/libvirt.nix index 07e9bc5..ae08fdb 100644 --- a/virtualisation/libvirt.nix +++ b/virtualisation/libvirt.nix @@ -3,7 +3,7 @@ { environment.systemPackages = with pkgs; [ virt-manager - gnome.gnome-boxes + gnome-boxes ]; environment.sessionVariables.LIBVIRT_DEFAULT_URI = [ "qemu:///system" ];