Update to NixOS 24.11

rake5k · Dec 3, 2024 · 0dbba66 · 0dbba66
1 parent 648afb0
commit 0dbba66
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 22 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,7 +2,7 @@
   description = "NixOS & Home-Manager Configuration";
 
   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";
     nur.url = "github:nix-community/NUR";
 
@@ -13,7 +13,7 @@
     };
 
     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/programs/ranger/default.nix b/home/programs/ranger/default.nix
@@ -48,7 +48,7 @@ in
         pandoc
         poppler_utils
         python3Packages.nbconvert
-        transmission
+        transmission_4
         trash-cli
         ueberzugpp
         unrar

diff --git a/home/roles/desktop/default.nix b/home/roles/desktop/default.nix
@@ -66,11 +66,10 @@ in
     };
 
     home.packages = with pkgs; [
-      gnome.gnome-characters
-      gnome.nautilus
-      gnome.pomodoro
-      gnome.seahorse
-      psensor
+      gnome-characters
+      gnome-pomodoro
+      nautilus
+      seahorse
     ];
 
     services.gnome-keyring.enable = true;

diff --git a/home/roles/desktop/password-manager/default.nix b/home/roles/desktop/password-manager/default.nix
@@ -21,7 +21,7 @@ in
 
       package = mkOption {
         type = types.package;
-        default = pkgs._1password;
+        default = pkgs._1password-gui;
         description = "Password manager package";
       };
 

diff --git a/home/roles/desktop/xserver/polybar/default.nix b/home/roles/desktop/xserver/polybar/default.nix
@@ -87,7 +87,7 @@ in
           default = true;
         };
         temperature-source = mkOption {
-          type = types.string;
+          type = types.str;
           default = "";
           description = "Temperature source path";
         };
@@ -321,7 +321,7 @@ in
 
         "module/wtr" = {
           type = "custom/script";
-          exec = "${getExe pkgs.bash} ${config.xdg.configFile."polybar/weather-plugin.sh".target}";
+          exec = "${getExe pkgs.bash} ${config.xdg.configHome}/polybar/weather-plugin.sh";
           tail = false;
           interval = 600;
 

diff --git a/home/roles/web/default.nix b/home/roles/web/default.nix
@@ -49,7 +49,7 @@ in
     };
 
     home.packages = with pkgs; [
-      _1password
+      _1password-cli
       _1password-gui
       bind
       protonmail-desktop

diff --git a/home/users/christian/fonts/default.nix b/home/users/christian/fonts/default.nix
@@ -23,7 +23,9 @@ in
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
       google-fonts
-      ubuntu_font_family
+      ubuntu-classic
+      ubuntu-sans
+      ubuntu-sans-mono
     ];
   };
 }
diff --git a/nixos/base/default.nix b/nixos/base/default.nix
@@ -51,7 +51,10 @@ in
 
     programs = {
       nano.enable = false;
-      vim.defaultEditor = true;
+      vim = {
+        enable = true;
+        defaultEditor = true;
+      };
       zsh.enable = true;
     };