fix: replace nixfmt-rfc-style with nixfmt

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765794845,
+        "lastModified": 1779135526,
-        "narHash": "sha256-YD5QWlGnusNbZCqR3pxG8tRxx9yUXayLZfAJRWspq2s=",
+        "narHash": "sha256-glCununz6lmaK5fs2X946HA3EkNxB2JagdAAvInuRYU=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "7194cfe5b7a3660726b0fe7296070eaef601cae9",
+        "rev": "d405a179887d52b24c0ddd31e09a150bd1f66779",
         "type": "github"
       },
       "original": {
@@ -20,58 +20,6 @@
         "type": "github"
       }
     },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -79,11 +27,32 @@
         ]
       },
       "locked": {
-        "lastModified": 1765980955,
+        "lastModified": 1779157263,
-        "narHash": "sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs+zlQ07dGQFk4=",
+        "narHash": "sha256-VbiyZkRf8/qr7ObmlyfOHJsNAW5tyZ4MB1+cUwAwdrw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "89c9508bbe9b40d36b3dc206c2483ef176f15173",
+        "rev": "866412a19866b4a8e32d2306a118040afa2b840c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "home-manager_2": {
+      "inputs": {
+        "nixpkgs": [
+          "impermanence",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1768598210,
+        "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6",
         "type": "github"
       },
       "original": {
@@ -93,12 +62,16 @@
       }
     },
     "impermanence": {
+      "inputs": {
+        "home-manager": "home-manager_2",
+        "nixpkgs": "nixpkgs"
+      },
       "locked": {
-        "lastModified": 1737831083,
+        "lastModified": 1769548169,
-        "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=",
+        "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170",
+        "rev": "7b1d382faf603b6d264f58627330f9faa5cba149",
         "type": "github"
       },
       "original": {
@@ -107,76 +80,13 @@
         "type": "github"
       }
     },
-    "madd": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1754781336,
-        "narHash": "sha256-EUavinU3psYqVDx7Cjdypsf4dUymdu1yawbwRYv6wbM=",
-        "ref": "refs/heads/master",
-        "rev": "d490b648ac5acb65aa24c8e8314c1a6fa9e2c0c1",
-        "revCount": 8,
-        "type": "git",
-        "url": "https://git.bulthuis.dev/Jan/madd"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.bulthuis.dev/Jan/madd"
-      }
-    },
-    "nix-minecraft": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1751650156,
-        "narHash": "sha256-1gIPVDf159TQlcVg3WQBHMZVn8RllHOa8eT7AJPj2IE=",
-        "owner": "Jan-Bulthuis",
-        "repo": "nix-minecraft",
-        "rev": "d3b3779fd78bd55db24d25e896438b2b51cbb6cb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Jan-Bulthuis",
-        "repo": "nix-minecraft",
-        "type": "github"
-      }
-    },
-    "nix-modpack": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1747559249,
-        "narHash": "sha256-+ygKEGMVcXNklO4RDYSd5XzydDmQOZWcOcxYZf/PH1U=",
-        "owner": "Jan-Bulthuis",
-        "repo": "nix-modpack",
-        "rev": "a093625c2847afc3ef257513161c7fe318c6be1c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Jan-Bulthuis",
-        "repo": "nix-modpack",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1765779637,
+        "lastModified": 1768564909,
-        "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
+        "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
+        "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
         "type": "github"
       },
       "original": {
@@ -188,11 +98,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1765687488,
+        "lastModified": 1767313136,
-        "narHash": "sha256-7YAJ6xgBAQ/Nr+7MI13Tui1ULflgAdKh63m1tfYV7+M=",
+        "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d02bcc33948ca19b0aaa0213fe987ceec1f4ebe1",
+        "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
         "type": "github"
       },
       "original": {
@@ -202,15 +112,28 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1778869304,
+        "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "disko": "disko",
         "home-manager": "home-manager",
         "impermanence": "impermanence",
-        "madd": "madd",
+        "nixpkgs": "nixpkgs_2",
-        "nix-minecraft": "nix-minecraft",
-        "nix-modpack": "nix-modpack",
-        "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable",
         "secrets": "secrets",
         "sops-nix": "sops-nix"
@@ -218,11 +141,11 @@
     },
     "secrets": {
       "locked": {
-        "lastModified": 1764605254,
+        "lastModified": 1766822527,
-        "narHash": "sha256-xpKD2OS2YgqxmIzuPU07OYtOqp6pccKdamb+oXhch7w=",
+        "narHash": "sha256-0qNxAxr7LQ8C6MjSxV2FkMSfdVmOVRq7Yz/wCea8plo=",
         "ref": "refs/heads/main",
-        "rev": "c1bba633c0006784e95d9c10e937a15ea3aaee55",
+        "rev": "695e36891b5de248993845e1435df5e4116a26f2",
-        "revCount": 20,
+        "revCount": 21,
         "type": "git",
         "url": "ssh://gitea@git.bulthuis.dev/Jan/nixos-secrets"
       },
@@ -238,11 +161,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765836173,
+        "lastModified": 1777944972,
-        "narHash": "sha256-hWRYfdH2ONI7HXbqZqW8Q1y9IRbnXWvtvt/ONZovSNY=",
+        "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "443a7f2e7e118c4fc63b7fae05ab3080dd0e5c63",
+        "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
         "type": "github"
       },
       "original": {
@@ -250,36 +173,6 @@
         "repo": "sops-nix",
         "type": "github"
       }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -19,15 +19,20 @@
     impermanence.url = "github:nix-community/impermanence";
 
     # MADD
-    madd.url = "git+https://git.bulthuis.dev/Jan/madd";
+    # madd.url = "git+https://git.bulthuis.dev/Jan/madd";
-    madd.inputs.nixpkgs.follows = "nixpkgs";
+    # madd.inputs.nixpkgs.follows = "nixpkgs";
 
     # For Minecraft VM
-    nix-minecraft.url = "github:Jan-Bulthuis/nix-minecraft";
+    # nix-minecraft.url = "github:Jan-Bulthuis/nix-minecraft";
-    nix-minecraft.inputs.nixpkgs.follows = "nixpkgs";
+    # nix-minecraft.inputs.nixpkgs.follows = "nixpkgs";
-    nix-modpack.url = "github:Jan-Bulthuis/nix-modpack";
+    # nix-modpack.url = "github:Jan-Bulthuis/nix-modpack";
-    nix-modpack.inputs.nixpkgs.follows = "nixpkgs";
+    # nix-modpack.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = inputs: import ./glue inputs;
+  outputs =
+    inputs:
+    import ./glue {
+      inherit inputs;
+      excludeHomeManagerModules = [ "impermanence" ];
+    };
 }

glue/default.nix

@@ -1,4 +1,7 @@
-inputs:
+{
+  inputs,
+  excludeHomeManagerModules ? [ ],
+}:
 let
   flake = inputs.self;
   nixpkgs = inputs.nixpkgs;
@@ -113,7 +116,9 @@ let
   homeProfiles = collectModules "${flake}/profiles/home";
   inputHomeModules = lib.map (flake: flake.outputs.homeManagerModules.default) (
     lib.filter (flake: lib.hasAttrByPath [ "outputs" "homeManagerModules" "default" ] flake) (
-      lib.attrValues inputs
+      lib.attrValues (
+        lib.attrsets.filterAttrs (name: entry: !(lib.elem name excludeHomeManagerModules)) inputs
+      )
     )
   );
 

hosts/vm-k1s/configuration.nix

@@ -0,0 +1,254 @@
+{
+  inputs,
+  pkgs,
+  config,
+  ...
+}:
+
+{
+  # State version
+  system.stateVersion = "25.05";
+
+  # Machine hostname
+  networking.hostName = "vm-k1s";
+
+  # Enabled modules
+  modules = {
+    profiles.vm.enable = true;
+  };
+
+  # Read in secrets
+  sops.secrets."flux/git-ssh-key" = {
+    sopsFile = "${inputs.secrets}/secrets/k3s-cluster.enc.yaml";
+  };
+  sops.secrets."flux/sops-decrypt-key" = {
+    sopsFile = "${inputs.secrets}/secrets/k3s-cluster.enc.yaml";
+  };
+
+  # Include NFS client module
+  boot.supportedFilesystems = [ "nfs" ];
+
+  # Set up K3S cluster with CoreDNS, FluxCD and Cilium
+  services.k3s = {
+    enable = true;
+    extraFlags = [
+      "--cluster-domain ${inputs.secrets.lab.k3s.clusterDomain}"
+      "--flannel-backend=none"
+      "--disable-network-policy"
+      "--disable-kube-proxy"
+    ];
+    disable = [
+      # "coredns" # CoreDNS is required for Flux to be able to bootstrap the cluster (Flux needs to resolve the git repo)
+      "servicelb"
+      "traefik"
+      "local-storage"
+      "metrics-server"
+      "runtimes"
+    ];
+    manifests = {
+      git-ssh-key = {
+        source = config.sops.secrets."flux/git-ssh-key".path;
+      };
+      sops-decrypt-key = {
+        source = config.sops.secrets."flux/sops-decrypt-key".path;
+      };
+      # TODO: Move to flux config, once it is possible to easily install flux without CNI
+      gateway-api =
+        let
+          manifest = pkgs.fetchurl {
+            url = "https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.4.1/experimental-install.yaml";
+            hash = "sha256-VTMn4P8yoaK+RGv5OCPIQTz5JTrGptVAfuvR6NJp9p4=";
+          };
+        in
+        {
+          source = manifest;
+        };
+      # TODO: Move to flux config, once it is possible to easily install flux without CNI
+      netpol-system-allow-egress.content = {
+        apiVersion = "cilium.io/v2";
+        kind = "CiliumClusterwideNetworkPolicy";
+        metadata.name = "allow-system-egress";
+        spec = {
+          description = "Allow all egress to system services.";
+          endpointSelector = {
+            matchExpressions = [
+              {
+                key = "io.kubernetes.pod.namespace";
+                operator = "NotIn";
+                values = [
+                  "bogus-namespace"
+                  # "kube-system"
+                  # "cilium-system"
+                  # "flux-system"
+                ];
+              }
+            ];
+          };
+          egress = [
+            {
+              toEntities = [
+                "all"
+              ];
+            }
+          ];
+          ingress = [
+            {
+              fromEntities = [
+                "all"
+              ];
+            }
+          ];
+        };
+      };
+      netpol-cluster-allow-dns.content = {
+        apiVersion = "cilium.io/v2";
+        kind = "CiliumClusterwideNetworkPolicy";
+        metadata.name = "allow-dns";
+        spec = {
+          description = "Allow DNS";
+          endpointSelector = { };
+          egress = [
+            {
+              toEndpoints = [
+                {
+                  matchLabels = {
+                    "io.kubernetes.pod.namespace" = "kube-system";
+                    "k8s-app" = "kube-dns";
+                  };
+                }
+              ];
+              toPorts = [
+                {
+                  ports = [
+                    {
+                      port = 53;
+                      protocol = "ANY";
+                    }
+                  ];
+                  rules.dns = [
+                    {
+                      matchPattern = "*";
+                    }
+                  ];
+                }
+              ];
+            }
+          ];
+        };
+      };
+      netpol-flux-allow-egress.content = { };
+    };
+    autoDeployCharts = {
+      # TODO: Move to flux config, once it is possible to easily install flux without CNI
+      cilium = {
+        name = "cilium";
+        repo = "oci://quay.io/cilium/charts/cilium";
+        version = "1.18.8";
+        hash = "sha256-z1aDpWttEfQ+Af/l0Lxdafasm75QysRc8h7sPhWXr94=";
+        createNamespace = true;
+        targetNamespace = "cilium-system";
+        values = {
+          operator.replicas = 1;
+          kubeProxyReplacement = true;
+          ipam.operator.clusterPoolIPv4PodCIDRList = [ "10.42.0.0/16" ];
+          cluster = {
+            id = 1;
+            name = "vm-k1s";
+          };
+          k8sServiceHost = "10.10.50.60";
+          k8sServicePort = 6443;
+          policyEnforcementMode = "always";
+          gatewayAPI = {
+            enabled = true;
+            gatewayClass.create = "true";
+            enableAlpn = true;
+          };
+          bgpControlPlane.enabled = true;
+          tls.secretsNamespace.create = false;
+          hubble = {
+            relay.enabled = true;
+            ui.enabled = true;
+            peerService.clusterDomain = inputs.secrets.lab.k3s.clusterDomain;
+          };
+        };
+        extraFieldDefinitions = {
+          spec.bootstrap = true;
+        };
+      };
+      flux-operator = {
+        name = "flux-operator";
+        repo = "oci://ghcr.io/controlplaneio-fluxcd/charts/flux-operator";
+        version = "0.38.1";
+        hash = "sha256-nb0mzEWC3IwjPenQ4LSWBN0NNJc2cc68RB+G60xBOEM=";
+        createNamespace = true;
+        targetNamespace = "flux-system";
+        extraDeploy = [
+          {
+            apiVersion = "fluxcd.controlplane.io/v1";
+            kind = "FluxInstance";
+            metadata = {
+              name = "flux";
+              namespace = "flux-system";
+              annotations = {
+                "fluxcd.controlplane.io/reconcile" = "enabled";
+                "fluxcd.controlplane.io/reconcileEvery" = "1h";
+                "fluxcd.controlplane.io/reconcileTimeout" = "5m";
+              };
+            };
+            spec = {
+              distribution = {
+                version = "2.x";
+                registry = "ghcr.io/fluxcd";
+              };
+              components = [
+                "source-controller"
+                "kustomize-controller"
+                "helm-controller"
+                "notification-controller"
+              ];
+              cluster = {
+                type = "kubernetes";
+                size = "small";
+                multitenant = false;
+                networkPolicy = true;
+                domain = inputs.secrets.lab.k3s.clusterDomain;
+              };
+              commonMetadata.labels = {
+                "app.kubernetes.io/name" = "flux";
+              };
+              sync = (
+                {
+                  pullSecret = "git-ssh-key";
+                }
+                // inputs.secrets.lab.k3s.fluxRepo
+              );
+            };
+          }
+        ];
+      };
+    };
+  };
+
+  modules.impermanence.directories = [
+    "/var/lib/rancher/k3s"
+  ];
+
+  environment.variables = {
+    KUBECONFIG = "/etc/rancher/k3s/k3s.yaml";
+    CILIUM_NAMESPACE = "cilium-system";
+  };
+
+  environment.systemPackages = with pkgs; [
+    fluxcd
+    k9s
+    cilium-cli
+    hubble
+  ];
+
+  # Use correct disko profile
+  modules.disko.profile = "k3s";
+
+  # TEMP: Disable firewall for now
+  networking.firewall.enable = false;
+  security.sudo.wheelNeedsPassword = false;
+}

hosts/ws-think/hardware-configuration.nix

@@ -7,6 +7,9 @@
   # Set hostid (required for ZFS)
   networking.hostId = "deadbeef";
 
+  # Use thermald
+  services.thermald.ignoreCpuidCheck = true;
+
   # Hardware configuration
   hardware.enableRedistributableFirmware = true;
   boot.initrd.availableKernelModules = [
@@ -19,6 +22,7 @@
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
+  boot.zfs.forceImportRoot = false;
   hardware.cpu.intel.updateMicrocode = true;
 
   # Filesystems

modules/home/desktop/gnome.nix

@@ -70,6 +70,7 @@ in
         mpris-label
         pip-on-top
         rounded-window-corners-reborn
+        caffeine
       ]);
 
     # Set up gnome terminal as changing the default terminal is a pain

modules/home/development/git.nix

@@ -39,7 +39,7 @@ in
     programs.git = {
       enable = true;
 
-      extraConfig = {
+      settings = {
         pull = {
           rebase = false;
         };

modules/home/development/languages/nix.nix

@@ -18,7 +18,7 @@ in
     # Development packages
     home.packages = with pkgs; [
       nix-tree
-      nixfmt-rfc-style
+      nixfmt
       nixd
     ];
 

modules/home/utilities/impermanence.nix

@@ -2,11 +2,11 @@
 
 with lib;
 let
-  # cfg = config.modules.impermanence;
+  cfg = config.modules.impermanence;
 in
 {
   options.modules.impermanence = {
-    # enable = mkEnableOption "Impermanence";
+    enable = mkEnableOption "Impermanence";
     directories = mkOption {
       type = types.listOf types.str;
       default = [ ];
@@ -23,12 +23,12 @@ in
     };
   };
 
-  # config = mkIf cfg.enable {
+  config = mkIf cfg.enable {
-  #   home.persistence."/persist/home/${config.home.username}" = {
+    home.persistence."/persist/home" = {
-  #     enable = true;
+      enable = true;
-  #     allowOther = true;
+      hideMounts = true;
-  #     directories = cfg.directories;
+      directories = cfg.directories;
-  #     files = cfg.files;
+      files = cfg.files;
-  #   };
+    };
-  # };
+  };
 }

modules/nixos/gnome.nix

@@ -57,6 +57,9 @@ in
     modules.networkmanager.enable = true;
 
     # Impermanence
-    modules.impermanence.directories = [ "/etc/NetworkManager/system-connections" ];
+    modules.impermanence.directories = [
+      "/etc/NetworkManager/system-connections"
+      "/var/lib/bluetooth"
+    ];
   };
 }

modules/nixos/graphics.nix

@@ -16,7 +16,11 @@ in
     # TODO: Add nvidia settings back in
     # TODO: Move to nvidia module
     hardware.nvidia = {
-      open = true;
+      open = false;
+      prime = {
+        intelBusId = "PCI:0@0:2:0";
+        nvidiaBusId = "PCI:1@0:0:0";
+      };
     };
   };
 }

modules/nixos/impermanence.nix

@@ -57,25 +57,25 @@ in
         directories = cfg.directories;
         files = cfg.files;
       };
-      "/persist/home" = {
+      # "/persist/home" = {
-        enable = true;
+      #   enable = true;
-        hideMounts = true;
+      #   hideMounts = true;
-        users = (
+      #   users = (
-          lib.mapAttrs' (
+      #     lib.mapAttrs' (
-            name: value:
+      #       name: value:
-            let
+      #       let
-              user = name;
+      #         user = name;
-              homeDir = "/home/${user}";
+      #         homeDir = "/home/${user}";
-              impConfig = value.modules.impermanence;
+      #         impConfig = value.modules.impermanence;
-            in
+      #       in
-            lib.nameValuePair user {
+      #       lib.nameValuePair user {
-              home = homeDir;
+      #         home = homeDir;
-              directories = impConfig.directories;
+      #         directories = impConfig.directories;
-              files = impConfig.files;
+      #         files = impConfig.files;
-            }
+      #       }
-          ) config.home-manager.users
+      #     ) config.home-manager.users
-        );
+      #   );
-      };
+      # };
     };
   };
 }

profiles/disko/k3s.nix

@@ -0,0 +1,82 @@
+{
+  disko.devices = {
+    disk = {
+      main = {
+        type = "disk";
+        device = "/dev/sda";
+        imageSize = "32G"; # For test VMs
+        content = {
+          type = "gpt";
+          partitions = {
+            boot = {
+              size = "512M";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [ "umask=0077" ];
+              };
+            };
+            zfs = {
+              end = "-4G";
+              content = {
+                type = "zfs";
+                pool = "tank";
+              };
+            };
+            swap = {
+              size = "100%";
+              content = {
+                type = "swap";
+                discardPolicy = "both";
+              };
+            };
+          };
+        };
+      };
+      longhorn = {
+        type = "disk";
+        device = "/dev/sdb";
+        imageSize = "64G"; # For longhorn storage
+        content = {
+          type = "gpt";
+          partitions = {
+            main = {
+              size = "100%";
+              content = {
+                type = "filesystem";
+                format = "ext4";
+              };
+            };
+          };
+        };
+      };
+    };
+    zpool = {
+      tank = {
+        type = "zpool";
+        rootFsOptions = {
+          compression = "zstd";
+        };
+        mountpoint = null;
+        postCreateHook = "zfs snapshot -r tank@blank && zfs hold -r blank tank@blank";
+
+        datasets = {
+          root = {
+            type = "zfs_fs";
+            mountpoint = "/";
+          };
+          nix = {
+            type = "zfs_fs";
+            mountpoint = "/nix";
+          };
+          persist = {
+            type = "zfs_fs";
+            mountpoint = "/persist";
+          };
+        };
+      };
+    };
+  };
+}

profiles/home/base.nix

@@ -16,6 +16,7 @@ in
 
   config = mkIf cfg.enable {
     modules = {
+      impermanence.enable = true;
       # btop.enable = true;
       direnv.enable = true;
       fish.enable = true;

profiles/home/gnome.nix

@@ -44,7 +44,7 @@ in
         two-finger-scrolling-enabled = true;
       };
       "org/gnome/mutter" = {
-        workspaces-only-on-primary = false;
+        workspaces-only-on-primary = true;
       };
       "org/gnome/nautilus/icon-view" = {
         default-zoom-level = "small";
@@ -67,6 +67,7 @@ in
           "rounded-window-corners@fxgn"
           "media-progress@krypion17"
           "mprisLabel@moon-0xff.github.com"
+          "caffeube@patapon.info"
         ];
         last-selected-power-profile = "power-saver";
       };

profiles/home/jan.nix

@@ -25,7 +25,7 @@ in
       thunderbird
       signal-desktop
       prusa-slicer
-      freecad-wayland
+      pkgs-stable.freecad-wayland
       inkscape
       # ente-auth
       audacity
@@ -33,7 +33,7 @@ in
       # pkgs-stable.winbox
       winbox4
       # whatsapp-for-linux
-      wasistlos
+      karere
       discord
       steam
       spotify
@@ -49,6 +49,11 @@ in
       # kicad
       vlc
       authenticator
+      hotspot
+      btop
+      winboat
+      hieroglyphic
+      shortwave
 
       podman
       podman-compose
@@ -57,6 +62,14 @@ in
       gnome-logs
     ];
 
+    programs.zathura = {
+      enable = true;
+      options = {
+        synctex = true;
+        synctex-editor-command = "${pkgs.texlab}/bin/texlab inverse-search -i %{input} -l %{line}";
+      };
+    };
+
     programs.helix = {
       enable = true;
       defaultEditor = true;
@@ -67,6 +80,34 @@ in
       #     fallback = "default";
       #   };
       # };
+      settings =
+        let
+          move_line_up = [
+            "extend_to_line_bounds"
+            "delete_selection"
+            "move_line_up"
+            "paste_before"
+          ];
+          move_line_down = [
+            "extend_to_line_bounds"
+            "delete_selection"
+            "paste_after"
+          ];
+        in
+        {
+          keys.normal = {
+            "A-up" = move_line_up;
+            "A-down" = move_line_down;
+            "A-k" = move_line_up;
+            "A-j" = move_line_down;
+          };
+          keys.select = {
+            "A-up" = move_line_up;
+            "A-down" = move_line_down;
+            "A-k" = move_line_up;
+            "A-j" = move_line_down;
+          };
+        };
       extraPackages = with pkgs; [
         bash-language-server # Bash
         fish-lsp # Fish
@@ -96,7 +137,8 @@ in
         ruff # Python
         basedpyright # Python
 
-        helix-gpt # Copilot
+        #helix-gpt # Copilot
+        ltex-ls-plus # Spellchecking
 
         # texlab # Latex, Bibtex
         # bibtex-tidy # Bibtex
@@ -115,6 +157,22 @@ in
       ];
       languages = {
         language-server = {
+          ltex = {
+            command = "ltex-ls-plus";
+            config.ltex = { };
+          };
+          texlab = {
+            command = "texlab";
+            config.texlab = {
+              build.onSave = true;
+              forwardSearch.executable = "${config.programs.zathura.package}/bin/zathura";
+              forwardSearch.args = [
+                "--synctex-forward"
+                "%l:1:%f"
+                "%p"
+              ];
+            };
+          };
           basedpyright = {
             command = "basedpyright-langserver";
             args = [ "--stdio" ];
@@ -132,6 +190,16 @@ in
           };
         };
         language = [
+          {
+            name = "latex";
+            # language-servers = [
+            #   { name = "texlab"; }
+            #   { name = "ltex"; }
+            # ];
+            soft-wrap = {
+              enable = true;
+            };
+          }
           {
             name = "python";
             language-servers = [
@@ -154,6 +222,10 @@ in
       };
     };
 
+    systemd.user.tmpfiles.rules = [
+      "d ${config.home.homeDirectory}/Downloads - - - - -"
+    ];
+
     modules = {
       profiles.gnome.enable = true;
 

profiles/nixos/base.nix

@@ -75,6 +75,8 @@ in
       zip
       unzip
       tmux
+      unixtools.net-tools
+      tcpdump
     ];
   };
 }

profiles/nixos/vm.nix

@@ -20,7 +20,7 @@ in
       profiles.base.enable = true;
       disko = {
         enable = true;
-        profile = "vm";
+        profile = mkDefault "vm";
       };
       impermanence = {
         enable = true;