refactor some stuff

etcnixos/common.nix

@@ -198,8 +198,20 @@
     libmtp
   ];
 
-  #wayland with electron/chromium applications
+  # wayland with electron/chromium applications
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
+  # https://nixos.wiki/wiki/Fish#Setting_fish_as_your_shell
+  programs.fish.enable = true;
+  programs.bash = {
+    interactiveShellInit = ''
+      if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
+      then
+        shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
+        exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
+      fi
+    '';
+  };
+
   system.stateVersion = "24.11";
 }

etcnixos/flake.lock

@@ -50,11 +50,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728587571,
-        "narHash": "sha256-vQmYKJ9sLQP6VivCdKNdpisXrB6xpDaaTif5U+IogzQ=",
+        "lastModified": 1728835058,
+        "narHash": "sha256-GbcJ90E8+wBkBh9C1HxBTwKsOkGU41CRaPrd1ksFPtA=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "d73c548a001f367048d4f22cf2ae626cd2002503",
+        "rev": "ec6b449d3d096a0e79db5f8c4a321ea9ec836e40",
         "type": "github"
       },
       "original": {
@@ -278,11 +278,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1728632221,
-        "narHash": "sha256-LnBVdKPsreziZkYbeFqiSYP7tPFlprt9ej2QGd2aNlw=",
+        "lastModified": 1728833717,
+        "narHash": "sha256-GkS9SnKRb/PrdcqptLPNxweDdf3Zx2Lk5szEt07P4mE=",
         "owner": "nix-community",
         "repo": "lanzaboote",
-        "rev": "3326a0b3974fc04d991990f6497fe1a7d9892439",
+        "rev": "6634ab618862f1d041c286567a58c554e6136068",
         "type": "github"
       },
       "original": {

etcnixos/system-nixos.nix

@@ -38,7 +38,7 @@
       "amdgpu.ppfeaturemask=0xFFF7FFFF"
     ];
 
-    kernelModules = [
+    initrd.availableKernelModules = [
       # kernel module for case fan control
       "nct6775"
     ];

home-manager/progs/alacritty.nix

@@ -5,7 +5,7 @@
     package = pkgs.alacritty;
     settings = {
       # use the fish shell
-      shell.program = "${pkgs.fish}/bin/fish";
+      # shell.program = "${pkgs.fish}/bin/fish";
 
       # some programs can't handle alacritty
       env.TERM = "xterm-256color";