Changed location of some persistence files

Reviewed-on: Jan/dotfiles#1

.gitignore

@@ -0,0 +1 @@
+result

README.md

@@ -1,3 +1,11 @@
-# dotfiles
+# Dotfiles
 
-My dotfiles :)
+My NixOS configuration.
+
+## Installation
+
+For disk configuration we use disko, this means that installing the system from the configuration is just a single command:
+
+```
+sudo nix --experimental-features "nix-command flakes" run "github:nix-community/disko/latest#disko-install" -- --flake git+https://git.bulthuis.dev/Jan/dotfiles#<hostname> --disk main /dev/sda
+```

flake.lock

@@ -0,0 +1,178 @@
+{
+  "nodes": {
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1748225455,
+        "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "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"
+      }
+    },
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1748134483,
+        "narHash": "sha256-5PBK1nV8X39K3qUj8B477Aa2RdbLq3m7wRxUKRtggX4=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "c1e671036224089937e111e32ea899f59181c383",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "impermanence": {
+      "locked": {
+        "lastModified": 1737831083,
+        "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=",
+        "owner": "nix-community",
+        "repo": "impermanence",
+        "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "impermanence",
+        "type": "github"
+      }
+    },
+    "nix-minecraft": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1747581338,
+        "narHash": "sha256-/+H9qce+NPsEcAC31s3pbD64nB6GKC3+3ZNLV1+tffk=",
+        "owner": "Jan-Bulthuis",
+        "repo": "nix-minecraft",
+        "rev": "44b6b40d7a3e0a114567b38a203029a5bc67e838",
+        "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": 1747958103,
+        "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "disko": "disko",
+        "home-manager": "home-manager",
+        "impermanence": "impermanence",
+        "nix-minecraft": "nix-minecraft",
+        "nix-modpack": "nix-modpack",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "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",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,21 @@
+{
+  description = "System configuration for NixOS";
+
+  inputs = {
+    # General inputs
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    home-manager.url = "github:nix-community/home-manager";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+    disko.url = "github:nix-community/disko";
+    disko.inputs.nixpkgs.follows = "nixpkgs";
+    impermanence.url = "github:nix-community/impermanence";
+
+    # For Minecraft VM
+    nix-minecraft.url = "github:Jan-Bulthuis/nix-minecraft";
+    nix-minecraft.inputs.nixpkgs.follows = "nixpkgs";
+    nix-modpack.url = "github:Jan-Bulthuis/nix-modpack";
+    nix-modpack.inputs.nixpkgs.follows = "nixpkgs";
+  };
+
+  outputs = inputs: import ./glue inputs;
+}

glue/default.nix

@@ -0,0 +1,170 @@
+inputs:
+let
+  flake = inputs.self;
+  nixpkgs = inputs.nixpkgs;
+  lib = nixpkgs.lib;
+
+  importDir =
+    path: fn:
+    let
+      entries = builtins.readDir path;
+
+      # Get paths to directories
+      dirs = lib.filterAttrs (_: type: type == "directory") entries;
+      dirPaths = lib.mapAttrs (name: type: {
+        path = "${path}/${name}";
+        type = type;
+      }) dirs;
+
+      # Get paths to nix files
+      nixName = name: builtins.match "(.*)\\.nix" name;
+      files = lib.filterAttrs (name: type: (type != "directory") && ((nixName name) != null)) entries;
+      filePaths = lib.mapAttrs' (name: type: {
+        name = builtins.head (nixName name);
+        value = {
+          path = "${path}/${name}";
+          type = type;
+        };
+      }) files;
+
+      combined = dirPaths // filePaths;
+    in
+    fn (lib.optionalAttrs (builtins.pathExists path) combined);
+
+  # Split out into getNixFiles, getNixFilesRecursive, getDirs
+  importDirRecursive =
+    path: fn:
+    let
+      entries = importDir path lib.id;
+
+      # Dig down recursively
+      dirs = lib.filterAttrs (_: entry: entry.type == "directory") entries;
+      recursedEntries = lib.mapAttrs (name: entry: (importDirRecursive entry.path lib.id)) dirs;
+    in
+    fn (entries // recursedEntries);
+
+  eachSystem = fn: lib.genAttrs lib.systems.flakeExposed fn;
+
+  systemArgs = eachSystem (system: {
+    pkgs = (
+      import inputs.nixpkgs {
+        inherit system;
+      }
+    );
+  });
+
+  allPackages = importDir "${flake}/packages" (
+    attrs:
+    lib.mapAttrs (
+      name: entry: (if entry.type == "directory" then "${entry.path}/default.nix" else entry.path)
+    ) attrs
+  );
+
+  packages =
+    let
+      # TODO: Filter out packages that are not supported on the platform?
+      mkPackages =
+        system:
+        let
+          args = systemArgs."${system}";
+          pkgs = args.pkgs;
+        in
+        lib.mapAttrs (name: package: pkgs.callPackage package { }) allPackages;
+    in
+    eachSystem mkPackages;
+
+  overlay = final: prev: (lib.mapAttrs (name: package: prev.callPackage package { }) allPackages);
+
+  collectEntries =
+    attrs:
+    lib.attrsets.collect (
+      entry: (lib.isAttrs entry) && (lib.hasAttr "path" entry) && (lib.hasAttr "type" entry)
+    ) attrs;
+
+  collectModules =
+    path:
+    importDirRecursive path (
+      attrs:
+      map (entry: if entry.type == "directory" then entry.path + "/default.nix" else entry.path) (
+        collectEntries attrs
+      )
+    );
+
+  nixosModules = collectModules "${flake}/modules/nixos";
+  nixosProfiles = collectModules "${flake}/profiles/nixos";
+  inputNixosModules = lib.map (flake: flake.outputs.nixosModules.default) (
+    lib.filter (flake: lib.hasAttrByPath [ "outputs" "nixosModules" "default" ] flake) (
+      lib.attrValues inputs
+    )
+  );
+
+  homeModules = collectModules "${flake}/modules/home";
+  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
+    )
+  );
+
+  inputOverlays = lib.map (flake: flake.outputs.overlays.default) (
+    lib.filter (flake: lib.hasAttrByPath [ "outputs" "overlays" "default" ] flake) (
+      lib.attrValues inputs
+    )
+  );
+
+  overlayModule =
+    { ... }:
+    {
+      nixpkgs.overlays = [ overlay ] ++ inputOverlays;
+    };
+
+  nixosConfigurations = importDir "${flake}/hosts" (
+    attrs:
+    lib.mapAttrs (
+      name: entry:
+      lib.nixosSystem {
+        specialArgs = {
+          inherit inputs;
+        };
+        modules =
+          let
+            systemPath = "${entry.path}/configuration.nix";
+
+            userEntries = importDir "${entry.path}/users" lib.id;
+
+            usersConfiguration = lib.mapAttrs (name: entry: {
+              isNormalUser = true;
+              group = name;
+            }) userEntries;
+            groupsConfiguration = lib.mapAttrs (name: entry: {
+            }) userEntries;
+            homesConfiguration = lib.mapAttrs (name: entry: entry.path) userEntries;
+
+            usersModule =
+              { ... }:
+              {
+                home-manager.sharedModules = homeModules ++ homeProfiles ++ inputHomeModules;
+                home-manager.useUserPackages = false; # TODO: See if this should be changed to true?
+                home-manager.useGlobalPkgs = true;
+                home-manager.users = homesConfiguration;
+                users.users = usersConfiguration;
+                users.groups = groupsConfiguration;
+              };
+          in
+          [
+            systemPath
+            overlayModule
+            usersModule
+          ]
+          ++ nixosModules
+          ++ nixosProfiles
+          ++ inputNixosModules;
+      }
+    ) (lib.attrsets.filterAttrs (name: entry: entry.type == "directory") attrs)
+  );
+
+in
+{
+  inherit packages nixosConfigurations overlay;
+  overlays.default = overlay;
+}

hosts/20212060/configuration.nix

@@ -0,0 +1,45 @@
+{ flake, ... }:
+
+{
+  # State version
+  system.stateVersion = "24.05";
+
+  # Machine hostname
+  networking.hostName = "20212060";
+
+  # Admin users
+  users.users.jan.extraGroups = [
+    "wheel"
+    "wireshark"
+  ];
+
+  # Enable virtualisation for VMs
+  virtualisation.libvirtd.enable = true;
+
+  # Enable wireshark
+  programs.wireshark = {
+    enable = true;
+    dumpcap.enable = true;
+    usbmon.enable = true;
+  };
+
+  # Set up wstunnel client
+  services.wstunnel = {
+    enable = true;
+    clients.wg-tunnel = {
+      connectTo = "wss://tunnel.bulthuis.dev:443";
+      localToRemote = [
+        "udp://51820:10.10.40.100:51820"
+      ];
+    };
+  };
+
+  # Module setup
+  modules = {
+    profiles.laptop.enable = true;
+  };
+
+  imports = [
+    ./hardware-configuration.nix
+  ];
+}

hosts/20212060/hardware-configuration.nix

@@ -0,0 +1,43 @@
+{ ... }:
+
+{
+  # Machine platform
+  nixpkgs.hostPlatform = "x86_64-linux";
+
+  # Hardware configuration
+  hardware.enableRedistributableFirmware = true;
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "nvme"
+    "usb_storage"
+    "sd_mod"
+    "rtsx_pci_sdmmc"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+  hardware.cpu.intel.updateMicrocode = true;
+
+  # Filesystems
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/3b91eaeb-ea95-4bea-8dc1-f55af7502d23";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/46BF-DE2C";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
+
+  # Swapfile
+  swapDevices = [
+    {
+      device = "/var/lib/swapfile";
+      size = 16 * 1024;
+    }
+  ];
+}

hosts/20212060/users/jan.nix

@@ -0,0 +1,9 @@
+{
+  ...
+}:
+
+{
+  home.stateVersion = "24.11";
+
+  modules.profiles.jan.enable = true;
+}

hosts/vm-audio/configuration.nix

@@ -0,0 +1,241 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+
+{
+  # State version
+  system.stateVersion = "24.11";
+
+  # Machine hostname
+  networking.hostName = "vm-audio";
+
+  # Enabled modules
+  modules = {
+    profiles.vm.enable = true;
+    sound.enable = true;
+    # spotifyd.enable = true; # TODO: Add this as a local module
+  };
+
+  # Install system packages
+  environment.systemPackages = with pkgs; [
+    carla
+    xpra
+    alsa-utils
+    pulsemixer
+    adwaita-icon-theme
+    open-stage-control
+    carla_osc_bridge
+
+    # Add LV2 plugins
+    lsp-plugins
+    airwindows-lv2
+    distrho-ports
+    cardinal
+    calf
+  ];
+
+  # Setup firewall
+  networking.firewall = {
+    allowedTCPPorts = [
+      8080
+      10402
+      15151
+      22752
+    ];
+    allowedUDPPorts = [
+      8080
+      10402
+      15151
+      22752
+    ];
+  };
+
+  # Setup dependencies
+  environment.variables.LD_LIBRARY_PATH = lib.mkForce "${lib.makeLibraryPath (
+    with pkgs;
+    [
+      cairo
+      pipewire.jack
+    ]
+  )}";
+  qt = {
+    enable = true;
+    style = "adwaita";
+  };
+  xdg.icons = {
+    enable = true;
+    fallbackCursorThemes = [ "Adwaita" ];
+  };
+  hardware.graphics.enable = true;
+
+  # User for audio mixing
+  users.users.mixer = {
+    isNormalUser = true;
+    group = "mixer";
+    extraGroups = [ "systemd-journal" ];
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKKxoQSxfYqf9ITN8Fhckk8WbY4dwtBAXOhC9jxihJvq jan@bulthuis.dev"
+    ];
+  };
+  users.groups.mixer = { };
+  users.groups.audio = {
+    members = [
+      "mixer"
+    ];
+  };
+  users.groups.bluetooth = {
+    members = [
+      "mixer"
+    ];
+  };
+
+  # Xpra service
+  systemd.user.services.xpra = {
+    description = "Xpra Service";
+    wantedBy = [ "default.target" ];
+    after = [
+      "network.target"
+    ];
+    unitConfig = {
+      ConditionUser = "mixer";
+    };
+    serviceConfig = {
+      ExecStart = "${pkgs.xpra}/bin/xpra start :7 --bind-tcp=0.0.0.0:15151 --daemon=no";
+      Restart = "always";
+      RestartSec = 5;
+    };
+  };
+
+  # Carla service
+  systemd.user.services.carla = {
+    description = "Carla Service";
+    wantedBy = [ "default.target" ];
+    after = [
+      "network.target"
+      "sound.target"
+    ];
+    requires = [
+      "xpra.service"
+    ];
+    unitConfig = {
+      ConditionUser = "mixer";
+    };
+    serviceConfig = {
+      ExecStart = "${pkgs.carla}/bin/carla /home/mixer/Default.carxp -platform xcb";
+      Environment = "\"DISPLAY=:7\"";
+      Restart = "always";
+      RestartSec = 5;
+    };
+  };
+
+  # Carla service
+  systemd.user.services.carla-bridge = {
+    description = "Carla OSC Bridge";
+    wantedBy = [ "default.target" ];
+    after = [
+      "network.target"
+      "sound.target"
+    ];
+    requires = [
+      "carla.service"
+    ];
+    unitConfig = {
+      ConditionUser = "mixer";
+    };
+    serviceConfig = {
+      ExecStart = "${pkgs.carla_osc_bridge}/bin/carla_osc_bridge --clients \"127.0.0.1:8080\"";
+      Restart = "always";
+      RestartSec = 5;
+    };
+  };
+
+  # Open stage control service
+  systemd.user.services.osc = {
+    description = "OSC Service";
+    wantedBy = [ "default.target" ];
+    after = [
+      "network.target"
+    ];
+    requires = [
+      "carla.service"
+    ];
+    unitConfig = {
+      ConditionUser = "mixer";
+    };
+    serviceConfig = {
+      ExecStart = "${pkgs.open-stage-control}/bin/open-stage-control --no-gui --send 127.0.0.1:10402 --load /home/mixer/open-stage-control/session.json --theme /home/mixer/open-stage-control/theme.css";
+      Environment = "\"ELECTRON_RUN_AS_NODE=1\"";
+      Restart = "always";
+      RestartSec = 5;
+    };
+  };
+
+  # Create bluetooth A2DP source
+  hardware.bluetooth = {
+    enable = true;
+    disabledPlugins = [ "hostname" ];
+    settings.General = {
+      Name = "Linox";
+      Class = "0x240414";
+      DiscoverableTimeout = 0;
+      AlwaysPairable = true;
+      PairableTimeout = 0;
+      FastConnectable = true;
+      JustWorksRepairing = "always";
+    };
+  };
+  services.pipewire.wireplumber.extraConfig."50-bluetooth-a2dp" = {
+    "monitor.bluez.properties" = {
+      "bluez5.roles" = [ "a2dp_source" ];
+    };
+  };
+
+  # Create null sinks
+  services.pipewire.extraConfig.pipewire."91-null-sinks" = {
+    "context.objects" = [
+      {
+        factory = "adapter";
+        args = {
+          "factory.name" = "support.null-audio-sink";
+          "node.name" = "Speaker-Proxy";
+          "node.description" = "Proxy for Speaker Output";
+          "media.class" = "Audio/Sink";
+          "audio.position" = "L,R";
+        };
+      }
+      {
+        factory = "adapter";
+        args = {
+          "factory.name" = "support.null-audio-sink";
+          "node.name" = "Headphone-Proxy";
+          "node.description" = "Proxy for Headphone Output";
+          "media.class" = "Audio/Sink";
+          "audio.position" = "L,R";
+        };
+      }
+      {
+        factory = "adapter";
+        args = {
+          "factory.name" = "support.null-audio-sink";
+          "node.name" = "SpotifyD-Proxy";
+          "node.description" = "Proxy for SpotifyD";
+          "media.class" = "Audio/Sink";
+          "audio.position" = "L,R";
+        };
+      }
+      {
+        factory = "adapter";
+        args = {
+          "factory.name" = "support.null-audio-sink";
+          "node.name" = "AnalogIn-Proxy";
+          "node.description" = "Proxy for the analog input";
+          "media.class" = "Audio/Source/Virtual";
+          "audio.position" = "L,R";
+        };
+      }
+    ];
+  };
+}

hosts/vm-audio/users/local.nix

@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  home.stateVersion = "24.11";
+
+  modules.profiles.base.enable = true;
+}

hosts/vm-minecraft/configuration.nix

@@ -0,0 +1,45 @@
+{
+  lib,
+  pkgs,
+  config,
+  inputs,
+  ...
+}:
+
+{
+  # State version
+  system.stateVersion = "24.11";
+
+  # Import the nix-minecraft modules
+  imports = [
+    inputs.nix-minecraft.nixosModules.minecraft-servers
+  ];
+
+  # Machine hostname
+  networking.hostName = "vm-minecraft";
+
+  # Enabled modules
+  modules = {
+    profiles.vm.enable = true;
+  };
+
+  # Set up minecraft servers
+  users.users.local.extraGroups = [ "minecraft" ];
+  services.minecraft-servers = {
+    enable = true;
+    eula = true;
+    openFirewall = true;
+    servers = {
+      modpack = {
+        enable = true;
+        autoStart = true;
+        serverProperties = { };
+        package = inputs.nix-modpack.packages.${pkgs.system}.mkModpackServer {
+          packUrl = "https://raw.githubusercontent.com/Jan-Bulthuis/Modpack/refs/heads/master/pack.toml";
+          server = inputs.nix-minecraft.legacyPackages.${pkgs.system}.neoForgeServers.neoforge-20_1_106;
+        };
+        jvmOpts = "-Xms6144M -Xmx8192M";
+      };
+    };
+  };
+}

hosts/vm-minecraft/users/local.nix

@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  home.stateVersion = "24.11";
+
+  modules.profiles.base.enable = true;
+}

hosts/vm-vpn/configuration.nix

@@ -0,0 +1,40 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+
+{
+  # State version
+  system.stateVersion = "24.11";
+
+  # Machine hostname
+  networking.hostName = "vm-vpn";
+
+  # Enabled modules
+  modules = {
+    profiles.vm.enable = true;
+  };
+
+  # Setup wstunnel server
+  services.wstunnel = {
+    enable = true;
+    servers.wg-tunnel = {
+      enableHTTPS = false;
+      listen = {
+        host = "0.0.0.0";
+        port = 8080;
+      };
+      restrictTo = [
+        {
+          host = "10.10.40.100";
+          port = 51820;
+        }
+      ];
+    };
+  };
+  networking.firewall = {
+    allowedTCPPorts = [ 8080 ];
+  };
+}

hosts/vm-vpn/users/local.nix

@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  home.stateVersion = "24.11";
+
+  modules.profiles.base.enable = true;
+}

modules/home/desktop/gnome.nix

@@ -0,0 +1,81 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.desktop.gnome;
+in
+{
+  options.modules.desktop.gnome = {
+    enable = mkEnableOption "gnome";
+  };
+
+  config = mkIf cfg.enable {
+    # TODO: Enable extensions with dconf
+
+    home.pointerCursor = {
+      name = "capitaine-cursors";
+      size = 24;
+      package = pkgs.capitaine-cursors;
+      gtk.enable = true;
+      x11.enable = true;
+    };
+
+    home.packages =
+      with pkgs;
+      [
+        gnome-session
+        gnome-shell
+        gnome-tweaks
+        gnome-calculator
+        snapshot
+        gnome-characters
+        gnome-connections
+        blackbox-terminal
+        baobab
+        gnome-disk-utility
+        papers
+        nautilus
+        gnome-font-viewer
+        loupe
+        gnome-maps
+        gnome-music
+        gnome-control-center
+        gnome-text-editor
+        showtime
+        file-roller
+        mission-center
+        dconf-editor
+
+        # For theming gtk3
+        adw-gtk3
+      ]
+      ++ (with pkgs.gnomeExtensions; [
+        gsconnect
+        disable-workspace-animation
+        wallpaper-slideshow
+        media-progress
+        # luminus-desktop
+      ]);
+
+    # Enable and set the gtk themes
+    gtk = {
+      enable = true;
+      gtk3.extraConfig = {
+        gtk-theme-name = "adw-gtk3";
+      };
+      gtk4.extraConfig = {
+        gtk-theme-name = "Adwaita";
+      };
+    };
+
+    # Set the theme with dconf
+    dconf.settings."org/gnome/desktop/interface" = {
+      gtk-theme = "adw-gtk3";
+    };
+  };
+}

modules/home/development/git.nix

@@ -0,0 +1,53 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.git;
+in
+{
+  options.modules.git = {
+    enable = mkEnableOption "git";
+
+    user = mkOption {
+      type = types.str;
+      description = "Default user name to use.";
+    };
+
+    email = mkOption {
+      type = types.str;
+      description = "Default user email to use.";
+    };
+
+    ignores = mkOption {
+      type = types.listOf types.str;
+      default = [ ];
+      description = "Paths to globally ignore";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      git
+      lazygit
+    ];
+
+    programs.git = {
+      enable = true;
+
+      extraConfig = {
+        pull = {
+          rebase = false;
+        };
+      };
+
+      userName = cfg.user;
+      userEmail = cfg.email;
+      ignores = cfg.ignores;
+    };
+  };
+}

modules/home/development/languages/cpp.nix

@@ -0,0 +1,50 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.cpp;
+in
+{
+  options.modules.cpp = {
+    enable = mkEnableOption "cpp";
+  };
+
+  config = mkIf cfg.enable {
+    # Gitignore additions
+    modules.git.ignores = [
+      ".ccls-cache"
+    ];
+
+    # Development packages
+    home.packages = with pkgs; [
+      gnumake
+      gcc
+    ];
+
+    # VSCode configuration
+    programs.vscode = {
+      profiles.default = {
+        extensions = with pkgs.vscode-extensions; [
+          ms-vscode.cpptools
+          ms-vscode.cmake-tools
+          ms-vscode.cpptools-extension-pack
+        ];
+
+        userSettings = {
+          # TODO: Add setting to set the compiler, it currently needs to be set for each workspace individually
+          # "C_Cpp.clang_format_fallbackStyle" = "{ BasedOnStyle: Google, IndentWidth: 4 }";
+        };
+      };
+    };
+
+    # Neovim configuration
+    # programs.nixvim = {
+    #   plugins.lsp.servers.ccls.enable = true;
+    # };
+  };
+}

modules/home/development/languages/haskell.nix

@@ -0,0 +1,42 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.haskell;
+in
+{
+  options.modules.haskell = {
+    enable = mkEnableOption "haskell";
+  };
+
+  config = mkIf cfg.enable {
+    # Development packages
+    home.packages = with pkgs; [
+      haskell.compiler.ghc948
+      (haskell-language-server.override { supportedGhcVersions = [ "948" ]; })
+    ];
+
+    # VSCode configuration
+    programs.vscode = {
+      profiles.default = {
+        extensions = with pkgs.vscode-extensions; [
+          haskell.haskell
+          justusadam.language-haskell
+        ];
+
+        userSettings = {
+          "[haskell]" = { };
+          # "haskell.formattingProvider" = "fourmolu";
+        };
+      };
+    };
+
+    # Neovim configuration
+    # programs.nixvim = { };
+  };
+}

modules/home/development/languages/js.nix

@@ -0,0 +1,38 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.js;
+in
+{
+  options.modules.js = {
+    enable = mkEnableOption "js";
+  };
+
+  config = mkIf cfg.enable {
+    # Development packages
+    home.packages = with pkgs; [
+      nodejs
+      tailwindcss
+    ];
+
+    # VSCode configuration
+    programs.vscode = {
+      profiles.default = {
+        extensions = with pkgs.vscode-extensions; [
+          bradlc.vscode-tailwindcss
+        ];
+
+        userSettings = { };
+      };
+    };
+
+    # Neovim configuration
+    # programs.nixvim = { };
+  };
+}

modules/home/development/languages/jupyter.nix

@@ -0,0 +1,44 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+# TODO: Move to a module for notebooks in general
+with lib;
+let
+  cfg = config.modules.jupyter;
+in
+{
+  options.modules.jupyter = {
+    enable = mkEnableOption "jupyter";
+  };
+
+  config = mkIf cfg.enable {
+    # Development packages
+    # home.packages = with pkgs; [
+    #   evcxr
+    # ];
+
+    # modules.python.extraPythonPackages = p: [
+    #   p.jupyter
+    #   p.notebook
+    # ];
+
+    # VSCode configuration
+    programs.vscode = {
+      profiles.default = {
+        extensions = with pkgs.vscode-extensions; [
+          ms-toolsai.jupyter
+          ms-toolsai.jupyter-renderers
+        ];
+
+        userSettings = { };
+      };
+    };
+
+    # Neovim configuration
+    # programs.nixvim = { };
+  };
+}

modules/home/development/languages/nix.nix

@@ -0,0 +1,60 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.nix;
+in
+{
+  options.modules.nix = {
+    enable = mkEnableOption "nix";
+  };
+
+  config = mkIf cfg.enable {
+    # Development packages
+    home.packages = with pkgs; [
+      nix-tree
+      nixfmt-rfc-style
+      nixd
+    ];
+
+    # Add nix tree
+    xdg.desktopEntries.nix-tree = {
+      exec = "${pkgs.nix-tree}/bin/nix-tree";
+      name = "Nix Tree";
+      terminal = true;
+      type = "Application";
+    };
+
+    # VSCode configuration
+    programs.vscode = {
+      profiles.default = {
+        extensions = with pkgs.vscode-extensions; [ jnoortheen.nix-ide ];
+
+        userSettings = {
+          "[nix]" = {
+            "editor.tabSize" = 2;
+          };
+          "nix.enableLanguageServer" = true;
+          "nix.serverPath" = "nixd";
+          "nix.serverSettings" = {
+            nixd = {
+              formatting = {
+                command = [ "nixfmt" ];
+              };
+            };
+          };
+        };
+      };
+    };
+
+    # Neovim configuration
+    # programs.nixvim = {
+
+    # };
+  };
+}

modules/home/development/languages/python.nix

@@ -0,0 +1,52 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.python;
+in
+{
+  options.modules.python = {
+    enable = mkEnableOption "python";
+    extraPythonPackages = mkOption {
+      type = types.functionTo (types.listOf types.package) // {
+        merge =
+          loc: defs: p:
+          lib.concatMap (def: (def.value p)) defs;
+      };
+      default = p: [ ];
+      description = "Extra Python packages to install";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    # Development packages
+    home.packages = [ ];
+
+    # VSCode configuration
+    programs.vscode = {
+      profiles.default = {
+        extensions = with pkgs.vscode-extensions; [
+          ms-python.python
+          ms-python.debugpy
+          ms-python.vscode-pylance
+          ms-python.black-formatter
+        ];
+
+        userSettings = {
+          "python.defaultInterpreterPath" = "\${env:PYTHONINTERPRETER}";
+          "[python]" = {
+            "editor.defaultFormatter" = "ms-python.black-formatter";
+          };
+        };
+      };
+    };
+
+    # Neovim configuration
+    # programs.nixvim = { };
+  };
+}

modules/home/development/languages/rust.nix

@@ -0,0 +1,59 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.rust;
+in
+{
+  options.modules.rust = {
+    enable = mkEnableOption "rust";
+  };
+
+  config = mkIf cfg.enable {
+    # Development packages
+    home.packages = with pkgs; [
+      # rustup
+      # rustc
+      # cargo
+      # gcc
+      # lldb
+      # bacon
+      # rust-analyzer
+      # rustfmt
+      # clippy
+      # evcxr
+    ];
+
+    # VSCode configuration
+    programs.vscode = {
+      profiles.default = {
+        extensions = with pkgs.vscode-extensions; [
+          rust-lang.rust-analyzer
+          vadimcn.vscode-lldb
+          tamasfe.even-better-toml
+          serayuzgur.crates
+        ];
+
+        userSettings = {
+          "[rust]" = {
+            "editor.inlayHints.enabled" = "off";
+          };
+          "rust-analyzer.check.command" = "clippy";
+          "rust-analyzer.showUnlinkedFileNotification" = false;
+        };
+      };
+    };
+
+    # Neovim configuration
+    # programs.nixvim = {
+    #   plugins.rustaceanvim = {
+    #     enable = true;
+    #   };
+    # };
+  };
+}

modules/home/development/languages/tex.nix

@@ -0,0 +1,69 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.tex;
+in
+{
+  options.modules.tex = {
+    enable = mkEnableOption "tex";
+  };
+
+  config = mkIf cfg.enable {
+    # Development packages
+    home.packages = with pkgs; [
+      (texlive.combine {
+        inherit (texlive) scheme-full;
+      })
+    ];
+
+    # Pygments for minted
+    modules.python.extraPythonPackages = p: [
+      p.pygments
+    ];
+
+    # VSCode configuration
+    programs.vscode = {
+      profiles.default = {
+        extensions = with pkgs.vscode-extensions; [ jnoortheen.nix-ide ];
+
+        userSettings = {
+          "[tex]" = { };
+        };
+      };
+    };
+
+    # Neovim configuration
+    # programs.nixvim = {
+    #   extraConfigVim = ''
+    #     " Enforce latexmk
+    #     let g:vimtex_compiler_method = 'latexmk'
+
+    #     " Set latexmk compilation settings
+    #     let g:vimtex_compiler_latexmk = {
+    #       \ 'options': [
+    #       \   '-shell-escape',
+    #       \   '-verbose',
+    #       \   '-file-line-error',
+    #       \   '-synctex=1',
+    #       \   '-interaction=nonstopmode',
+    #       \ ],
+    #       \}
+    #   '';
+
+    #   # Vimtex plugin
+    #   plugins.vimtex = {
+    #     enable = true;
+    #     texlivePackage = null;
+    #     settings = {
+    #       view_method = "zathura";
+    #     };
+    #   };
+    # };
+  };
+}

modules/home/development/mathematica.nix

@@ -0,0 +1,27 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.mathematica;
+
+  my-mathematica = pkgs.mathematica.override {
+    # TODO: Just use a generic name for the installer?
+    # source = ./Wolfram_14.2.1_LIN_Bndl.sh;
+  };
+in
+{
+  options.modules.mathematica = {
+    enable = mkEnableOption "mathematica";
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [
+      my-mathematica
+    ];
+  };
+}

modules/home/development/neovim.nix

@@ -0,0 +1,190 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.neovim;
+  # theme = config.desktop.theming;
+  # colors = theme.colors;
+in
+{
+  options.modules.neovim = {
+    enable = mkEnableOption "neovim";
+  };
+
+  config = mkIf cfg.enable {
+    # programs.nixvim = {
+    #   enable = true;
+    #   defaultEditor = true;
+    #   viAlias = true;
+    #   vimAlias = true;
+
+    #   # extraPackages = with pkgs; [ ];
+
+    #   opts = {
+    #     number = true;
+    #     relativenumber = true;
+
+    #     signcolumn = "yes";
+
+    #     ignorecase = true;
+    #     smartcase = true;
+
+    #     tabstop = 4;
+    #     shiftwidth = 4;
+    #     softtabstop = 0;
+    #     expandtab = true;
+    #     smarttab = true;
+
+    #     list = true;
+    #     listchars = "tab:»┈«,trail:·,extends:→,precedes:←,nbsp:␣";
+    #   };
+
+    #   diagnostic.settings = {
+    #     enable = true;
+    #     signs = true;
+    #     underline = true;
+    #     update_in_insert = true;
+    #   };
+
+    #   extraConfigLua = ''
+    #     vim.fn.sign_define("DiagnosticSignError",
+    #       {text = "", texthl = "DiagnosticSignError"})
+    #     vim.fn.sign_define("DiagnosticSignWarn",
+    #       {text = "", texthl = "DiagnosticSignWarn"})
+    #     vim.fn.sign_define("DiagnosticSignInfo",
+    #       {text = "", texthl = "DiagnosticSignInfo"})
+    #     vim.fn.sign_define("DiagnosticSignHint",
+    #       {text = "💡", texthl = "DiagnosticSignHint"})
+    #   '';
+
+    #   keymaps = [
+    #     # Save shortcut
+    #     {
+    #       action = ":update<CR>";
+    #       key = "<C-s>";
+    #       mode = "n";
+    #     }
+    #     {
+    #       action = "<C-o>:update<CR>";
+    #       key = "<C-s>";
+    #       mode = "i";
+    #     }
+
+    #     # Neo tree
+    #     {
+    #       action = ":Neotree action=focus reveal toggle<CR>";
+    #       key = "<leader>n";
+    #       mode = "n";
+    #       options.silent = true;
+    #     }
+    #   ];
+
+    #   autoCmd = [
+    #     {
+    #       desc = "Automatic formatting";
+    #       event = "BufWritePre";
+    #       callback = {
+    #         __raw = ''
+    #           function()
+    #             vim.lsp.buf.format {
+    #               async = false,
+    #             }
+    #           end
+    #         '';
+    #       };
+    #     }
+    #   ];
+
+    #   # highlight = {
+    #   #   Comment = {
+    #   #     italic = true;
+    #   #     fg = theme.schemeColors.withHashtag.base03; # TODO: Come up with a good name colors.muted maybe?
+    #   #   };
+    #   # };
+
+    #   plugins.lsp = {
+    #     enable = true;
+    #   };
+
+    #   #plugins.treesitter = {
+    #   #  enable = true;
+    #   #};
+
+    #   plugins.cmp = {
+    #     enable = true;
+
+    #     settings = {
+    #       mapping = {
+    #         "<C-Space>" = "cmp.mapping.complete()";
+    #         "<C-d>" = "cmp.mapping.scroll_docs(-4)";
+    #         "<C-e>" = "cmp.mapping.close()";
+    #         "<C-f>" = "cmp.mapping.scroll_docs(4)";
+    #         "<CR>" = "cmp.mapping.confirm({ select = true })";
+    #         "<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
+    #         "<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
+    #       };
+    #       sources = [
+    #         { name = "path"; }
+    #         { name = "nvim_lsp"; }
+    #       ];
+    #     };
+    #   };
+
+    #   plugins.web-devicons = {
+    #     enable = true;
+    #   };
+
+    #   plugins.neo-tree = {
+    #     enable = true;
+
+    #     closeIfLastWindow = true;
+    #     window = {
+    #       width = 30;
+    #       autoExpandWidth = true;
+    #     };
+
+    #     extraOptions = {
+    #       default_component_configs.git_status.symbols = {
+    #         # Change type
+    #         added = "+";
+    #         deleted = "✕";
+    #         modified = "✦";
+    #         renamed = "→";
+
+    #         # Status type
+    #         untracked = "?";
+    #         ignored = "▫";
+    #         unstaged = "□";
+    #         staged = "■";
+    #         conflict = "‼";
+    #       };
+    #     };
+    #   };
+
+    #   #plugins.cmp-nvim-lsp.enable = true;
+
+    #   plugins.gitsigns = {
+    #     enable = true;
+    #     settings.current_line_blame = true;
+    #   };
+
+    #   #plugins.copilot-vim = {
+    #   #  enable = true;
+    #   #};
+
+    #   # plugins.vimtex = {
+    #   #   enable = true;
+    #   #   texlivePackage = null;
+    #   #   settings = {
+    #   #     view_method = "zathura";
+    #   #   };
+    #   # };
+    # };
+    # programs.neovim.defaultEditor = true;
+  };
+}

modules/home/development/vscode.nix

@@ -0,0 +1,99 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.vscode;
+  # theme = config.desktop.theming;
+in
+{
+  options.modules.vscode = {
+    enable = mkEnableOption "vscode";
+    # codeFont = mkOption {
+    #   type = types.anything;
+    #   default = theme.fonts.pkgs."Fira Code";
+    # };
+    # fallbackFont = mkOption {
+    #   type = types.anything;
+    #   default = theme.fonts.pkgs."Symbols Nerd Font Mono";
+    # };
+  };
+
+  config = mkIf cfg.enable {
+    # TODO: Fix theming
+    # desktop.theming.fonts.extraFonts = [ cfg.codeFont ];
+
+    programs.vscode = {
+      enable = true;
+
+      mutableExtensionsDir = false;
+      profiles.default = {
+        extensions = with pkgs.vscode-extensions; [
+          eamodio.gitlens
+          ms-vscode.hexeditor
+          mkhl.direnv
+          usernamehw.errorlens
+          gruntfuggly.todo-tree
+          github.copilot
+          github.copilot-chat
+          tomoki1207.pdf
+          ms-vsliveshare.vsliveshare
+          ms-vscode-remote.remote-ssh
+        ];
+
+        userSettings =
+          let
+            # font-family = mkForce "'${cfg.codeFont.name}', '${cfg.fallbackFont.name}'";
+            # TODO: Move the conversion factor to theme settings
+            # font-size = mkForce cfg.codeFont.recommendedSize; # Convert pt to px
+          in
+          {
+            # Font setup
+            # "editor.fontFamily" = font-family;
+            # "editor.inlayHints.fontFamily" = font-family;
+            # "editor.inlineSuggest.fontFamily" = font-family;
+            # "editor.fontSize" = font-size;
+            # "editor.fontLigatures" = true;
+            # "terminal.integrated.fontFamily" = font-family;
+            # "terminal.integrated.fontSize" = font-size;
+            # "chat.editor.fontFamily" = font-family; # TODO: Change this font to the standard UI font
+            # "chat.editor.fontSize" = font-size;
+            # "debug.console.fontFamily" = font-family;
+            # "debug.console.fontSize" = font-size;
+            # "scm.inputFontFamily" = font-family; # TODO: Change this font to the standard UI font
+            # "scm.inputFontSize" = font-size;
+            # "markdown.preview.fontFamily" = mkForce theme.fonts.sansSerif.name; # TODO: Change this font to the standard UI font
+            # "markdown.preview.fontSize" = mkForce theme.fonts.sansSerif.recommendedSize;
+
+            # Formatting
+            "editor.formatOnSave" = true;
+            "editor.tabSize" = 4;
+
+            # Layout
+            "window.menuBarVisibility" = "hidden";
+
+            # Git settings
+            "git.autofetch" = true;
+            "git.enableSmartCommit" = false;
+            "git.suggestSmartCommit" = false;
+
+            # Disable update notifications
+            "update.mode" = "none";
+
+            # Set themes
+            "window.autoDetectColorScheme" = true;
+
+            # TODO: Move to direnv module
+            # Ignore direnv folder
+            "files.exclude" = {
+              ".direnv" = true;
+            };
+          };
+      };
+    };
+  };
+}

modules/home/utilities/bash.nix

@@ -0,0 +1,27 @@
+{
+  lib,
+  config,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.bash;
+in
+{
+  options.modules.bash = {
+    enable = mkEnableOption "bash";
+    aliases = mkOption {
+      type = types.attrsOf types.str;
+      default = {
+        "..." = "cd ../..";
+      };
+      description = "Shell aliases";
+    };
+  };
+
+  config.programs.bash = {
+    enable = cfg.enable;
+    shellAliases = cfg.aliases;
+  };
+}

modules/home/utilities/direnv.nix

@@ -0,0 +1,26 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.direnv;
+in
+{
+  options.modules.direnv = {
+    enable = mkEnableOption "direnv";
+  };
+
+  config = mkIf cfg.enable {
+    programs.direnv = {
+      enable = true;
+      nix-direnv.enable = true;
+    };
+    modules.git.ignores = [
+      ".direnv"
+    ];
+  };
+}

modules/home/utilities/fish.nix

@@ -0,0 +1,57 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.fish;
+in
+{
+  options.modules.fish = {
+    enable = mkEnableOption "fish";
+  };
+
+  config = mkIf cfg.enable {
+    # Make bash load into fish
+    # Bash will remain the default shell as fish is not POSIX compliant.
+    modules.bash.enable = true;
+    programs.bash.initExtra = ''
+      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
+    '';
+
+    # Actual fish configuration
+    programs.fish = {
+      enable = true;
+
+      shellAliases = config.modules.bash.aliases;
+
+      plugins = [
+        {
+          name = "done";
+          src = pkgs.fishPlugins.done.src;
+        }
+        {
+          name = "fzf";
+          src = pkgs.fishPlugins.fzf-fish.src;
+        }
+        {
+          name = "grc";
+          src = pkgs.fishPlugins.grc.src;
+        }
+      ];
+    };
+
+    # Fish plugin dependencies
+    home.packages = with pkgs; [
+      fzf
+      grc
+    ];
+  };
+}

modules/home/utilities/impermanence.nix

@@ -0,0 +1,35 @@
+{ lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.impermanence;
+in
+{
+  options.modules.impermanence = {
+    enable = mkEnableOption "Impermanence";
+    directories = mkOption {
+      type = types.listOf types.str;
+      default = [ ];
+      description = ''
+        Directories that should be stored in persistent storage.
+      '';
+    };
+    files = mkOption {
+      type = types.listOf types.str;
+      default = [ ];
+      description = ''
+        Files that should be stored in persistent storage.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.persistence."/persist/home/${config.home.username}" = {
+      enable = true;
+      hideMounts = true;
+      allowOther = true;
+      directories = cfg.directories;
+      files = cfg.files;
+    };
+  };
+}

modules/home/utilities/xpra.nix

@@ -0,0 +1,63 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.xpra;
+in
+{
+  options.modules.xpra = {
+    enable = mkEnableOption "Enable xpra";
+    hosts = mkOption {
+      type = types.listOf types.str;
+      default = { };
+      description = "xpra hosts";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      xpra
+    ];
+
+    xdg.desktopEntries = (
+      listToAttrs (
+        map
+          (entry: {
+            name = "xpra${
+              builtins.substring 0 12 (builtins.hashString "sha256" "${entry.name} (${entry.comment})")
+            }";
+            value = entry // {
+              type = "Application";
+              terminal = false;
+              genericName = entry.comment;
+            };
+          })
+          (
+            concatMap (
+              host:
+              let
+                uri = "tcp://${host}:15151/7";
+              in
+              [
+                {
+                  name = "Xpra - Attach";
+                  comment = host;
+                  exec = "xpra attach --min-quality=100 --min-speed=100 --encoding=png --speaker=off ${uri}";
+                }
+                {
+                  name = "Xpra - Detach";
+                  comment = host;
+                  exec = "xpra detach ${uri}";
+                }
+              ]
+            ) cfg.hosts
+          )
+      )
+    );
+  };
+}

modules/nixos/bluetooth.nix

@@ -0,0 +1,18 @@
+{ lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.bluetooth;
+in
+{
+  options.modules.bluetooth = {
+    enable = mkEnableOption "bluetooth";
+  };
+  config = mkIf cfg.enable {
+    # Enable bluetooth
+    hardware.bluetooth = {
+      enable = true;
+      powerOnBoot = true;
+    };
+  };
+}

modules/nixos/bootloader.nix

@@ -0,0 +1,20 @@
+{ lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.bootloader;
+in
+{
+  options.modules.bootloader = {
+    enable = mkEnableOption "bootloader";
+  };
+  config = mkIf cfg.enable {
+    # Bootloader
+    boot.loader = {
+      timeout = 0;
+      systemd-boot.enable = true;
+      systemd-boot.editor = false;
+      efi.canTouchEfiVariables = true;
+    };
+  };
+}

modules/nixos/disko.nix

@@ -0,0 +1,24 @@
+{
+  lib,
+  config,
+  inputs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.disko;
+  profile = import "${inputs.self}/profiles/disko/${cfg.profile}.nix";
+in
+{
+  options.modules.disko = {
+    enable = mkEnableOption "Disko module";
+    profile = mkOption {
+      type = types.str;
+      default = null;
+      description = "The profile to use for the disko module.";
+    };
+  };
+
+  config = mkIf cfg.enable { disko.devices = profile.disko.devices; };
+}

modules/nixos/fonts.nix

@@ -0,0 +1,35 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.fonts;
+in
+{
+  options.modules.fonts = {
+    enable = mkEnableOption "fonts";
+  };
+  config = mkIf cfg.enable {
+    console.packages = [
+      pkgs.dina-psfu
+    ];
+    console.font = "dina";
+    console.earlySetup = true;
+
+    # TODO: Disable default fonts, fonts should be managed per user
+    # fonts.enableDefaultPackages = false;
+    # fonts.fontconfig = {
+    #   enable = true;
+    #   defaultFonts = {
+    #     serif = mkDefault [ ];
+    #     sansSerif = mkDefault [ ];
+    #     monospace = mkDefault [ ];
+    #     emoji = mkDefault [ ];
+    #   };
+    # };
+  };
+}

modules/nixos/gnome.nix

@@ -0,0 +1,79 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.gnome;
+in
+{
+  options.modules.gnome = {
+    enable = mkEnableOption "gnome";
+    # TODO: Add RDP toggle
+  };
+
+  config = mkIf cfg.enable {
+    # Enable GDM and Gnome
+    services.xserver.enable = true;
+    services.xserver.displayManager.gdm.enable = true;
+    services.xserver.desktopManager.gnome.enable = true;
+    services.gnome.core-utilities.enable = false;
+    services.gnome.games.enable = false;
+    services.gnome.core-developer-tools.enable = false;
+    environment.gnome.excludePackages = with pkgs; [
+      adwaita-icon-theme
+      (derivation { name = "nixos-background-info"; })
+      gnome-backgrounds
+      gnome-bluetooth
+      gnome-color-manager
+      gnome-control-center
+      gnome-shell-extensions
+      gnome-tour
+      gnome-user-docs
+      glib
+      gnome-menus
+      gtk3.out
+      xdg-user-dirs
+      xdg-user-dirs-gtk
+    ];
+
+    # Enable Gnome Remote Desktop
+    services.gnome.gnome-remote-desktop.enable = true;
+    systemd.services."gnome-remote-desktop".wantedBy = [ "graphical.target" ];
+    networking.firewall = {
+      allowedTCPPorts = [
+        3389
+        3390
+      ];
+      allowedUDPPorts = [
+        3389
+        3390
+      ];
+    };
+
+    # For GSConnect/KDE Connect
+    # TODO: Move to host config?
+    networking.firewall = {
+      allowedTCPPortRanges = [
+        {
+          from = 1714;
+          to = 1764;
+        }
+      ];
+      allowedUDPPortRanges = [
+        {
+          from = 1714;
+          to = 1764;
+        }
+      ];
+    };
+
+    # Enable dependencies
+    modules = {
+      networkmanager.enable = true;
+    };
+  };
+}

modules/nixos/graphics.nix

@@ -0,0 +1,22 @@
+{ lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.graphics;
+in
+{
+  options.modules.graphics = {
+    enable = mkEnableOption "graphics";
+    # TODO: Add toggle for hybrid graphics
+  };
+  config = mkIf cfg.enable {
+    hardware.graphics.enable = true;
+    hardware.graphics.enable32Bit = true;
+    services.xserver.videoDrivers = [ "nvidia" ];
+    # TODO: Add nvidia settings back in
+    # TODO: Move to nvidia module
+    hardware.nvidia = {
+      open = true;
+    };
+  };
+}

modules/nixos/impermanence.nix

@@ -0,0 +1,46 @@
+{ lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.impermanence;
+in
+{
+  options.modules.impermanence = {
+    enable = mkEnableOption "Impermanence";
+    directories = mkOption {
+      type = types.listOf types.str;
+      default = [ ];
+      description = ''
+        Directories that should be stored in persistent storage.
+      '';
+    };
+    files = mkOption {
+      type = types.listOf types.str;
+      default = [ ];
+      description = ''
+        Files that should be stored in persistent storage.
+      '';
+    };
+    resetScript = mkOption {
+      type = types.lines;
+      description = ''
+        Script to run on boot that resets the root partition.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    fileSystems."/persist".neededForBoot = true;
+    boot.initrd.postResumeCommands = mkAfter cfg.resetScript;
+
+    # For home-manager persistence
+    programs.fuse.userAllowOther = true;
+
+    environment.persistence."/persist/system" = {
+      enable = true;
+      hideMounts = true;
+      directories = cfg.directories;
+      files = cfg.files;
+    };
+  };
+}

modules/nixos/networkmanager.nix

@@ -0,0 +1,15 @@
+{ lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.networkmanager;
+in
+{
+  options.modules.networkmanager = {
+    enable = mkEnableOption "networkmanager";
+  };
+  config = mkIf cfg.enable {
+    # TODO: Add sudo users to the networkmanager group?
+    networking.networkmanager.enable = true;
+  };
+}

modules/nixos/power-saving.nix

@@ -0,0 +1,20 @@
+{ lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.power-saving;
+in
+{
+  options.modules.power-saving = {
+    enable = mkEnableOption "power saving";
+  };
+  config = mkIf cfg.enable {
+    # Setup power management
+    powerManagement.enable = true;
+    services.thermald.enable = true;
+    services.power-profiles-daemon.enable = true;
+
+    # Enable wifi power saving
+    networking.networkmanager.wifi.powersave = true;
+  };
+}

modules/nixos/printing.nix

@@ -0,0 +1,25 @@
+{ lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.printing;
+in
+{
+  options.modules.printing = {
+    enable = mkEnableOption "printing";
+  };
+  config = mkIf cfg.enable {
+    # Enable CUPS
+    services.printing.enable = true;
+
+    # Enable Avahi to auto-detect network printers
+    services.avahi = {
+      enable = true;
+      nssmdns4 = true;
+      openFirewall = true;
+    };
+
+    # For SMB network printers
+    services.samba.enable = true;
+  };
+}

modules/nixos/sound.nix

@@ -0,0 +1,24 @@
+{ lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.sound;
+in
+{
+  options.modules.sound = {
+    enable = mkEnableOption "sound";
+  };
+  config = mkIf cfg.enable {
+    # Enable pipewire
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      jack.enable = true;
+    };
+
+    # Recommended by wiki, allows user processes to use realtime kernel
+    security.rtkit.enable = true;
+  };
+}

modules/nixos/ssh.nix

@@ -0,0 +1,15 @@
+{ lib, config, ... }:
+
+with lib;
+let
+  cfg = config.modules.ssh;
+in
+{
+  options.modules.ssh = {
+    enable = mkEnableOption "ssh";
+  };
+  config = mkIf cfg.enable {
+    services.openssh.enable = true;
+    # TODO: Is this default configuration secure?
+  };
+}

packages/dina-psfu.nix

@@ -0,0 +1,73 @@
+{
+  pkgs,
+  ...
+}:
+
+pkgs.stdenv.mkDerivation {
+  pname = "dina-psfu";
+  version = "1.0.0";
+
+  src = pkgs.fetchzip {
+    url = "https://www.dcmembers.com/jibsen/download/61/?wpdmdl=61";
+    hash = "sha256-JK+vnOyhAbwT825S+WKbQuWgRrfZZHfyhaMQ/6ljO8s=";
+    extension = "zip";
+    stripRoot = false;
+  };
+
+  buildInputs = with pkgs; [
+    bdf2psf
+    fontforge
+  ];
+
+  buildPhase = ''
+    # Get the base Dina font
+    cp BDF/Dina_r400-9.bdf ./dina.bdf
+
+    # Set the AVERAGE_WIDTH property on the font
+    sed 's/STARTPROPERTIES 16/STARTPROPERTIES 17\
+    AVERAGE_WIDTH 70/' ./dina.bdf > ./dina-mod.bdf
+
+    # Reencode the font from code page CP1252 (Windows) to unicode
+    fontforge -lang=ff -c "Open(\"dina-mod.bdf\"); Reencode(\"win\", 1); Reencode(\"iso10646-1\"); Generate(\"dina-enc.bdf\")"
+    mv dina-enc-*.bdf dina-enc.bdf
+
+    # Move the artsy characters around
+    sed -i 's/STARTCHAR uni000E$/STARTCHAR uni2518/' ./dina-enc.bdf
+    sed -i 's/ENCODING 14$/ENCODING 9496/' ./dina-enc.bdf
+    sed -i 's/STARTCHAR uni000F$/STARTCHAR uni2514/' ./dina-enc.bdf
+    sed -i 's/ENCODING 15$/ENCODING 9492/' ./dina-enc.bdf
+    sed -i 's/STARTCHAR uni0010$/STARTCHAR uni250C/' ./dina-enc.bdf
+    sed -i 's/ENCODING 16$/ENCODING 9484/' ./dina-enc.bdf
+    sed -i 's/STARTCHAR uni0011$/STARTCHAR uni2510/' ./dina-enc.bdf
+    sed -i 's/ENCODING 17$/ENCODING 9488/' ./dina-enc.bdf
+    sed -i 's/STARTCHAR uni0012$/STARTCHAR uni2500/' ./dina-enc.bdf
+    sed -i 's/ENCODING 18$/ENCODING 9472/' ./dina-enc.bdf
+    sed -i 's/STARTCHAR uni0013$/STARTCHAR uni2502/' ./dina-enc.bdf
+    sed -i 's/ENCODING 19$/ENCODING 9474/' ./dina-enc.bdf
+    sed -i 's/STARTCHAR uni0014$/STARTCHAR uni2524/' ./dina-enc.bdf
+    sed -i 's/ENCODING 20$/ENCODING 9508/' ./dina-enc.bdf
+    sed -i 's/STARTCHAR uni0015$/STARTCHAR uni2534/' ./dina-enc.bdf
+    sed -i 's/ENCODING 21$/ENCODING 9524/' ./dina-enc.bdf
+    sed -i 's/STARTCHAR uni0016$/STARTCHAR uni251C/' ./dina-enc.bdf
+    sed -i 's/ENCODING 22$/ENCODING 9500/' ./dina-enc.bdf
+    sed -i 's/STARTCHAR uni0017$/STARTCHAR uni252C/' ./dina-enc.bdf
+    sed -i 's/ENCODING 23$/ENCODING 9516/' ./dina-enc.bdf
+    sed -i 's/STARTCHAR uni0018$/STARTCHAR uni253C/' ./dina-enc.bdf
+    sed -i 's/ENCODING 24$/ENCODING 9532/' ./dina-enc.bdf
+    sed -i 's/STARTCHAR uni0019$/STARTCHAR uni2592/' ./dina-enc.bdf
+    sed -i 's/ENCODING 25$/ENCODING 9618/' ./dina-enc.bdf
+
+    # Create the equivalents file
+    touch empty.equivalents
+
+    # Convert the bdf to psf
+    bdf2psf --fb ./dina-enc.bdf \
+      ./empty.equivalents \
+      ${pkgs.bdf2psf}/share/bdf2psf/fontsets/Uni2.512 \
+      512 ./dina.psfu ./dina.sfm
+  '';
+
+  installPhase = ''
+    install -Dm644 -t $out/share/consolefonts dina.psfu
+  '';
+}

profiles/disko/vm.nix

@@ -0,0 +1,56 @@
+{
+  disko.devices = {
+    disk = {
+      main = {
+        type = "disk";
+        content = {
+          type = "gpt";
+          partitions = {
+            boot = {
+              size = "512M";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+                mountOptions = [ "umask=0077" ];
+              };
+            };
+            zfs = {
+              size = "100%";
+              content = {
+                type = "zfs";
+                pool = "tank";
+              };
+            };
+          };
+        };
+      };
+    };
+    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

@@ -0,0 +1,31 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.profiles.base;
+in
+{
+  options.modules.profiles.base = {
+    enable = mkEnableOption "Base home-manager profile";
+  };
+
+  config = mkIf cfg.enable {
+    modules = {
+      # btop.enable = true;
+      direnv.enable = true;
+      fish.enable = true;
+      # scripts.enable = true;
+
+      # Development
+      # neovim.enable = true;
+
+      # Languages
+      nix.enable = true;
+    };
+  };
+}

profiles/home/gnome.nix

@@ -0,0 +1,48 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.profiles.gnome;
+in
+{
+  options.modules.profiles.gnome = {
+    enable = mkEnableOption "Graphical GNOME environment";
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      firefox # TODO: Move to dediated module
+    ];
+
+    modules = {
+      profiles.base.enable = true;
+
+      # Desktop environment
+      desktop.gnome.enable = true;
+      # desktop.tiling.enable = true;
+
+      # Browser
+      # firefox = {
+      #   enable = true;
+      #   default = false;
+      # };
+      # qutebrowser = {
+      #   enable = true;
+      #   default = true;
+      # };
+
+      # Tools
+      # obsidian.enable = true;
+      # zathura.enable = true;
+
+      # Development
+      # neovim.enable = true;
+      vscode.enable = true;
+    };
+  };
+}

profiles/home/jan.nix

@@ -0,0 +1,87 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.profiles.jan;
+in
+{
+  options.modules.profiles.jan = {
+    enable = mkEnableOption "Jan's personal profile";
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      libreoffice-still
+      remmina
+      thunderbird
+      signal-desktop
+      prusa-slicer
+      freecad-wayland
+      inkscape
+      ente-auth
+      bitwarden
+      carla
+      winbox
+      whatsapp-for-linux
+      discord
+      steam
+      spotify
+      # feishin # TODO: Fix or replace as insecure
+      eduvpn-client
+      river # TODO: Move
+      ryubing
+      bottles
+      prismlauncher
+      foliate
+      wireshark
+    ];
+
+    modules = {
+      profiles.gnome.enable = true;
+
+      # Gaming
+      # retroarch.enable = true;
+      # ryujinx.enable = true;
+
+      # Tools
+      git = {
+        enable = true;
+        user = "Jan-Bulthuis";
+        email = "git@bulthuis.dev";
+        # TODO: Move
+        ignores = [
+          ".envrc"
+          ".direnv"
+          "flake.nix"
+          "flake.lock"
+        ];
+      };
+      xpra = {
+        enable = true;
+        hosts = [
+          "mixer@10.20.60.251"
+        ];
+      };
+
+      # Development
+      # docker.enable = true;
+      # matlab.enable = true;
+      mathematica.enable = true;
+
+      # Languages
+      haskell.enable = false;
+      js.enable = true;
+      nix.enable = true;
+      rust.enable = true;
+      python.enable = true;
+      cpp.enable = true;
+      tex.enable = true;
+      jupyter.enable = false;
+    };
+  };
+}

profiles/nixos/base.nix

@@ -0,0 +1,70 @@
+{
+  mkModule,
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.profiles.base;
+in
+{
+  options.modules.profiles.base = {
+    enable = mkEnableOption "base profile";
+  };
+
+  config = mkIf cfg.enable {
+    modules = {
+      bootloader.enable = mkDefault true;
+      ssh.enable = mkDefault true;
+
+      # Setup sensible default persistent data
+      impermanence.directories = [
+        "/var/lib/nixos"
+      ];
+      impermanence.files = [
+        "/etc/shadow"
+      ];
+    };
+
+    # Localization
+    time.timeZone = "Europe/Amsterdam";
+    i18n.defaultLocale = "en_US.UTF-8";
+    console.keyMap = "us";
+
+    # Enable neovim
+    programs.neovim = {
+      enable = true;
+      defaultEditor = true;
+    };
+
+    # Allow unfree packages
+    nixpkgs.config.allowUnfree = true;
+
+    # Enable the usage of flakes
+    nix.settings.experimental-features = [
+      "nix-command"
+      "flakes"
+    ];
+
+    # Clean tmp
+    boot.tmp.cleanOnBoot = true;
+
+    # Base packages
+    environment.systemPackages = with pkgs; [
+      git
+      wget
+      curl
+      dig
+      procps
+      wireguard-tools
+      usbutils
+      pciutils
+      zip
+      unzip
+      tmux
+    ];
+  };
+}

profiles/nixos/desktop.nix

@@ -0,0 +1,28 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.profiles.desktop;
+in
+{
+  options.modules.profiles.desktop = {
+    enable = mkEnableOption "desktop profile";
+  };
+
+  config = mkIf cfg.enable {
+    modules = {
+      profiles.base.enable = mkDefault true;
+      fonts.enable = mkDefault true;
+      graphics.enable = mkDefault true;
+      gnome.enable = mkDefault true; # TODO: Rename to display manager?
+      networkmanager.enable = mkDefault true;
+      printing.enable = mkDefault true;
+      sound.enable = mkDefault true;
+    };
+  };
+}

profiles/nixos/laptop.nix

@@ -0,0 +1,30 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.profiles.laptop;
+in
+{
+  options.modules.profiles.laptop = {
+    enable = mkEnableOption "laptop profile";
+  };
+
+  config = mkIf cfg.enable {
+    # Setup modules
+    modules = {
+      profiles.desktop.enable = mkDefault true;
+      bluetooth.enable = mkDefault true;
+      power-saving.enable = mkDefault true;
+    };
+
+    # Add packages
+    environment.systemPackages = with pkgs; [
+      brightnessctl
+    ];
+  };
+}

profiles/nixos/vm.nix

@@ -0,0 +1,77 @@
+{
+  mkModule,
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.profiles.vm;
+in
+{
+  options.modules.profiles.vm = {
+    enable = mkEnableOption "Base VM profile";
+  };
+
+  config = mkIf cfg.enable {
+    # Enabled modules
+    modules = {
+      profiles.base.enable = true;
+      disko = {
+        enable = true;
+        profile = "vm";
+      };
+      impermanence = {
+        enable = true;
+        resetScript = ''
+          # Revert to the blank state for the root directory
+          zfs rollback -r tank/root@blank
+        '';
+      };
+      ssh.enable = true;
+    };
+
+    # Admin users
+    users.users.local = {
+      initialPassword = "local";
+      extraGroups = [ "wheel" ];
+      openssh.authorizedKeys.keys = [
+        "ssh-ed25519  jan@bulthuis.dev"
+      ];
+    };
+
+    # Enable qemu guest agent
+    services.qemuGuest.enable = true;
+
+    # Machine platform
+    nixpkgs.hostPlatform = "x86_64-linux";
+
+    # Set hostid for ZFS
+    networking.hostId = "deadbeef";
+
+    # Hardware configuration
+    hardware.enableRedistributableFirmware = true;
+    boot.initrd.availableKernelModules = [
+      "ata_piix"
+      "uhci_hcd"
+      "virtio_pci"
+      "virtio_scsi"
+      "sd_mod"
+      "sr_mod"
+    ];
+    boot.initrd.kernelModules = [ ];
+    boot.kernelModules = [ "kvm-intel" ];
+    boot.extraModulePackages = [ ];
+    hardware.cpu.intel.updateMicrocode = true;
+
+    # Swapfile
+    swapDevices = [
+      {
+        device = "/var/lib/swapfile";
+        size = 6 * 1024;
+      }
+    ];
+  };
+}