Celanup flake.nix

devenv.lock

@@ -3,10 +3,10 @@
     "devenv": {
       "locked": {
         "dir": "src/modules",
-        "lastModified": 1755355634,
+        "lastModified": 1756732270,
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "85e78cbe26467a2c23c9d34869235740132d749f",
+        "rev": "1d5c772e984c5e29935ca3fa6b09f888dae04215",
         "type": "github"
       },
       "original": {
@@ -40,10 +40,10 @@
         ]
       },
       "locked": {
-        "lastModified": 1754416808,
+        "lastModified": 1755960406,
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "9c52372878df6911f9afc1e2a1391f55e4dfc864",
+        "rev": "e891a93b193fcaf2fc8012d890dc7f0befe86ec2",
         "type": "github"
       },
       "original": {
@@ -74,10 +74,10 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1754299112,
+        "lastModified": 1755783167,
         "owner": "cachix",
         "repo": "devenv-nixpkgs",
-        "rev": "16c21c9f5c6fb978466e91182a248dd8ca1112ac",
+        "rev": "4a880fb247d24fbca57269af672e8f78935b0328",
         "type": "github"
       },
       "original": {

devenv.nix

@@ -1,7 +1,4 @@
-{
+{ pkgs, ... }:
-  pkgs,
-  ...
-}:
 
 {
   packages = [
@@ -17,21 +14,18 @@
     nil --version
   '';
 
-  # https://devenv.sh/tasks/
   tasks = {
 
   };
 
-  # https://devenv.sh/tests/
   enterTest = ''
     echo "Running tests"
-    git --version | grep --color=auto "${pkgs.git.version}"
+    nixos-rebuild dry-build --flake .#fenixpc
+    nixos-rebuild dry-build --flake .#fenixbook
   '';
 
   git-hooks.hooks = {
     nil.enable = true;
     nixfmt-rfc-style.enable = true;
   };
-
-  # See full reference at https://devenv.sh/reference/options/
 }

flake.nix

@@ -30,7 +30,6 @@
       self,
       nixpkgs,
       nixpkgs-stable,
-      disko,
       ...
     }@inputs:
     let
@@ -90,7 +89,7 @@
         )
         inputs.home-manager.nixosModules.home-manager
         inputs.photocatalog.nixosModules.photocatalog
-        disko.nixosModules.disko
+        inputs.disko.nixosModules.disko
         ./options.nix
         ./nix.nix
       ]

hosts/fenixbook/default.nix

@@ -36,10 +36,6 @@ in
     };
   };
 
-  programs = {
-    zsh.enable = true;
-  };
-
   services = {
 
   };

hosts/fenixpc/default.nix

@@ -36,10 +36,6 @@ in
 
   systemd.oomd.extraConfig.DefaultMemoryPressureLimit = "15%";
 
-  programs = {
-    zsh.enable = true;
-  };
-
   services = {
     printing.ricoh.enable = true;
     calibre-web = {

quirks/development.nix

@@ -1,4 +1,4 @@
-{...}:
+{ ... }:
 {
   boot.kernel.sysctl = {
     "fs.inotify.max_user_watches" = 1048576;

quirks/steam.nix

@@ -1,9 +1,10 @@
 { ... }:
 {
+  imports = [
+    ./32bit.nix
+  ];
+
   hardware = {
     steam-hardware.enable = true;
-    graphics = {
-      enable32Bit = true;
-    };
   };
 }

roles/laptop.nix

@@ -1,4 +1,4 @@
-{...}:
+{ ... }:
 {
   imports = [
     ./desktop.nix