From dd16d7ddb79da5b1eb69caefaa1dc73830a461c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Yule=20B=C3=A4dorf?= Date: Sun, 2 Jun 2024 23:47:00 +0200 Subject: [PATCH] nixos: update to 24.05 --- flake.lock | 164 +++++++++++++------------ flake.nix | 4 +- hosts/chocolatebar/audio.nix | 16 ++- modules/audio/default.nix | 1 - modules/crypto/default.nix | 2 +- modules/printing/default.nix | 2 +- modules/terminal-life/nvim/default.nix | 2 +- 7 files changed, 96 insertions(+), 95 deletions(-) diff --git a/flake.lock b/flake.lock index a723789..faeff2b 100644 --- a/flake.lock +++ b/flake.lock @@ -48,11 +48,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1712079060, - "narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=", + "lastModified": 1716561646, + "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=", "owner": "ryantm", "repo": "agenix", - "rev": "1381a759b205dff7a6818733118d02253340fd5e", + "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", "type": "github" }, "original": { @@ -63,11 +63,11 @@ }, "authelia-438": { "locked": { - "lastModified": 1712072300, - "narHash": "sha256-ktLwXde5fBdpjbzq0oVDJmXoc1PA42OVSfY5922gLgI=", + "lastModified": 1714672681, + "narHash": "sha256-r/vqZTUi7TxLgZtkgq0YRlH+Hh9rtfjx93OwETrgO4I=", "owner": "nicomem", "repo": "nixpkgs", - "rev": "3fcf0a77415c55b0a2e40e45543bd722139d1dc1", + "rev": "01b37b0465266d7a587546cece37960d7c962e31", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1711973905, - "narHash": "sha256-UFKME/N1pbUtn+2Aqnk+agUt8CekbpuqwzljivfIme8=", + "lastModified": 1715699772, + "narHash": "sha256-sKhqIgucN5sI/7UQgBwsonzR4fONjfMr9OcHK/vPits=", "owner": "serokell", "repo": "deploy-rs", - "rev": "88b3059b020da69cbe16526b8d639bd5e0b51c8b", + "rev": "b3ea6f333f9057b77efd9091119ba67089399ced", "type": "github" }, "original": { @@ -206,11 +206,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -224,11 +224,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -242,11 +242,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1714606777, + "narHash": "sha256-bMkNmAXLj8iyTvxaaD/StcLSadbj1chPcJOjtuVnLmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "4d34ce6412bc450b1d4208c953dc97c7fc764f1a", "type": "github" }, "original": { @@ -255,6 +255,21 @@ "type": "github" } }, + "flake-root": { + "locked": { + "lastModified": 1713493429, + "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=", + "owner": "srid", + "repo": "flake-root", + "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "flake-root", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1667395993, @@ -298,16 +313,16 @@ ] }, "locked": { - "lastModified": 1710888565, - "narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=", + "lastModified": 1716736833, + "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", "owner": "nix-community", "repo": "home-manager", - "rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce", + "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -367,11 +382,11 @@ "mobile-nixos": { "flake": false, "locked": { - "lastModified": 1711757427, - "narHash": "sha256-PqHK0J9YCRKlxpJp+UG+/xpwfIQRPVUPspvbbP3FB2M=", + "lastModified": 1715627339, + "narHash": "sha256-HJ6V7hc64iBqXlZ8kH4sXmUzPH+0Hn6wYURmZmL5LFk=", "owner": "nixos", "repo": "mobile-nixos", - "rev": "f7087f8fdbd1309af315ef8c92345320aadc5edf", + "rev": "655c8830d5fe2eae79c8fc0bab8033b34c8456eb", "type": "github" }, "original": { @@ -385,11 +400,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1712254133, - "narHash": "sha256-fwuWrAprqoA4fUrkZGVb6PjRpebm5xjNsyoaw+JVSyY=", + "lastModified": 1716767591, + "narHash": "sha256-e7mG0KhSnMkdgIGPKw6Bs2B6D44B/GB6Zo0NgxFxJTc=", "owner": "musnix", "repo": "musnix", - "rev": "b5bcdce137b00185dce5fa578739cd52770b8794", + "rev": "65f1b5863ff6157d4870ed177e8ccd82e21127ad", "type": "github" }, "original": { @@ -401,14 +416,15 @@ "nixd": { "inputs": { "flake-parts": "flake-parts_3", + "flake-root": "flake-root", "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1711809944, - "narHash": "sha256-Z5FEXEn/5lAnGUSDIah0NRkP3RCE5sQQrms7ltvzH/8=", + "lastModified": 1717293270, + "narHash": "sha256-twDibXDWwmySk6C/hFUpeBewB5heSyCDDHWOAeRSp40=", "owner": "nix-community", "repo": "nixd", - "rev": "bcf0de61178c4dbf1488e8417cc7e28cc5390164", + "rev": "be5ad5ec113595e2900e6391a08cf0e4784a9cfe", "type": "github" }, "original": { @@ -420,11 +436,11 @@ }, "nixos-flake": { "locked": { - "lastModified": 1711376798, - "narHash": "sha256-37wawZGSX/dD1rn7TwFJhUdpozC2VPEQXetpfpK/D+w=", + "lastModified": 1716406291, + "narHash": "sha256-qHjJ6alc4o3p51hrPp3JGdC5Pbz5EjF+UZq1HbK8av0=", "owner": "srid", "repo": "nixos-flake", - "rev": "7b19503e7f8c7cc0884fc2fbd669c0cc2e05aef5", + "rev": "aa9100167350cbdffaa272b0fd382d7c23606b86", "type": "github" }, "original": { @@ -435,11 +451,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1712324865, - "narHash": "sha256-+BatEWd4HlMeK7Ora+gYIkarjxFVCg9oKrIeybHIIX4=", + "lastModified": 1717248095, + "narHash": "sha256-e8X2eWjAHJQT82AAN+mCI0B68cIDBJpqJ156+VRrFO0=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "f3b959627bca46a9f7052b8fbc464b8323e68c2c", + "rev": "7b49d3967613d9aacac5b340ef158d493906ba79", "type": "github" }, "original": { @@ -466,48 +482,36 @@ }, "nixpkgs-lib": { "locked": { - "dir": "lib", - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", - "type": "github" + "lastModified": 1717284937, + "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" } }, "nixpkgs-lib_2": { "locked": { - "dir": "lib", - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", - "type": "github" + "lastModified": 1717284937, + "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" }, "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" } }, "nixpkgs-lib_3": { "locked": { "dir": "lib", - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { @@ -520,11 +524,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1716575621, - "narHash": "sha256-tNllkK8/GV+DOB48imHnbl7eeNc4urD4dtVWkomdx20=", + "lastModified": 1717353866, + "narHash": "sha256-dryt/br54qpkfZkmqMyAJNWDcPwi1XtpoiZP9iRbG28=", "owner": "nixos", "repo": "nixpkgs", - "rev": "95bdd7fc6cb47a43ef1716bf4e9beb30c6ca364b", + "rev": "e4c22dc16b36c17bea471ecc3ae616f64e69d3d2", "type": "github" }, "original": { @@ -536,11 +540,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1716948383, + "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", "type": "github" }, "original": { @@ -552,11 +556,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", "type": "github" }, "original": { @@ -568,11 +572,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1710097495, - "narHash": "sha256-B7Ea7q7hU7SE8wOPJ9oXEBjvB89yl2csaLjf5v/7jr8=", + "lastModified": 1714562304, + "narHash": "sha256-Mr3U37Rh6tH0FbaDFu0aZDwk9mPAe7ASaqDOGgLqqLU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d40e866b1f98698d454dad8f592fe7616ff705a4", + "rev": "bcd44e224fd68ce7d269b4f44d24c2220fd821e7", "type": "github" }, "original": { @@ -584,16 +588,16 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1716361217, - "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=", + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 44b23c4..b862191 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { # Track channels with commits tested and built by hydra - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-master.url = "github:nixos/nixpkgs/master"; @@ -12,7 +12,7 @@ flake-compat.url = "github:edolstra/flake-compat"; flake-compat.flake = false; - home-manager.url = "github:nix-community/home-manager/release-23.11"; + home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; flake-parts.url = "github:hercules-ci/flake-parts"; diff --git a/hosts/chocolatebar/audio.nix b/hosts/chocolatebar/audio.nix index 3ebcd43..fded4ca 100644 --- a/hosts/chocolatebar/audio.nix +++ b/hosts/chocolatebar/audio.nix @@ -23,14 +23,12 @@ in { ]; }; - environment.etc = { - "pipewire/pipewire.conf.d/92-low-latency.conf".text = '' - context.properties = { - default.clock.rate = 48000 - default.clock.quantum = 32 - default.clock.min-quantum = 32 - default.clock.max-quantum = 32 - } - ''; + services.pipewire.extraConfig.pipewire."92-low-latency" = { + "context.properties" = { + "default.clock.rate" = 48000; + "default.clock.quantum" = 32; + "default.clock.min-quantum" = 32; + "default.clock.max-quantum" = 32; + }; }; } diff --git a/modules/audio/default.nix b/modules/audio/default.nix index 61ad3b7..ecc164f 100644 --- a/modules/audio/default.nix +++ b/modules/audio/default.nix @@ -20,7 +20,6 @@ in { # Needed for pactl cmd, until pw-cli is more mature (vol up/down hotkeys?) pulseaudio vimpc - spotify-tui ]; }; diff --git a/modules/crypto/default.nix b/modules/crypto/default.nix index 94902ba..3376efb 100644 --- a/modules/crypto/default.nix +++ b/modules/crypto/default.nix @@ -24,7 +24,7 @@ in { enable = true; enableSSHSupport = true; enableExtraSocket = true; - pinentryFlavor = "gnome3"; + pinentryPackage = pkgs.pinentry-gnome3; }; home-manager.users."${psCfg.user.name}" = { diff --git a/modules/printing/default.nix b/modules/printing/default.nix index e542f44..57edfb6 100644 --- a/modules/printing/default.nix +++ b/modules/printing/default.nix @@ -7,7 +7,7 @@ }: { services.avahi.enable = true; services.avahi.ipv6 = true; - services.avahi.nssmdns = true; + services.avahi.nssmdns4 = true; services.avahi.publish.enable = true; services.avahi.publish.userServices = true; diff --git a/modules/terminal-life/nvim/default.nix b/modules/terminal-life/nvim/default.nix index 90e637e..56b489e 100644 --- a/modules/terminal-life/nvim/default.nix +++ b/modules/terminal-life/nvim/default.nix @@ -76,7 +76,7 @@ in { quick-scope # Get sudo in vim; :SudaWrite - suda-vim + vim-suda # Undo history etc. per project vim-workspace-nvfetcher