cleanup

etcnixos/common.nix

@@ -11,7 +11,6 @@
 {
   imports = [
     ./declarative-nm.nix
-    ./distrobox.nix
     # ./vm.nix
     ./steam.nix
     ./networking.nix
@@ -23,7 +22,7 @@
   ];
 
   hardware.enableRedistributableFirmware = true;
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.amd.updateMicrocode = true;
 
   swapDevices = [ ];
 
@@ -42,10 +41,10 @@
     # extract all my secureboot keys
     # TODO! proper secrets management
     "secureboot-keys".text = ''
-      #!/bin/sh
+      #!/usr/bin/env sh
       rm -fr ${config.boot.lanzaboote.pkiBundle} || true
       mkdir -p ${config.boot.lanzaboote.pkiBundle}
-      ${pkgs.gnutar}/bin/tar xf ${./secrets/secureboot.tar} -C ${config.boot.lanzaboote.pkiBundle}
+      ${lib.getExe pkgs.gnutar} xf ${./secrets/secureboot.tar} -C ${config.boot.lanzaboote.pkiBundle}
       chown -R root:wheel ${config.boot.lanzaboote.pkiBundle}
       chmod -R 500 ${config.boot.lanzaboote.pkiBundle}
     '';
@@ -85,6 +84,7 @@
         "thunderbolt"
         "nvme"
         "usbhid"
+        "amdgpu"
       ];
     };
 
@@ -145,8 +145,6 @@
     ];
   };
 
-  # age.identityPaths = [ "/home/${username}/.ssh/id_ed25519" ];
-
   # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
 
@@ -231,12 +229,12 @@
       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
+        exec ${lib.getExe pkgs.fish} $LOGIN_OPTION
       fi
     '';
   };
 
-  system.stateVersion = "24.11";
+  system.stateVersion = "25.11";
   nixpkgs.hostPlatform = "x86_64-linux";
 
   documentation.enable = true;