Upgrade nixos

FaustXVI · Dec 8, 2024 · df7e35c · df7e35c
1 parent fd7b5e6
commit df7e35c
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 37 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,7 +2,7 @@
   description = "My nixos config";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
     unstable-pkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     nur = {
@@ -13,7 +13,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     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/modules/hardware/gui.nix b/modules/hardware/gui.nix
@@ -2,7 +2,7 @@
 
 {
   hardware = {
-    opengl = {
+    graphics = {
       enable = true;
     };
   };
@@ -12,13 +12,13 @@
       i3status
       i3lock
       libnotify
-      gnome3.adwaita-icon-theme
+      adwaita-icon-theme
       dunst
       arandr
       autorandr
       udiskie
       pasystray
-      gnome.nautilus
+      nautilus
     ];
   };
   services = {

diff --git a/modules/hardware/keyboard.nix b/modules/hardware/keyboard.nix
@@ -51,5 +51,5 @@
       ];
     };
   };
-  sound.mediaKeys.enable = true;
+  #sound.mediaKeys.enable = true;
 }
diff --git a/modules/hardware/sound.nix b/modules/hardware/sound.nix
@@ -9,7 +9,7 @@
   };
   hardware = {
     pulseaudio = {
-      enable = true;
+      enable = false;
       support32Bit = true;
       package = pkgs.pulseaudioFull;
     };

diff --git a/modules/hardware/yubikey.nix b/modules/hardware/yubikey.nix
@@ -33,14 +33,16 @@ in
       };
       security = {
         pam = {
+          services.login.u2fAuth = true;
           sshAgentAuth = {
             enable = true;
           };
           u2f = {
-            enable = true;
-            control = "required";
-            cue = true;
-            authFile = authFile;
+              enable = true;
+              control = "required";
+            settings = {
+              authfile = authFile;
+          };
           };
         };
       };

diff --git a/modules/purposes/gaming/gaming.nix b/modules/purposes/gaming/gaming.nix
@@ -11,8 +11,8 @@
     };
 
     hardware = {
-      opengl = {
-        driSupport32Bit = true;
+      graphics = {
+        enable32Bit = true;
         extraPackages32 = [ pkgs.pkgsi686Linux.libva ];
       };
     };

diff --git a/modules/purposes/home-office/home-printer.nix b/modules/purposes/home-office/home-printer.nix
@@ -4,7 +4,7 @@
   config = mylib.mkIfComputerHasPurpose "home-office" {
     environment = {
       systemPackages = with pkgs; [
-        gnome.simple-scan
+        simple-scan
       ];
     };
     services = {

diff --git a/modules/purposes/work/firefox.nix b/modules/purposes/work/firefox.nix
@@ -5,7 +5,7 @@ in
 {
   config = mylib.mkIfComputerHasPurpose "work" {
     home-manager.users.xadet = { ... }: {
-      programs.firefox.profiles = {
+      programs.firefox.profiles = lib.mkForce {
         "perso".isDefault = false;
         "eove" = {
           id = 1;

diff --git a/modules/system/fonts.nix b/modules/system/fonts.nix
@@ -14,7 +14,7 @@
     packages = with pkgs; [
       nerdfonts
       noto-fonts
-      noto-fonts-cjk
+      noto-fonts-cjk-sans
       noto-fonts-emoji
       liberation_ttf
       fira-code

diff --git a/modules/system/home-manager/shells/default.nix b/modules/system/home-manager/shells/default.nix
@@ -46,9 +46,6 @@
     fd = {
       enable = true;
     };
-    taskwarrior = {
-      enable = true;
-    };
     zoxide = {
       enable = true;
       options = [ "--cmd cd" ];

diff --git a/modules/system/home-manager/shells/wezterm.nix b/modules/system/home-manager/shells/wezterm.nix
@@ -9,6 +9,7 @@ in
       return {
         font = wezterm.font "${font}",
         font_size = 18,
+        front_end = "WebGpu",
         scrollback_lines = 20000,
         color_scheme = 'Darcula (base16)',
         keys = {

diff --git a/modules/system/shells.nix b/modules/system/shells.nix
@@ -8,7 +8,9 @@
   };
   programs = {
     bash = {
-      enableCompletion = true;
+      completion = {
+        enable = true;
+      };
     };
     fish = {
       enable = true;
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,5 +51,5 @@ @@
           ];
         };
       };
-      sound.mediaKeys.enable = true;
+      #sound.mediaKeys.enable = true;
     }