feat: upgrade to nixos-24.05

gaelreyrol · Sep 5, 2024 · 6e37b10 · 6e37b10
1 parent eea44c6
commit 6e37b10
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 89 deletions.
diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ nixos-switch:
 	nixos-rebuild switch --flake .#${HOSTNAME} --use-remote-sudo
 
 nixos-upgrade:
-	nixos-rebuild switch --upgrade --flake .#${HOSTNAME} --use-remote-sudo
+	nixos-rebuild switch --upgrade --flake .#${HOSTNAME} --use-remote-sudo --option eval-cache false
 
 nixos-build:
 	nixos-rebuild build --flake .#${HOSTNAME} |& nom

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,7 +2,7 @@
   description = "system configuration flake";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
     unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     master.url = "github:NixOS/nixpkgs/master";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
@@ -26,7 +26,7 @@
     };
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-23.11";
+      url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 

diff --git a/hosts/tower/configuration.nix b/hosts/tower/configuration.nix
@@ -20,12 +20,11 @@
 
   environment.systemPackages = with pkgs; [
     myPkgs.gnome-monitors-switch
-    myPkgs.mqttx
-    myPkgs.ledger-live-desktop
+    # myPkgs.mqttx
     klavaro
   ];
 
-  services.udev.packages = with pkgs; [ myPkgs.ledger-live-desktop ];
+  # services.udev.packages = with pkgs; [ myPkgs.ledger-live-desktop ];
 
   hardware.opengl = {
     enable = true;

diff --git a/mixins/avahi.nix b/mixins/avahi.nix
@@ -2,5 +2,5 @@
 
 {
   services.avahi.enable = true;
-  services.avahi.nssmdns = true;
+  services.avahi.nssmdns4 = true;
 }
diff --git a/mixins/default.nix b/mixins/default.nix
@@ -5,7 +5,7 @@
     ./tailscale.nix
   ];
 
-  system.stateVersion = "23.11";
+  system.stateVersion = "24.05";
 
   documentation.nixos.enable = false;
 
@@ -25,9 +25,7 @@
         # quad9
         "9.9.9.9"
       ];
-      extraConfig = ''
-        systemd-resolved=false
-      '';
+      settings.main.systemd-resolved = "false";
     };
     useDHCP = lib.mkDefault true;
   };

diff --git a/mixins/desktop.nix b/mixins/desktop.nix
@@ -6,9 +6,9 @@ let
 in
 {
   services = {
+    libinput.enable = true;
     xserver = {
       enable = true;
-      libinput.enable = true;
       displayManager.gdm.enable = true;
       desktopManager.gnome.enable = true;
     };

diff --git a/mixins/nix/default.nix b/mixins/nix/default.nix
@@ -2,7 +2,7 @@
 
 {
   nix = {
-    package = pkgs.unstable.nixVersions.nix_2_19;
+    package = pkgs.unstable.nixVersions.nix_2_23;
 
     registry.nixpkgs.flake = inputs.nixpkgs;
 

diff --git a/overlays/packages/default.nix b/overlays/packages/default.nix
@@ -2,7 +2,7 @@
 
 {
   myPkgs = import ../../packages { inherit final prev; };
-  fishPlugins = prev.fishPlugins.overrideScope' (ffinal: fprev: {
+  fishPlugins = prev.fishPlugins.overrideScope (ffinal: fprev: {
     tmux = prev.callPackage ../../packages/fish/plugins/tmux.nix { };
     jump = prev.callPackage ../../packages/fish/plugins/jump.nix { };
   });

diff --git a/packages/default.nix b/packages/default.nix
@@ -3,7 +3,7 @@
 {
   gh-diff-pr = prev.callPackage ./gh-diff-pr { };
   gnome-monitors-switch = prev.callPackage ./gnome-monitors-switch { };
-  ledger-live-desktop = prev.callPackage ./ledger-live-desktop { };
-  mqttx = prev.callPackage ./mqttx { };
+  # ledger-live-desktop = prev.callPackage ./ledger-live-desktop { };
+  # mqttx = prev.callPackage ./mqttx { };
   shell-utils = prev.callPackage ./shell-utils { };
 }
diff --git a/templates/php/flake.nix b/templates/php/flake.nix
@@ -2,7 +2,7 @@
   description = "A basic php flake";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
     unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     treefmt-nix = {

diff --git a/templates/trivial/flake.nix b/templates/trivial/flake.nix
@@ -2,7 +2,7 @@
   description = "A trivial but enhanced flake";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
     unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     treefmt-nix = {

diff --git a/users/gael/home.nix b/users/gael/home.nix
@@ -9,7 +9,7 @@
   ];
 
   home = {
-    stateVersion = "23.11";
+    stateVersion = "24.05";
     sessionVariables = {
       EDITOR = "vim";
       BAT_THEME = "Solarized (light)";
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     {
       nix = {
-        package = pkgs.unstable.nixVersions.nix_2_19;
+        package = pkgs.unstable.nixVersions.nix_2_23;
         registry.nixpkgs.flake = inputs.nixpkgs;
@@ Expand Down @@