Changed location of some persistence files

Reviewed-on: Jan/dotfiles#1

README.md

@@ -1,3 +1,11 @@
 # 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
+```

default.nix

@@ -1,11 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    # Import modules
-    ./modules/default.nix
-
-    # Import custom packages
-    ./pkgs/default.nix
-  ];
-}

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;
+}

machines/laptop.nix

@@ -1,30 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    # Import environment
-    ../default.nix
-  ];
-
-  config = {
-    # State version
-    system.stateVersion = "24.05";
-
-    # Machine hostname
-    networking.hostName = "20212060";
-
-    # Enabled modules
-    modules = {
-      base.enable = true;
-      power-saving.enable = false;
-      pipewire.enable = true;
-      wpa_supplicant.enable = true;
-    };
-
-    # User accounts
-    machine.users.jan = {
-      sudo = true;
-      configuration = ../users/jan.nix;
-    };
-  };
-}

modules/base/default.nix

@@ -1,46 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.base;
-in
-{
-  options.modules.base = {
-    enable = mkEnableOption "base";
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      # Add base linux utilities
-      git
-      wget
-      curl
-      dig
-      procps
-    ];
-
-    modules = {
-      # Enable base modules
-      clean-tmp.enable = true;
-      fontconfig.enable = true;
-      neovim.enable = true;
-      systemd-boot.enable = true;
-      tuigreet.enable = true;
-      tailscale.enable = true;
-    };
-
-    # TODO: Remove everything below, it is here out of convenience and should be elsewhere
-    programs.dconf.enable = true;
-    services.libinput.enable = true;
-    modules.unfree.enable = true;
-    modules.unfree.allowedPackages = [
-      "nvidia-x11"
-      "nvidia-settings"
-    ];
-  };
-}

modules/boot/clean-tmp.nix

@@ -1,18 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.clean-tmp;
-in
-{
-  options.modules.clean-tmp = {
-    enable = mkEnableOption "clean-tmp";
-  };
-
-  config = mkIf cfg.enable { boot.tmp.cleanOnBoot = true; };
-}

modules/boot/silent-boot.nix

@@ -1,37 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.silent-boot;
-in
-{
-  options.modules.silent-boot = {
-    enable = mkEnableOption "silent-boot";
-  };
-
-  config = mkIf cfg.enable {
-    boot = {
-      loader.timeout = 0;
-
-      consoleLogLevel = 0;
-      initrd.verbose = false;
-      initrd.checkJournalingFS = false;
-
-      kernelParams = [
-        "quiet"
-        "boot.shell_on_fail"
-        "loglevel=3"
-        "rd.systemd.show_status=false"
-        "rd.udev.log_level=3"
-        "udev.log_priority=3"
-        "video=efifb:nobgrt"
-        "bgrt_disable"
-      ];
-    };
-  };
-}

modules/brightnessctl/default.nix

@@ -1,18 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.brightnessctl;
-in
-{
-  options.modules.brightnessctl = {
-    enable = mkEnableOption "brightnessctl";
-  };
-
-  config = mkIf cfg.enable { environment.systemPackages = [ pkgs.brightnessctl ]; };
-}

modules/default.nix

@@ -1,30 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-{
-  imports = [
-    # Import modules
-    ./base/default.nix
-    ./boot/clean-tmp.nix
-    ./boot/silent-boot.nix
-    ./boot/systemd-boot.nix
-    ./brightnessctl/default.nix
-    ./fontconfig/default.nix
-    ./graphics/default.nix
-    ./greeter/greetd/default.nix
-    ./greeter/greetd/tuigreet.nix
-    ./locale/default.nix
-    ./neovim/default.nix
-    ./power-saving/default.nix
-    ./sound/pipewire.nix
-    ./users/default.nix
-    ./unfree/default.nix
-    ./vpn/tailscale.nix
-    ./wifi/wpa_supplicant.nix
-  ];
-}

modules/fontconfig/default.nix

@@ -1,27 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.fontconfig;
-in
-{
-  options.modules.fontconfig = {
-    enable = mkEnableOption "fontconfig";
-  };
-
-  config = {
-    fonts.fontconfig.enable = cfg.enable;
-    fonts.enableDefaultPackages = false;
-    fonts.fontconfig.defaultFonts = {
-      serif = mkDefault [ ];
-      sansSerif = mkDefault [ ];
-      monospace = mkDefault [ ];
-      emoji = mkDefault [ ];
-    };
-  };
-}

modules/graphics/default.nix

@@ -1,32 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-{
-  config = {
-    # TODO: Modularize further, especially modesetting should be its own module.
-    # Set up graphics
-    hardware.graphics.enable32Bit = true;
-    hardware.graphics.enable = true;
-    services.xserver.videoDrivers = [ "nvidia" ];
-    hardware.nvidia = {
-      modesetting.enable = true;
-      powerManagement.enable = false;
-      powerManagement.finegrained = false;
-      open = false;
-      nvidiaSettings = true;
-      package = config.boot.kernelPackages.nvidiaPackages.stable;
-      prime = {
-        intelBusId = "PCI:0:2:0";
-        nvidiaBusId = "PCI:1:0:0";
-        offload = {
-          enable = true;
-          enableOffloadCmd = true;
-        };
-      };
-    };
-  };
-}

modules/greeter/greetd/default.nix

@@ -1,31 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.greetd;
-in
-{
-  options.modules.greetd = {
-    enable = mkEnableOption "greetd";
-    command = mkOption {
-      type = types.str;
-      default = "";
-      description = "Command to run to show greeter.";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    services.greetd = {
-      enable = true;
-      settings.default_session = {
-        command = cfg.command;
-        user = "greeter";
-      };
-    };
-  };
-}

modules/greeter/greetd/tuigreet.nix

@@ -1,37 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.tuigreet;
-in
-{
-  options.modules.tuigreet = {
-    enable = mkEnableOption "tuigreet";
-    greeting = mkOption {
-      type = types.str;
-      default = "Hewwo! >_< :3";
-      description = "Greeting message to show.";
-    };
-    command = mkOption {
-      type = types.str;
-      default = "~/.initrc";
-      description = "Command to run after logging in.";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    # Enable greetd
-    modules.greetd = {
-      enable = true;
-      command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember --greeting \"${cfg.greeting}\" --time --cmd \"${cfg.command}\" --asterisks";
-    };
-
-    # Enable silent boot to prevent late log messages from messing up tuigreet
-    modules.silent-boot.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

@@ -32,18 +32,20 @@ in
 
     # VSCode configuration
     programs.vscode = {
-      extensions = with pkgs.vscode-extensions; [ jnoortheen.nix-ide ];
+      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" ];
+        userSettings = {
+          "[nix]" = {
+            "editor.tabSize" = 2;
+          };
+          "nix.enableLanguageServer" = true;
+          "nix.serverPath" = "nixd";
+          "nix.serverSettings" = {
+            nixd = {
+              formatting = {
+                command = [ "nixfmt" ];
+              };
             };
           };
         };
@@ -51,8 +53,8 @@ in
     };
 
     # Neovim configuration
-    programs.nixvim = {
+    # 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

@@ -12,12 +12,6 @@ in
 {
   options.modules.fish = {
     enable = mkEnableOption "fish";
-
-    plugins = {
-      done = mkEnableOption "done";
-      fzf = mkEnableOption "fzf";
-      grc = mkEnableOption "grc";
-    };
   };
 
   config = mkIf cfg.enable {
@@ -36,26 +30,28 @@ in
     programs.fish = {
       enable = true;
 
+      shellAliases = config.modules.bash.aliases;
+
       plugins = [
-        (mkIf cfg.plugins.done {
+        {
           name = "done";
           src = pkgs.fishPlugins.done.src;
-        })
-        (mkIf cfg.plugins.fzf {
+        }
+        {
           name = "fzf";
           src = pkgs.fishPlugins.fzf-fish.src;
-        })
-        (mkIf cfg.plugins.grc {
+        }
+        {
           name = "grc";
           src = pkgs.fishPlugins.grc.src;
-        })
+        }
       ];
     };
 
     # Fish plugin dependencies
     home.packages = with pkgs; [
-      (mkIf cfg.plugins.fzf fzf)
-      (mkIf cfg.plugins.grc grc)
+      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/locale/default.nix

@@ -1,14 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-{
-  config = {
-    time.timeZone = "Europe/Amsterdam";
-    i18n.defaultLocale = "en_US.UTF-8";
-    console.keyMap = "us";
-  };
-}

modules/neovim/default.nix

@@ -1,23 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.neovim;
-in
-{
-  options.modules.neovim = {
-    enable = mkEnableOption "neovim";
-  };
-
-  config = mkIf cfg.enable {
-    programs.neovim = {
-      enable = true;
-      defaultEditor = true;
-    };
-  };
-}

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

@@ -1,21 +1,17 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
+{ lib, config, ... }:
 
 with lib;
 let
-  cfg = config.modules.systemd-boot;
+  cfg = config.modules.bootloader;
 in
 {
-  options.modules.systemd-boot = {
-    enable = mkEnableOption "systemd-boot";
+  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?
+  };
+}

modules/power-saving/default.nix

@@ -1,37 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.power-saving;
-in
-{
-  options.modules.power-saving = {
-    enable = mkEnableOption "power-saving";
-  };
-
-  config = mkIf cfg.enable {
-    powerManagement.enable = true;
-    services.thermald.enable = true;
-    services.tlp = {
-      enable = true;
-
-      settings = {
-        CPU_SCALING_GOVERNOR_ON_AC = "performance";
-        CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
-
-        CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
-        CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
-
-        CPU_MIN_PERF_ON_AC = 0;
-        CPU_MAX_PERF_ON_AC = 100;
-        CPU_MIN_PERF_ON_BAT = 0;
-        CPU_MAX_PERF_ON_BAT = 20;
-      };
-    };
-  };
-}

modules/sound/pipewire.nix

@@ -1,24 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.pipewire;
-in
-{
-  options.modules.pipewire = {
-    enable = mkEnableOption "pipewire";
-  };
-
-  config = mkIf cfg.enable {
-    services.pipewire = {
-      enable = true;
-      alsa.enable = true;
-      pulse.enable = true;
-    };
-  };
-}

modules/unfree/default.nix

@@ -1,24 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.unfree;
-in
-{
-  options.modules.unfree = {
-    enable = mkEnableOption "unfree";
-    allowedPackages = mkOption {
-      type = types.listOf types.str;
-      default = [ ];
-    };
-  };
-
-  config = mkIf cfg.enable {
-    nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (getName pkg) cfg.allowedPackages;
-  };
-}

modules/users/default.nix

@@ -1,91 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  # Nixvim
-  nixvim = import (builtins.fetchGit { url = "https://github.com/nix-community/nixvim"; });
-
-  # Stylix
-  stylix = import (
-    pkgs.fetchFromGitHub {
-      owner = "danth";
-      repo = "stylix";
-      rev = "1ff9d37d27377bfe8994c24a8d6c6c1734ffa116";
-      sha256 = "0dz8h1ga8lnfvvmvsf6iqvnbvxrvx3qxi0y8s8b72066mqgvy8y5";
-    }
-  );
-
-  # User configuration
-  userModule = types.submodule {
-    options = {
-      sudo = mkOption {
-        type = types.bool;
-        default = false;
-        example = true;
-        description = "Whether the user is allowed sudo access.";
-      };
-      configuration = mkOption {
-        type = types.path;
-        default = ./users/base.nix;
-        description = "What home manager configuration to use for this user.";
-      };
-      desktopInit = mkOption {
-        type = types.lines;
-        default = "";
-        description = "Bash script to execute after initial log in.";
-      };
-    };
-  };
-in
-{
-  imports = [
-    # Import home manager
-    <home-manager/nixos>
-
-    # Import system wide configuration required for user modules
-    ./modules/systemwide/default.nix
-  ];
-
-  options = {
-    machine.users = mkOption {
-      type = types.attrsOf userModule;
-      default = { };
-      description = "Users configured on this system.";
-    };
-  };
-
-  config = {
-    # Add required home manager modules
-    home-manager.sharedModules = [
-      # Stylix for theming
-      stylix.homeManagerModules.stylix
-
-      # Nixvim for neovim
-      nixvim.homeManagerModules.nixvim
-
-      # Modules
-      ./modules/default.nix
-
-      # Custom packages
-      ../../pkgs/default.nix
-    ];
-
-    # Create users
-    users.users = attrsets.concatMapAttrs (name: value: {
-      ${name} = {
-        isNormalUser = true;
-        extraGroups = mkIf value.sudo [ "wheel" ];
-      };
-    }) config.machine.users;
-
-    # Create home manager configuration for users
-    home-manager.users = attrsets.concatMapAttrs (name: value: {
-      ${name} = value.configuration;
-    }) config.machine.users;
-  };
-}

modules/users/modules/browser/default.nix

@@ -1,34 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-{
-  imports = [
-    ./firefox/default.nix
-    ./qutebrowser/default.nix
-  ];
-
-  options.default.browser = mkOption {
-    type = types.str;
-    default = "";
-    description = "Default browser";
-  };
-
-  config = {
-    xdg.mimeApps = {
-      enable = true;
-
-      defaultApplications = {
-        "text/html" = "${config.default.browser}";
-        "x-scheme-handler/http" = "${config.default.browser}";
-        "x-scheme-handler/https" = "${config.default.browser}";
-        "x-scheme-handler/about" = "${config.default.browser}";
-        "x-scheme-handler/unknown" = "${config.default.browser}";
-      };
-    };
-  };
-}

modules/users/modules/browser/firefox/default.nix

@@ -1,86 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.firefox;
-in
-{
-  options.modules.firefox = {
-    enable = lib.mkEnableOption "firefox";
-    default = lib.mkEnableOption "default";
-  };
-
-  config = lib.mkIf cfg.enable {
-    default.browser = mkIf cfg.default "firefox.desktop";
-
-    # Enable NUR
-    nixpkgs.config.packageOverrides = pkgs: {
-      # TODO: Pin the version
-      nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") {
-        inherit pkgs;
-      };
-    };
-
-    programs.firefox = {
-      enable = true;
-
-      policies = {
-        AppAutoUpdate = false;
-        # BlockAboutAddons = true;
-        # BlockAboutConfig = true;
-        # BlockAboutProfiles = true;
-        DisableAppUpdate = true;
-        DisableFeedbackCommands = true;
-        DisableMasterPasswordCreation = true;
-        DisablePocket = true;
-        DisableProfileImport = true;
-        DisableProfileRefresh = true;
-        DisableSetDesktopBackground = true;
-        DisableTelemetry = true;
-        DisplayBookmarksToolbar = "never";
-        DisplayMenuBar = "never";
-        DNSOverHTTPS = {
-          Enabled = false;
-        };
-        DontCheckDefaultBrowser = true;
-        PasswordManagerEnabled = false;
-        TranslateEnabled = true;
-        UseSystemPrintDialog = true;
-      };
-
-      profiles.nixos = {
-        search.default = "DuckDuckGo";
-
-        extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-          # firefox-color
-          ublock-origin
-        ];
-
-        # Theming
-        userChrome = readFile (
-          pkgs.substituteAll {
-            src = ./userChrome.css;
-            colors = config.theming.colorsCSS;
-          }
-        );
-
-        settings = {
-          "browser.tabs.inTitlebar" = 0;
-          "extensions.autoDisableScopes" = 0;
-          "devtools.chrome.enabled" = true;
-          "devtools.debugger.remote-enabled" = true;
-          "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
-        };
-
-        # Force overwriting configuration file
-        search.force = true;
-        containersForce = true;
-      };
-    };
-  };
-}

modules/users/modules/browser/firefox/userChrome.css

@@ -1,73 +0,0 @@
-/* Import theme colors */
-@colors@
-
-/* Configure titlebar */
-#titlebar {
-    /* Add consistent margins to tab bar */
-    padding: 0 2px !important;
-
-    /* Add emphasized color to background of tab bar */
-    background-color: var(--nix-color-bg-status) !important;
-
-    /* Set correct text color */
-    color: var(--nix-color-fg) !important;
-}
-
-.tab-background:is([selected], [multiselected]) {
-    /* Set correct background color */
-    background-color: var(--nix-color-bg) !important;
-}
-
-.tab-content {
-    /* Set correct text color */
-    color: var(--nix-color-fg) !important;
-}
-
-/* Configure navigation bar */
-#nav-bar {
-    /* Set correct background color */
-    background-color: var(--nix-color-bg) !important;
-
-    /* Set correct text color */
-    color: var(--nix-color-fg) !important;
-}
-
-#urlbar {
-    /* Set correct text color */
-    color: var(--nix-color-fg) !important;
-}
-
-#urlbar[open]>#urlbar-background {
-    /* Set correct background color when opened */
-    background-color: var(--nix-color-bg) !important;
-
-    /* Use same box-shadow as tabs when opened */
-    border: none !important;
-    box-shadow: 0 0 4px rgba(0, 0, 0, .4) !important;
-}
-
-#urlbar[focused]:not([suppress-focus-border])>#urlbar-background {
-    /* Set better outline for focused urlbar */
-    outline-color: var(--nix-color-border-focused) !important;
-    outline-width: 1px !important;
-    outline-offset: 0 !important;
-}
-
-#urlbar-background {
-    /* Set the correct background color */
-    background-color: var(--nix-color-bg-status) !important;
-}
-
-/* Configure popups */
-panelview {
-    /* Set correct background color for popups */
-    background-color: var(--nix-color-bg) !important;
-
-    /* Set correct text color */
-    color: var(--nix-color-fg) !important;
-}
-
-menupopup {
-    /* Set correct background color for context menus */
-    --panel-background: var(--nix-color-bg) !important;
-}

modules/users/modules/browser/qutebrowser/default.nix

@@ -1,33 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.qutebrowser;
-  theme = config.theming;
-in
-{
-  options.modules.qutebrowser = {
-    enable = mkEnableOption "qutebrowser";
-    default = mkEnableOption "default";
-  };
-
-  config = mkIf cfg.enable {
-    default.browser = mkIf cfg.default "org.qutebrowser.qutebrowser.desktop";
-
-    programs.qutebrowser = {
-      enable = true;
-
-      extraConfig = ''
-        config.set("colors.webpage.darkmode.enabled", False)
-        config.set("colors.webpage.preferred_color_scheme", "${if theme.darkMode then "dark" else "light"}")
-        config.set("fonts.default_family", "${theme.fonts.monospace.name}")
-        config.set("fonts.default_size", "${toString theme.fonts.monospace.recommendedSize}pt")
-      '';
-    };
-  };
-}

modules/users/modules/default.nix

@@ -1,36 +0,0 @@
-{
-  input,
-  pkgs,
-  config,
-  ...
-}:
-
-{
-  imports = [
-    # Import all modules
-    ./browser/default.nix
-    ./desktop/default.nix
-    ./discord/default.nix
-    ./feishin/default.nix
-    ./fontconfig/default.nix
-    ./language/nix.nix
-    ./language/rust.nix
-    ./mako/default.nix
-    ./neovim/default.nix
-    ./obsidian/default.nix
-    ./rofi/default.nix
-    ./rofi/rofi-rbw.nix
-    ./shell/bash.nix
-    ./shell/fish.nix
-    ./steam/default.nix
-    ./terminal/default.nix
-    ./terminal/foot/default.nix
-    ./theming/default.nix
-    ./vscode/default.nix
-    ./winbox/default.nix
-    ./zathura/default.nix
-
-    # Import unfree helper
-    ../../unfree/default.nix
-  ];
-}

modules/users/modules/desktop/background/glpaper/default.nix

@@ -1,23 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.glpaper;
-in
-{
-  options.modules.glpaper = {
-    enable = mkEnableOption "glpaper";
-    shader = mkOption {
-      type = types.path;
-      default = ./shaders/waves.glsl;
-      description = "Shader to use for the background";
-    };
-  };
-
-  config = mkIf cfg.enable { home.packages = [ pkgs.glpaper ]; };
-}

modules/users/modules/desktop/background/glpaper/shaders/galaxy.glsl

@@ -1,169 +0,0 @@
-#define zoom 0.900
-#define tile 0.850
-#define speed2 0.0
-
-#ifdef GL_ES
-precision highp float;
-#endif
- 
-uniform float time;
-uniform vec2 resolution;
-
-#define time3 (time * 0.01)
-
-#define mouse vec2(sin(time3)/48., cos(time3)/48.)
-#define iterations 14
-#define formuparam2 0.79
- 
-#define volsteps 5
-#define stepsize 0.390
- 
-#define brightness 0.003
-#define darkmatter 0.400
-#define distfading 0.560
-#define saturation 0.800
-
-#define transverseSpeed zoom*2.0
-#define cloud 0.11 
- 
-float triangle(float x, float a) { 
-    float output2 = 2.0 * abs(2.0 * ((x/a) - floor((x/a) + 0.5))) - 1.0;
-    return output2;
-}
- 
-float field(in vec3 p) {	
-    float strength = 7. + .03 * log(1.e-6 + fract(sin(time3) * 4373.11));
-    float accum = 0.;
-    float prev = 0.;
-    float tw = 0.;	
-
-    // Replace or uncomment the for-loop as intended in your logic
-    float mag = dot(p, p);
-    p = abs(p) / mag + vec3(-.5, -.8 + 0.1*sin(time3*0.7 + 2.0), -1.1+0.3*cos(time3*0.3));
-    float w = exp(-float(0) / 7.);
-    accum += w * exp(-strength * pow(abs(mag - prev), 2.3));
-    tw += w;
-    prev = mag;
-
-    return max(0., 5. * accum / tw - .7);
-}
-
-void main() {   
-
-     	vec2 uv2 = 2. * gl_FragCoord.xy / vec2(512) - 1.;
-	vec2 uvs = uv2 * vec2(512)  / 512.;
-
-	float time2 = time3;               
-        float speed = speed2;
-        speed = .01 * cos(time2*0.02 + 3.1415926/4.0);          
-		
-    	float formuparam = formuparam2;
-	
-    		
-	vec2 uv = uvs;		       
-	
-	float a_xz = 0.9;
-	float a_yz = -.6;
-	float a_xy = 0.9 + time3*0.08;	
-	
-	mat2 rot_xz = mat2(cos(a_xz),sin(a_xz),-sin(a_xz),cos(a_xz));	
-	mat2 rot_yz = mat2(cos(a_yz),sin(a_yz),-sin(a_yz),cos(a_yz));		
-	mat2 rot_xy = mat2(cos(a_xy),sin(a_xy),-sin(a_xy),cos(a_xy));
-	
-
-	float v2 =1.0;	
-	vec3 dir=vec3(uv*zoom,1.); 
-	vec3 from=vec3(0.0, 0.0,0.0);                               
-        from.x -= 5.0*(mouse.x-0.5);
-        from.y -= 5.0*(mouse.y-0.5);
-               
-               
-	vec3 forward = vec3(0.,0.,1.);   
-	from.x += transverseSpeed*(1.0)*cos(0.01*time3) + 0.001*time3;
-	from.y += transverseSpeed*(1.0)*sin(0.01*time3) +0.001*time3;
-	from.z += 0.003*time3;	
-	
-	dir.xy*=rot_xy;
-	forward.xy *= rot_xy;
-	dir.xz*=rot_xz;
-	forward.xz *= rot_xz;	
-	dir.yz*= rot_yz;
-	forward.yz *= rot_yz;
-	
-	from.xy*=-rot_xy;
-	from.xz*=rot_xz;
-	from.yz*= rot_yz;
-	
-	float zooom = (time2-3311.)*speed;
-	from += forward* zooom;
-	float sampleShift = mod( zooom, stepsize );
-	 
-	float zoffset = -sampleShift;
-	sampleShift /= stepsize;
-	
-	
-	float s=0.24;
-	float s3 = s + stepsize/2.0;
-	vec3 v=vec3(0.);
-	float t3 = 0.0;	
-	
-	vec3 backCol2 = vec3(0.);
-	for (int r=0; r<volsteps; r++) {
-		vec3 p2=from+(s+zoffset)*dir;
-		vec3 p3=from+(s3+zoffset)*dir;
-		
-		p2 = abs(vec3(tile)-mod(p2,vec3(tile*2.)));
-		p3 = abs(vec3(tile)-mod(p3,vec3(tile*2.)));		
-		#ifdef cloud
-		t3 = field(p3);
-		#endif
-		
-		float pa,a=pa=0.;
-		for (int i=0; i<iterations; i++) {
-			p2=abs(p2)/dot(p2,p2)-formuparam;
-			
-			float D = abs(length(p2)-pa);
-			a += i > 7 ? min( 12., D) : D;
-			pa=length(p2);
-		}
-		
-		
-		
-		a*=a*a;
-		
-		float s1 = s+zoffset;
-		
-		float fade = pow(distfading,max(0.,float(r)-sampleShift));		
-			
-		v+=fade;
-	       	
-
-		
-		if( r == 0 )
-			fade *= (1. - (sampleShift));
-		
-		if( r == volsteps-1 )
-			fade *= sampleShift;
-		v+=vec3(s1,s1*s1,s1*s1*s1*s1)*a*brightness*fade;
-		
-		backCol2 += mix(.11, 1., v2) * vec3(1.8 * t3 * t3 * t3, 1.4 * t3 * t3, t3) * fade;
-
-		
-		s+=stepsize;
-		s3 += stepsize;		
-	}
-		       
-	v=mix(vec3(length(v)),v,saturation);	
-
-	vec4 forCol2 = vec4(v*.01,1.);	
-	#ifdef cloud
-	backCol2 *= cloud;
-	#endif	
-	backCol2.b *= 1.8;
-	backCol2.r *= 0.05;	
-	
-	backCol2.b = 0.5*mix(backCol2.g, backCol2.b, 0.8);
-	backCol2.g = 0.0;
-	backCol2.bg = mix(backCol2.gb, backCol2.bg, 0.5*(cos(time3*0.01) + 1.0));	
-	gl_FragColor = forCol2 + vec4(backCol2, 1.0);
-}

modules/users/modules/desktop/background/glpaper/shaders/next.glsl

@@ -1,118 +0,0 @@
-#ifdef GL_ES
-precision mediump float;
-#endif
-
-// glslsandbox uniforms
-uniform float time;
-uniform vec2 resolution;
-
-// shadertoy emulation
-#define iTime time * 0.01 + 10.0
-#define iResolution resolution
-#define fragCoord gl_FragCoord
-#define fragColor gl_FragColor
-
-float colormap_red(float x) {
-    if (x < 0.0) {
-        return 54.0 / 255.0;
-    } else if (x < 20049.0 / 82979.0) {
-        return (829.79 * x + 54.51) / 255.0;
-    } else {
-        return 1.0;
-    }
-}
-
-float colormap_green(float x) {
-    if (x < 20049.0 / 82979.0) {
-        return 0.0;
-    } else if (x < 327013.0 / 810990.0) {
-        return (8546482679670.0 / 10875673217.0 * x - 2064961390770.0 / 10875673217.0) / 255.0;
-    } else if (x <= 1.0) {
-        return (103806720.0 / 483977.0 * x + 19607415.0 / 483977.0) / 255.0;
-    } else {
-        return 1.0;
-    }
-}
-
-float colormap_blue(float x) {
-    if (x < 0.0) {
-        return 54.0 / 255.0;
-    } else if (x < 7249.0 / 82979.0) {
-        return (829.79 * x + 54.51) / 255.0;
-    } else if (x < 20049.0 / 82979.0) {
-        return 127.0 / 255.0;
-    } else if (x < 327013.0 / 810990.0) {
-        return (792.02249341361393720147485376583 * x - 64.364790735602331034989206222672) / 255.0;
-    } else {
-        return 1.0;
-    }
-}
-
-vec4 colormap(float x) {
-    return vec4(colormap_red(x), colormap_green(x), colormap_blue(x), 1.0);
-}
-
-// https://iquilezles.org/articles/warp
-/*float noise( in vec2 x )
-{
-    vec2 p = floor(x);
-    vec2 f = fract(x);
-    f = f*f*(3.0-2.0*f);
-    float a = textureLod(iChannel0,(p+vec2(0.5,0.5))/256.0,0.0).x;
-	float b = textureLod(iChannel0,(p+vec2(1.5,0.5))/256.0,0.0).x;
-	float c = textureLod(iChannel0,(p+vec2(0.5,1.5))/256.0,0.0).x;
-	float d = textureLod(iChannel0,(p+vec2(1.5,1.5))/256.0,0.0).x;
-    return mix(mix( a, b,f.x), mix( c, d,f.x),f.y);
-}*/
-
-
-float rand(vec2 n) { 
-    return fract(sin(dot(n, vec2(12.9898, 4.1414))) * 43758.5453);
-}
-
-float noise(vec2 p){
-    vec2 ip = floor(p);
-    vec2 u = fract(p);
-    u = u*u*(3.0-2.0*u);
-
-    float res = mix(
-        mix(rand(ip),rand(ip+vec2(1.0,0.0)),u.x),
-        mix(rand(ip+vec2(0.0,1.0)),rand(ip+vec2(1.0,1.0)),u.x),u.y);
-    return res*res;
-}
-
-const mat2 mtx = mat2( 0.80,  0.60, -0.60,  0.80 );
-
-float fbm( vec2 p )
-{
-    float f = 0.0;
-
-    f += 0.500000*noise( p + iTime  ); p = mtx*p*2.02;
-    f += 0.031250*noise( p ); p = mtx*p*2.01;
-    f += 0.250000*noise( p ); p = mtx*p*2.03;
-    f += 0.125000*noise( p ); p = mtx*p*2.01;
-    f += 0.062500*noise( p ); p = mtx*p*2.04;
-    f += 0.015625*noise( p + sin(iTime) );
-
-    return f/0.96875;
-}
-
-float pattern( in vec2 p )
-{
-	return fbm( p + fbm( p + fbm( p ) ) );
-}
-
-void main()
-{
-    vec2 uv = fragCoord.xy/iResolution.x;
-	float shade = pattern(uv);
-    fragColor = vec4(colormap(shade).rgb, shade);
-}
-
-/** SHADERDATA
-{
-	"title": "Base warp fBM",
-	"description": "Noise but Pink",
-	"model": "person"
-}
-*/

modules/users/modules/desktop/background/glpaper/shaders/shadertoy.glsl

@@ -1,13 +0,0 @@
-#ifdef GL_ES
-precision mediump float;
-#endif
-
-// glslsandbox uniforms
-uniform float time;
-uniform vec2 resolution;
-
-// shadertoy emulation
-#define iTime time
-#define iResolution resolution
-#define fragCoord gl_FragCoord
-#define fragColor gl_FragColor

modules/users/modules/desktop/background/glpaper/shaders/water.glsl

@@ -1,208 +0,0 @@
-#ifdef GL_ES
-precision highp float;
-#endif
-
-uniform float time;
-uniform vec2 resolution;
-
-#define CHAR_SIZE vec2(6, 7)
-#define CHAR_SPACING vec2(6, 9)
-
-vec2 start_pos = vec2(0);
-vec2 print_pos = vec2(0);
-vec2 print_pos_pre_move = vec2(0);
-vec3 text_color = vec3(1);
-
-/*
-Top left pixel is the most significant bit.
-Bottom right pixel is the least significant bit.
-
- ███  |
-█   █ |
-█   █ |  
-█   █ |
-█████ |
-█   █ |
-█   █ |
-
-000000 
-100010
-100010  
-100010
-111110
-100010
-100010
-
-011100 (upper 21 bits)
-100010 -> 011100 100010 100010 100 -> 935188
-100010  
-100
-   010 (lower 21 bits)
-111110 -> 010 111110 100010 100010 -> 780450
-100010
-100010
-
-vec2(935188.0,780450.0)
-*/
-
-//Text coloring
-#define HEX(i) text_color = mod(vec3(i / 65536,i / 256,i),vec3(256.0))/255.0;
-#define RGB(r,g,b) text_color = vec3(r,g,b);
-
-#define STRWIDTH(c) (c * CHAR_SPACING.x)
-#define STRHEIGHT(c) (c * CHAR_SPACING.y)
-#define BEGIN_TEXT(x,y) print_pos = floor(vec2(x,y)); start_pos = floor(vec2(x,y));
-
-//Automatically generated from the sprite sheet here: http://uzebox.org/wiki/index.php?title=File:Font6x8.png
-#define _ col+=char(vec2(0.0,0.0),uv);
-#define _spc col+=char(vec2(0.0,0.0),uv)*text_color;
-#define _exc col+=char(vec2(276705.0,32776.0),uv)*text_color;
-#define _quo col+=char(vec2(1797408.0,0.0),uv)*text_color;
-#define _hsh col+=char(vec2(10738.0,1134484.0),uv)*text_color;
-#define _dol col+=char(vec2(538883.0,19976.0),uv)*text_color;
-#define _pct col+=char(vec2(1664033.0,68006.0),uv)*text_color;
-#define _amp col+=char(vec2(545090.0,174362.0),uv)*text_color;
-#define _apo col+=char(vec2(798848.0,0.0),uv)*text_color;
-#define _lbr col+=char(vec2(270466.0,66568.0),uv)*text_color;
-#define _rbr col+=char(vec2(528449.0,33296.0),uv)*text_color;
-#define _ast col+=char(vec2(10471.0,1688832.0),uv)*text_color;
-#define _crs col+=char(vec2(4167.0,1606144.0),uv)*text_color;
-#define _per col+=char(vec2(0.0,1560.0),uv)*text_color;
-#define _dsh col+=char(vec2(7.0,1572864.0),uv)*text_color;
-#define _com col+=char(vec2(0.0,1544.0),uv)*text_color;
-#define _lsl col+=char(vec2(1057.0,67584.0),uv)*text_color;
-#define _0 col+=char(vec2(935221.0,731292.0),uv)*text_color;
-#define _1 col+=char(vec2(274497.0,33308.0),uv)*text_color;
-#define _2 col+=char(vec2(934929.0,1116222.0),uv)*text_color;
-#define _3 col+=char(vec2(934931.0,1058972.0),uv)*text_color;
-#define _4 col+=char(vec2(137380.0,1302788.0),uv)*text_color;
-#define _5 col+=char(vec2(2048263.0,1058972.0),uv)*text_color;
-#define _6 col+=char(vec2(401671.0,1190044.0),uv)*text_color;
-#define _7 col+=char(vec2(2032673.0,66576.0),uv)*text_color;
-#define _8 col+=char(vec2(935187.0,1190044.0),uv)*text_color;
-#define _9 col+=char(vec2(935187.0,1581336.0),uv)*text_color;
-#define _col col+=char(vec2(195.0,1560.0),uv)*text_color;
-#define _scl col+=char(vec2(195.0,1544.0),uv)*text_color;
-#define _les col+=char(vec2(135300.0,66052.0),uv)*text_color;
-#define _equ col+=char(vec2(496.0,3968.0),uv)*text_color;
-#define _grt col+=char(vec2(528416.0,541200.0),uv)*text_color;
-#define _que col+=char(vec2(934929.0,1081352.0),uv)*text_color;
-#define _ats col+=char(vec2(935285.0,714780.0),uv)*text_color;
-#define _A col+=char(vec2(935188.0,780450.0),uv)*text_color;
-#define _B col+=char(vec2(1983767.0,1190076.0),uv)*text_color;
-#define _C col+=char(vec2(935172.0,133276.0),uv)*text_color;
-#define _D col+=char(vec2(1983764.0,665788.0),uv)*text_color;
-#define _E col+=char(vec2(2048263.0,1181758.0),uv)*text_color;
-#define _F col+=char(vec2(2048263.0,1181728.0),uv)*text_color;
-#define _G col+=char(vec2(935173.0,1714334.0),uv)*text_color;
-#define _H col+=char(vec2(1131799.0,1714338.0),uv)*text_color;
-#define _I col+=char(vec2(921665.0,33308.0),uv)*text_color;
-#define _J col+=char(vec2(66576.0,665756.0),uv)*text_color;
-#define _K col+=char(vec2(1132870.0,166178.0),uv)*text_color;
-#define _L col+=char(vec2(1065220.0,133182.0),uv)*text_color;
-#define _M col+=char(vec2(1142100.0,665762.0),uv)*text_color;
-#define _N col+=char(vec2(1140052.0,1714338.0),uv)*text_color;
-#define _O col+=char(vec2(935188.0,665756.0),uv)*text_color;
-#define _P col+=char(vec2(1983767.0,1181728.0),uv)*text_color;
-#define _Q col+=char(vec2(935188.0,698650.0),uv)*text_color;
-#define _R col+=char(vec2(1983767.0,1198242.0),uv)*text_color;
-#define _S col+=char(vec2(935171.0,1058972.0),uv)*text_color;
-#define _T col+=char(vec2(2035777.0,33288.0),uv)*text_color;
-#define _U col+=char(vec2(1131796.0,665756.0),uv)*text_color;
-#define _V col+=char(vec2(1131796.0,664840.0),uv)*text_color;
-#define _W col+=char(vec2(1131861.0,699028.0),uv)*text_color;
-#define _X col+=char(vec2(1131681.0,84130.0),uv)*text_color;
-#define _Y col+=char(vec2(1131794.0,1081864.0),uv)*text_color;
-#define _Z col+=char(vec2(1968194.0,133180.0),uv)*text_color;
-#define _lsb col+=char(vec2(925826.0,66588.0),uv)*text_color;
-#define _rsl col+=char(vec2(16513.0,16512.0),uv)*text_color;
-#define _rsb col+=char(vec2(919584.0,1065244.0),uv)*text_color;
-#define _pow col+=char(vec2(272656.0,0.0),uv)*text_color;
-#define _usc col+=char(vec2(0.0,62.0),uv)*text_color;
-#define _a col+=char(vec2(224.0,649374.0),uv)*text_color;
-#define _b col+=char(vec2(1065444.0,665788.0),uv)*text_color;
-#define _c col+=char(vec2(228.0,657564.0),uv)*text_color;
-#define _d col+=char(vec2(66804.0,665758.0),uv)*text_color;
-#define _e col+=char(vec2(228.0,772124.0),uv)*text_color;
-#define _f col+=char(vec2(401543.0,1115152.0),uv)*text_color;
-#define _g col+=char(vec2(244.0,665474.0),uv)*text_color;
-#define _h col+=char(vec2(1065444.0,665762.0),uv)*text_color;
-#define _i col+=char(vec2(262209.0,33292.0),uv)*text_color;
-#define _j col+=char(vec2(131168.0,1066252.0),uv)*text_color;
-#define _k col+=char(vec2(1065253.0,199204.0),uv)*text_color;
-#define _l col+=char(vec2(266305.0,33292.0),uv)*text_color;
-#define _m col+=char(vec2(421.0,698530.0),uv)*text_color;
-#define _n col+=char(vec2(452.0,1198372.0),uv)*text_color;
-#define _o col+=char(vec2(228.0,665756.0),uv)*text_color;
-#define _p col+=char(vec2(484.0,667424.0),uv)*text_color;
-#define _q col+=char(vec2(244.0,665474.0),uv)*text_color;
-#define _r col+=char(vec2(354.0,590904.0),uv)*text_color;
-#define _s col+=char(vec2(228.0,114844.0),uv)*text_color;
-#define _t col+=char(vec2(8674.0,66824.0),uv)*text_color;
-#define _u col+=char(vec2(292.0,1198868.0),uv)*text_color;
-#define _v col+=char(vec2(276.0,664840.0),uv)*text_color;
-#define _w col+=char(vec2(276.0,700308.0),uv)*text_color;
-#define _x col+=char(vec2(292.0,1149220.0),uv)*text_color;
-#define _y col+=char(vec2(292.0,1163824.0),uv)*text_color;
-#define _z col+=char(vec2(480.0,1148988.0),uv)*text_color;
-#define _lpa col+=char(vec2(401542.0,66572.0),uv)*text_color;
-#define _bar col+=char(vec2(266304.0,33288.0),uv)*text_color;
-#define _rpa col+=char(vec2(788512.0,1589528.0),uv)*text_color;
-#define _tid col+=char(vec2(675840.0,0.0),uv)*text_color;
-#define _lar col+=char(vec2(8387.0,1147904.0),uv)*text_color;
-#define _nl print_pos = start_pos - vec2(0,CHAR_SPACING.y);
-
-//Extracts bit b from the given number.
-float extract_bit(float n, float b)
-{
-	b = clamp(b,-1.0,22.0);
-	return floor(mod(floor(n / pow(2.0,floor(b))),2.0));   
-}
-
-//Returns the pixel at uv in the given bit-packed sprite.
-float sprite(vec2 spr, vec2 size, vec2 uv)
-{
-	uv = floor(uv);
-	float bit = (size.x-uv.x-1.0) + uv.y * size.x;  
-	bool bounds = all(greaterThanEqual(uv,vec2(0)))&& all(lessThan(uv,size)); 
-	return bounds ? extract_bit(spr.x, bit - 21.0) + extract_bit(spr.y, bit) : 0.0;
-}
-
-//Prints a character and moves the print position forward by 1 character width.
-vec3 char(vec2 ch, vec2 uv)
-{
-	float px = sprite(ch, CHAR_SIZE, uv - print_pos);
-	print_pos.x += CHAR_SPACING.x;
-	print_pos.y += sin(4.*print_pos.x-time*10.);
-	return vec3(px);
-}
-
-
-vec3 Text(vec2 uv)
-{
-    	vec3 col = vec3(0.0);
-    	
-    	vec2 center_pos = vec2(resolution.x/2.0 - STRWIDTH(20.0)/2.0,resolution.y/2.0 - STRHEIGHT(1.0)/2.0);
-       	
-    	BEGIN_TEXT(center_pos.x,center_pos.y)
-	HEX(0x00ffFF) _ _ _w _a _t _e _r _ _;
-	BEGIN_TEXT(resolution.x/2.0-STRWIDTH(11.0)/2.0,resolution.y/2.0)
-	print_pos += vec2(cos(time)*96.,sin(time)*96.);
-	
-	// RGB(1,0,0) _M RGB(1,.5,0)_o RGB(1,1,0)_v RGB(0,1,0)_i RGB(0,.5,1)_n RGB(0.5,0,1)_g _ RGB(1,0,0)_T RGB(1,.5,0)_e RGB(1,1,0)_x RGB(0,1,0)_t
-    
-    	return col;
-}
-
-void main( void )
-{
-	vec2 uv = gl_FragCoord.xy;
-	vec2 duv = floor(gl_FragCoord.xy);
-    
-	vec3 pixel = Text(duv);
-    
-	vec3 col = pixel*0.9+0.1;
-	col *= (1.-distance(mod(uv,vec2(1.0)),vec2(0.65)))*1.2;
-	
-	gl_FragColor = vec4(vec3(col), 1.0);
-}

modules/users/modules/desktop/background/glpaper/shaders/waves.glsl

@@ -1,108 +0,0 @@
-#ifdef GL_ES
-precision mediump float;
-#endif
-
-uniform float time;
-uniform vec2 resolution;
-
-#define iTime time * 0.01 + 10.0
-#define iResolution resolution
-#define fragCoord gl_FragCoord
-#define fragColor gl_FragColor
-
-float colormap_red(float x) {
-    if (x < 0.0) {
-        return 54.0 / 255.0;
-    } else if (x < 20049.0 / 82979.0) {
-        return (829.79 * x + 54.51) / 255.0;
-    } else {
-        return 1.0;
-    }
-}
-
-float colormap_green(float x) {
-    if (x < 20049.0 / 82979.0) {
-        return 0.0;
-    } else if (x < 327013.0 / 810990.0) {
-        return (8546482679670.0 / 10875673217.0 * x - 2064961390770.0 / 10875673217.0) / 255.0;
-    } else if (x <= 1.0) {
-        return (103806720.0 / 483977.0 * x + 19607415.0 / 483977.0) / 255.0;
-    } else {
-        return 1.0;
-    }
-}
-
-float colormap_blue(float x) {
-    if (x < 0.0) {
-        return 54.0 / 255.0;
-    } else if (x < 7249.0 / 82979.0) {
-        return (829.79 * x + 54.51) / 255.0;
-    } else if (x < 20049.0 / 82979.0) {
-        return 127.0 / 255.0;
-    } else if (x < 327013.0 / 810990.0) {
-        return (792.02249341361393720147485376583 * x - 64.364790735602331034989206222672) / 255.0;
-    } else {
-        return 1.0;
-    }
-}
-
-vec4 colormap(float x) {
-    return vec4(colormap_red(x), colormap_green(x), colormap_blue(x), 1.0);
-}
-
-// https://iquilezles.org/articles/warp
-/*float noise( in vec2 x )
-{
-    vec2 p = floor(x);
-    vec2 f = fract(x);
-    f = f*f*(3.0-2.0*f);
-    float a = textureLod(iChannel0,(p+vec2(0.5,0.5))/256.0,0.0).x;
-	float b = textureLod(iChannel0,(p+vec2(1.5,0.5))/256.0,0.0).x;
-	float c = textureLod(iChannel0,(p+vec2(0.5,1.5))/256.0,0.0).x;
-	float d = textureLod(iChannel0,(p+vec2(1.5,1.5))/256.0,0.0).x;
-    return mix(mix( a, b,f.x), mix( c, d,f.x),f.y);
-}*/
-
-
-float rand(vec2 n) { 
-    return fract(sin(dot(n, vec2(12.9898, 4.1414))) * 43758.5453);
-}
-
-float noise(vec2 p){
-    vec2 ip = floor(p);
-    vec2 u = fract(p);
-    u = u*u*(3.0-2.0*u);
-
-    float res = mix(
-        mix(rand(ip),rand(ip+vec2(1.0,0.0)),u.x),
-        mix(rand(ip+vec2(0.0,1.0)),rand(ip+vec2(1.0,1.0)),u.x),u.y);
-    return res*res;
-}
-
-const mat2 mtx = mat2( 0.80,  0.60, -0.60,  0.80 );
-
-float fbm( vec2 p )
-{
-    float f = 0.0;
-
-    f += 0.500000*noise( p + iTime  ); p = mtx*p*2.02;
-    f += 0.031250*noise( p ); p = mtx*p*2.01;
-    f += 0.250000*noise( p ); p = mtx*p*2.03;
-    f += 0.125000*noise( p ); p = mtx*p*2.01;
-    f += 0.062500*noise( p ); p = mtx*p*2.04;
-    f += 0.015625*noise( p + sin(iTime) );
-
-    return f/0.96875;
-}
-
-float pattern( in vec2 p )
-{
-	return fbm( p + fbm( p + fbm( p ) ) );
-}
-
-void main()
-{
-    vec2 uv = fragCoord.xy/iResolution.x;
-	float shade = pattern(uv);
-    fragColor = vec4(colormap(shade).rgb, shade);
-}

modules/users/modules/desktop/bar/waybar.nix

@@ -1,140 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.waybar;
-  theme = config.theming;
-  colors = theme.colors;
-in
-{
-  options.modules.waybar = {
-    enable = mkEnableOption "waybar";
-  };
-
-  config = mkIf cfg.enable {
-    home.packages = with pkgs; [
-      pulsemixer
-      playerctl
-    ];
-
-    programs.waybar = {
-      enable = true;
-      settings = {
-        mainBar = {
-          layer = "top";
-          spacing = 16;
-          modules-left = [ "river/tags" ];
-          modules-center = [
-            #"river/window"
-            "mpris"
-          ];
-          modules-right = [
-            "pulseaudio"
-            "battery"
-            "clock"
-          ];
-          "river/window" = {
-            max-length = 50;
-          };
-          "river/tags" = {
-            tag-labels = [
-              "一"
-              "二"
-              "三"
-              "四"
-              "五"
-              "六"
-              "七"
-              "八"
-              "九"
-            ];
-            disable-click = false;
-          };
-          pulseaudio = {
-            tooltip = false;
-            format = "{icon}   {volume}%"; # Spacing achieved using "Thin Space"
-            #format-muted = "";
-            format-muted = "{icon}  --%"; # Spacing achieved using "Thin Space"
-            format-icons = {
-              #headphone = "";
-              #default = [ "" "" ];
-              headphone = "";
-              headphone-muted = "";
-              default = [
-                ""
-                ""
-                ""
-              ];
-            };
-          };
-          battery = {
-            format = "{icon} {capacity}%"; # Spacing achieved using "Thin Space"
-            format-charging = " {capacity}%"; # Spacing achieved using "Thin Space"
-            #format-icons = [ "󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ];
-            format-icons = [
-              ""
-              ""
-              ""
-              ""
-              ""
-              ""
-              ""
-              ""
-              ""
-              ""
-              ""
-            ];
-            interval = 1;
-          };
-          clock = {
-            #format = "󰅐 {:%H:%M}";
-            #format = "   {:%H:%M}"; # Spacing achieved using "Thin Space"
-            format = "{:%H:%M}";
-          };
-          mpris = {
-            format = "{dynamic}";
-            tooltip-format = "";
-            interval = 1;
-          };
-        };
-      };
-      # TODO: Replace base03 color with named color
-      style = ''
-        window#waybar {
-          color: #${colors.fg};
-          background-color: #${colors.bg};
-          border-style: none none solid none;
-          border-width: ${toString theme.layout.borderSize}px;
-          border-color: #${colors.border-unfocused};
-          font-size: 12px;
-          font-family: "${theme.fonts.monospace.name}";
-        }
-
-        .modules-right {
-          margin: 0 8px 0 0;
-        }
-
-        #tags button {
-          color: #${theme.schemeColors.base03};
-          padding: 0 5px 1px 5px;
-          border-radius: 0;
-          font-size: 16px;
-          font-family: "Unifont";
-        }
-
-        #tags button.occupied {
-          color: #${colors.fg};
-        }
-
-        #tags button.focused {
-          color: #${colors.accent};
-        }
-      '';
-    };
-  };
-}

modules/users/modules/desktop/default.nix

@@ -1,53 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.desktop;
-in
-{
-  imports = [
-    # Import desktop environment modules
-    ./background/glpaper/default.nix
-    ./bar/waybar.nix
-    ./lock-screen/waylock.nix
-    ./window-manager/river.nix
-  ];
-
-  options.modules.desktop = {
-    wayland = mkEnableOption "wayland";
-    initScript = mkOption {
-      type = types.lines;
-      default = "${pkgs.bash}/bin/bash";
-      description = "Bash script to execute after logging in.";
-    };
-  };
-
-  config = {
-    # Ensure desktop related systemd services (xdg) have access to session variables.
-    systemd.user.sessionVariables = config.home.sessionVariables;
-
-    home.packages = optionals cfg.wayland (
-      with pkgs;
-      [
-        pkgs.wl-clipboard
-        pkgs.wtype
-      ]
-    );
-
-    home.file.".initrc" = {
-      enable = true;
-      executable = true;
-      text =
-        ''
-          #!${pkgs.bash}/bin/bash
-
-        ''
-        + cfg.initScript;
-    };
-  };
-}

modules/users/modules/desktop/lock-screen/waylock.nix

@@ -1,20 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.waylock;
-in
-{
-  options.modules.waylock = {
-    enable = mkEnableOption "waylock";
-  };
-
-  config = {
-    home.packages = mkIf cfg.enable (with pkgs; [ waylock ]);
-  };
-}

modules/users/modules/desktop/window-manager/river.nix

@@ -1,238 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  cfg = config.modules.river;
-in
-{
-  options.modules.river.enable = lib.mkEnableOption "river";
-
-  # osConfig = lib.mkIf cfg.enable {
-  #   programs.river.enable = true;
-  # };
-
-  config = lib.mkIf cfg.enable {
-    # Set desktop type to wayland
-    modules.desktop.wayland = true;
-
-    # TODO: Move elsewhere and make keybindings more configurable
-    modules.rofi.enable = true;
-
-    # Change desktop to execute river
-    modules.desktop.initScript = ''
-      river
-    '';
-
-    # Update background after rebuild
-    home.activation = {
-      river = lib.hm.dag.entryBetween [ "reloadSystemd" ] [ "installPackages" ] ''
-        # Close waybar
-        PATH="${pkgs.procps}/bin:$PATH" $DRY_RUN_CMD pkill waybar
-
-        # Kill rivertile
-        PATH="${pkgs.procps}/bin:$PATH" $DRY_RUN_CMD pkill rivertile
-
-        # Kill glpaper
-        PATH="${pkgs.procps}/bin:$PATH" $DRY_RUN_CMD pkill glpaper
-
-        # Restart river
-        PATH="${pkgs.river}/bin:${pkgs.systemd}/bin:$PATH" $DRY_RUN_CMD ~/.config/river/init
-      '';
-    };
-
-    # River setup
-    wayland.windowManager.river = {
-      enable = true;
-      xwayland.enable = true;
-      settings =
-        let
-          layout = "rivertile";
-          layoutOptions = "-outer-padding ${toString config.theming.layout.windowPadding} -view-padding ${toString config.theming.layout.windowPadding}";
-          modes = [
-            "normal"
-            "locked"
-          ];
-          tags = [
-            1
-            2
-            3
-            4
-            5
-            6
-            7
-            8
-            9
-          ];
-          waylockOptions = "-init-color 0x${colors.bg} -input-color 0x${colors.border-focused} -fail-color 0x${colors.bg}";
-
-          colors = config.theming.colors;
-
-          # Quick pow function
-          pow2 = power: if power != 0 then 2 * (pow2 (power - 1)) else 1;
-
-          # Modifiers
-          main = "Super";
-          ssm = "Super+Shift";
-          sas = "Super+Alt+Shift";
-          sam = "Super+Alt";
-          scm = "Super+Control";
-          scam = "Super+Control+Alt";
-          ssc = "Super+Shift+Control";
-        in
-        {
-          default-layout = "${layout}";
-          set-repeat = "50 300";
-          xcursor-theme = "BreezeX-RosePine-Linux 24";
-          keyboard-layout = "-options \"caps:escape\" us";
-
-          border-width = toString config.theming.layout.borderSize;
-          background-color = "0x${colors.bg}";
-          border-color-focused = "0x${colors.fg}";
-          border-color-unfocused = "0x${colors.border-unfocused}"; # TODO: Change to use named color;
-          border-color-urgent = "0x${colors.fg}";
-
-          spawn = [
-            "\"${layout} ${layoutOptions}\""
-            "waybar"
-            "\"glpaper eDP-1 ${toString config.modules.glpaper.shader}\""
-          ];
-          map = (
-            lib.attrsets.recursiveUpdate
-              ({
-                normal =
-                  {
-                    "${main} Q" = "close";
-                    "${ssm} E" = "exit";
-
-                    # Basic utilities
-                    "${main} X " = "spawn \"waylock -fork-on-lock ${waylockOptions}\"";
-                    "${ssm} Return" = "spawn foot";
-                    "${main} P" = "spawn \"rofi -show drun\"";
-                    "${ssm} P" = "spawn rofi-rbw";
-
-                    # Window focus
-                    "${main} J" = "focus-view next";
-                    "${main} K" = "focus-view previous";
-
-                    # Swap windows
-                    "${ssm} J" = "swap next";
-                    "${ssm} K" = "swap previous";
-                    "${main} Return" = "zoom";
-
-                    # Main ratio
-                    "${main} H" = "send-layout-cmd rivertile 'main-ratio -0.05'";
-                    "${main} L" = "send-layout-cmd rivertile 'main-ratio +0.05'";
-
-                    # Main count
-                    "${ssm} H" = "send-layout-cmd rivertile 'main-count +1'";
-                    "${ssm} L" = "send-layout-cmd rivertile 'main-count -1'";
-
-                    # Tags
-                    "${main} 0" = "set-focused-tags ${toString (pow2 32 - 1)}";
-                    "${ssm} 0" = "set-view-tags ${toString (pow2 32 - 1)}";
-
-                    # Orientation
-                    "${main} Up" = "send-layout-cmd rivertile \"main-location top\"";
-                    "${main} Right" = "send-layout-cmd rivertile \"main-location right\"";
-                    "${main} Down" = "send-layout-cmd rivertile \"main-location bottom\"";
-                    "${main} Left" = "send-layout-cmd rivertile \"main-location left\"";
-
-                    # Move floating windows
-                    "${sam} H" = "move left 100";
-                    "${sam} J" = "move down 100";
-                    "${sam} K" = "move up 100";
-                    "${sam} L" = "move right 100";
-
-                    # Snap floating windows
-                    "${scam} H" = "snap left";
-                    "${scam} J" = "snap down";
-                    "${scam} K" = "snap up";
-                    "${scam} L" = "snap right";
-
-                    # Resize floating windows
-                    "${sas} H" = "resize horizontal -100";
-                    "${sas} J" = "resize vertical 100";
-                    "${sas} K" = "resize vertical -100";
-                    "${sas} L" = "resize horizontal 100";
-
-                    # Toggle modes
-                    "${main} Space" = "toggle-float";
-                    "${main} F" = "toggle-fullscreen";
-                  }
-                  // builtins.listToAttrs (
-                    builtins.concatLists (
-                      map (tag: [
-                        {
-                          name = "${main} ${toString tag}";
-                          value = "set-focused-tags ${toString (pow2 (tag - 1))}";
-                        }
-                        {
-                          name = "${ssm} ${toString tag}";
-                          value = "set-view-tags ${toString (pow2 (tag - 1))}";
-                        }
-                        {
-                          name = "${scm} ${toString tag}";
-                          value = "toggle-focused-tags ${toString (pow2 (tag - 1))}";
-                        }
-                        {
-                          name = "${ssc} ${toString tag}";
-                          value = "toggle-view-tags ${toString (pow2 (tag - 1))}";
-                        }
-                      ]) tags
-                    )
-                  );
-              })
-              (
-                builtins.listToAttrs (
-                  map (mode: {
-                    name = "${mode}";
-                    value = {
-                      # Control volume
-                      "None XF86AudioRaiseVolume" = "spawn \"pulsemixer --change-volume +5\"";
-                      "None XF86AudioLowerVolume" = "spawn \"pulsemixer --change-volume -5\"";
-                      "None XF86AudioMute" = "spawn \"pulsemixer --toggle-mute\"";
-
-                      # Control brightness
-                      "None XF86MonBrightnessUp" = "spawn \"brightnessctl set +5%\"";
-                      "None XF86MonBrightnessDown" = "spawn \"brightnessctl set 5%-\"";
-
-                      # Control music playback
-                      "None XF86Messenger" = "spawn \"playerctl previous\"";
-                      "None XF86Go" = "spawn \"playerctl play-pause\"";
-                      "None Cancel" = "spawn \"playerctl next\"";
-                    };
-                  }) modes
-                )
-              )
-          );
-          map-pointer = {
-            normal = {
-              "${main} BTN_LEFT" = "move-view";
-              "${main} BTN_RIGHT" = "resize-view";
-              "${main} BTN_MIDDLE" = "toggle-float";
-            };
-          };
-          input = {
-            "'*'" = {
-              accel-profile = "adaptive";
-              pointer-accel = "0.5";
-              scroll-factor = "0.8";
-            };
-            "'*Synaptics*'" = {
-              natural-scroll = "enabled";
-            };
-          };
-          rule-add = {
-            "-app-id" = {
-              "'bar'" = "csd";
-              "'*'" = "ssd";
-            };
-          };
-        };
-    };
-  };
-}

modules/users/modules/discord/default.nix

@@ -1,22 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.discord;
-in
-{
-  options.modules.discord = {
-    enable = mkEnableOption "discord";
-  };
-
-  config = mkIf cfg.enable {
-    modules.unfree.allowedPackages = [ "discord" ];
-
-    home.packages = with pkgs; [ discord ];
-  };
-}

modules/users/modules/feishin/default.nix

@@ -1,16 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.feishin;
-in
-{
-  options.modules.feishin.enable = mkEnableOption "feishin";
-
-  config = mkIf cfg.enable { home.packages = with pkgs; [ feishin ]; };
-}

modules/users/modules/fontconfig/default.nix

@@ -1,57 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.fontconfig;
-
-  aliasConfig = font: ''
-    <alias>
-      <family>${font.name}</family>
-
-      <prefer>
-        <family>${font.name}</family>
-    ${concatStrings (map (font: "    <family>${font}</family>\n") font.fallbackFonts)}
-      </prefer>
-    </alias>
-  '';
-
-  configContent = concatStrings (
-    map (font: aliasConfig config.theming.fonts.pkgs.${font}) config.theming.fonts.installed
-  );
-in
-{
-  options.modules.fontconfig = {
-    enable = mkEnableOption "fontconfig";
-  };
-
-  config = mkIf cfg.enable {
-    fonts.fontconfig = {
-      enable = true;
-
-      defaultFonts = {
-        serif = [ config.theming.fonts.serif.name ];
-        sansSerif = [ config.theming.fonts.sansSerif.name ];
-        monospace = [ config.theming.fonts.monospace.name ];
-        emoji = [ config.theming.fonts.emoji.name ];
-      };
-    };
-
-    home.file.".config/fontconfig/conf.d/20-family-fallbacks.conf" = {
-      enable = true;
-
-      text = ''
-        <?xml version="1.0"?>
-        <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
-        <fontconfig>
-
-        ${configContent}
-        </fontconfig>
-      '';
-    };
-  };
-}

modules/users/modules/language/rust.nix

@@ -1,42 +0,0 @@
-{
-  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; [
-      rustc
-      cargo
-      rust-analyzer
-      rustfmt
-    ];
-
-    # VSCode configuration
-    programs.vscode = {
-      extensions = with pkgs.vscode-extensions; [ rust-lang.rust-analyzer ];
-
-      userSettings = {
-        "[rust]" = { };
-      };
-    };
-
-    # Neovim configuration
-    programs.nixvim = {
-      plugins.rust-tools = {
-        enable = true;
-      };
-    };
-  };
-}

modules/users/modules/mako/default.nix

@@ -1,31 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.mako;
-  theme = config.theming;
-  colors = theme.colors;
-in
-{
-  options.modules.mako.enable = mkEnableOption "mako";
-
-  config = mkIf cfg.enable {
-    services.mako = {
-      enable = true;
-      anchor = "top-right";
-      defaultTimeout = 5000;
-      backgroundColor = "#${colors.bg}ff";
-      textColor = "#${colors.fg}ff";
-      borderColor = "#${colors.fg}ff";
-      progressColor = "#${colors.accent}ff";
-      borderRadius = 0;
-      borderSize = theme.layout.borderSize;
-      font = "${theme.fonts.monospace.name} ${toString theme.fonts.monospace.recommendedSize}";
-    };
-  };
-}

modules/users/modules/neovim/default.nix

@@ -1,187 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.neovim;
-  theme = config.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:␣";
-      };
-
-      diagnostics = {
-        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.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/users/modules/obsidian/default.nix

@@ -1,18 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.obsidian;
-in
-{
-  options.modules.obsidian = {
-    enable = mkEnableOption "obsidian";
-  };
-
-  config = mkIf cfg.enable { home.packages = with pkgs; [ obsidian ]; };
-}

modules/users/modules/rofi/default.nix

@@ -1,62 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.rofi;
-  theme = config.theming;
-  colors = theme.colors;
-in
-{
-  options.modules.rofi.enable = mkEnableOption "rofi";
-
-  config = mkIf cfg.enable {
-    programs.rofi = {
-      enable = true;
-      terminal = config.default.terminal;
-      package = pkgs.rofi-wayland;
-      font = "${theme.fonts.monospace.name} ${toString theme.fonts.monospace.recommendedSize}";
-      theme =
-        let
-          inherit (config.lib.formats.rasi) mkLiteral;
-        in
-        {
-          "*" = {
-            background-color = mkLiteral "rgba(0, 0, 0, 0%)";
-            border-color = mkLiteral "#${colors.fg}";
-            text-color = mkLiteral "#${colors.fg}";
-          };
-          mainbox = {
-            background-color = mkLiteral "#${colors.bg}";
-            border = mkLiteral "${toString theme.layout.borderSize}px";
-          };
-          element-text = {
-            highlight = mkLiteral "#${colors.fg-search}";
-          };
-          inputbar = {
-            children = mkLiteral "[textbox-search, entry]";
-          };
-          listview = {
-            padding = mkLiteral "2px 0px";
-          };
-          textbox-search = {
-            expand = false;
-            content = "> ";
-          };
-          "inputbar, message" = {
-            padding = mkLiteral "2px";
-          };
-          element = {
-            padding = mkLiteral "0px 2px";
-          };
-          "element selected" = {
-            background-color = mkLiteral "#${colors.border-unfocused}";
-          };
-        };
-    };
-  };
-}

modules/users/modules/rofi/rofi-rbw.nix

@@ -1,31 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.rofi-rbw;
-in
-{
-  options.modules.rofi-rbw.enable = mkEnableOption "rofi-rbw";
-
-  config = mkIf cfg.enable {
-    modules.rofi.enable = true;
-
-    home.packages = [ pkgs.rofi-rbw ];
-
-    # TODO: Move to separate module and make configurable
-    programs.rbw = {
-      enable = true;
-      settings = {
-        base_url = "https://keys.bulthuis.dev";
-        identity_url = "https://keys.bulthuis.dev";
-        email = "jan@bulthuis.dev";
-        pinentry = pkgs.pinentry;
-      };
-    };
-  };
-}

modules/users/modules/shell/bash.nix

@@ -1,18 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.bash;
-in
-{
-  options.modules.bash = {
-    enable = mkEnableOption "bash";
-  };
-
-  config.programs.bash.enable = cfg.enable;
-}

modules/users/modules/steam/default.nix

@@ -1,13 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-{
-  options.modules.steam = {
-    enable = mkEnableOption "steam";
-  };
-}

modules/users/modules/systemwide/default.nix

@@ -1,10 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    # Import systemwide configuration files.
-    ./river.nix
-    ./steam.nix
-    ./waylock.nix
-  ];
-}

modules/users/modules/systemwide/river.nix

@@ -1,14 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  enabled = any (user: user.modules.river.enable) (attrValues config.home-manager.users);
-in
-{
-  config = mkIf enabled { programs.river.enable = true; };
-}

modules/users/modules/systemwide/steam.nix

@@ -1,14 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  enabled = any (user: user.modules.steam.enable) (attrValues config.home-manager.users);
-in
-{
-  config = mkIf enabled { programs.steam.enable = true; };
-}

modules/users/modules/systemwide/waylock.nix

@@ -1,14 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  enabled = any (user: user.modules.waylock.enable) (attrValues config.home-manager.users);
-in
-{
-  config = mkIf enabled { security.pam.services.waylock = { }; };
-}

modules/users/modules/terminal/default.nix

@@ -1,14 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-
-with lib;
-{
-  options.default.terminal = mkOption {
-    type = types.str;
-    description = "Default terminal application";
-  };
-}

modules/users/modules/terminal/foot/default.nix

@@ -1,35 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.modules.foot;
-in
-{
-  options.modules.foot.enable = mkEnableOption "foot";
-
-  config = mkIf cfg.enable {
-    default.terminal = mkDefault "${pkgs.foot}/bin/foot";
-
-    programs.foot = {
-      enable = true;
-      settings = {
-        main =
-          let
-            font = config.theming.fonts.monospace.name;
-            size = toString config.theming.fonts.monospace.recommendedSize;
-          in
-          {
-            font = mkForce "${font}:style=Regular:size=${size}";
-            font-bold = "${font}:style=Bold:size=${size}";
-            font-italic = "${font}:style=Italic:size=${size}";
-            font-bold-italic = "${font}:style=Bold Italic:size=${size}";
-          };
-      };
-    };
-  };
-}

modules/users/modules/theming/default.nix

@@ -1,369 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-
-with lib;
-let
-  cfg = config.theming;
-
-  # Stylix
-  stylix = pkgs.fetchFromGitHub {
-    owner = "danth";
-    repo = "stylix";
-    rev = "1ff9d37d27377bfe8994c24a8d6c6c1734ffa116";
-    sha256 = "0dz8h1ga8lnfvvmvsf6iqvnbvxrvx3qxi0y8s8b72066mqgvy8y5";
-  };
-
-  # Font module type
-  fontModule = types.submodule {
-    options = {
-      name = mkOption {
-        type = types.str;
-        description = "Font family name.";
-      };
-      package = mkOption {
-        type = types.anything;
-        description = "Font package";
-      };
-      recommendedSize = mkOption {
-        type = types.nullOr types.int;
-        default = null;
-        description = "Recommended size for displaying this font.";
-      };
-      fallbackFonts = mkOption {
-        type = types.listOf types.str;
-        default = [ ];
-        description = "Fallback fonts for specified font.";
-      };
-    };
-  };
-
-  fontModules = [
-    # Import all fonts
-    ./fonts/cozette-vector.nix
-    ./fonts/cozette.nix
-    ./fonts/dejavu-sans.nix
-    ./fonts/dejavu-serif.nix
-    ./fonts/dina.nix
-    ./fonts/fira-code.nix
-    ./fonts/nerd-fonts-symbols.nix
-    ./fonts/noto-color-emoji.nix
-    ./fonts/wqy-bitmapsong.nix
-    ./fonts/wqy-microhei-mono.nix
-    ./fonts/wqy-microhei.nix
-    ./fonts/wqy-zenhei-mono.nix
-    ./fonts/wqy-zenhei-sharp.nix
-    ./fonts/wqy-zenhei.nix
-  ];
-
-  # Gather enabled fonts.
-  enabledFonts = [
-    cfg.fonts.serif.name
-    cfg.fonts.sansSerif.name
-    cfg.fonts.monospace.name
-    cfg.fonts.emoji.name
-  ] ++ map (font: font.name) cfg.fonts.extraFonts;
-
-  # Flatten dependencies of fonts
-  fontPackages =
-    converge
-      (
-        fonts:
-        listToAttrs (
-          map
-            (font: {
-              name = font;
-              value = true;
-            })
-            (
-              flatten (map (font: [ font.name ] ++ cfg.fonts.pkgs.${font.name}.fallbackFonts) (attrsToList fonts))
-            )
-        )
-      )
-      (
-        listToAttrs (
-          map (font: {
-            name = font;
-            value = true;
-          }) enabledFonts
-        )
-      );
-
-  # Convert set of fonts to list of packages
-  fontNameList = map (font: font.name) (attrsToList fontPackages);
-  fontPackageList = map (font: cfg.fonts.pkgs.${font}.package) fontNameList;
-in
-{
-  imports = [
-    # Import all themes
-    ./themes/catppuccin.nix
-    ./themes/gruvbox.nix
-    ./themes/sakura.nix
-  ];
-
-  options.modules.theming.enable = mkEnableOption "theming";
-
-  options.theming =
-    let
-      colors = config.theming.schemeColors;
-    in
-    {
-      darkMode = mkOption {
-        type = types.bool;
-        default = false;
-        example = true;
-        description = "Whether the app should use dark mode.";
-      };
-
-      colorScheme = mkOption {
-        type = types.nullOr types.str;
-        default = null;
-        description = "Base 16 color scheme to use for styling. See stylix documentation for more information.";
-      };
-
-      clientSideDecorations = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Whether to enable client side decorations for windows.";
-      };
-
-      schemeColors = mkOption {
-        type = types.attrsOf types.anything;
-        default = config.lib.stylix.colors;
-        description = "Generated colors from scheme";
-      };
-
-      colors = {
-        bg = mkOption {
-          type = types.str;
-          default = colors.base00;
-        };
-        fg = mkOption {
-          type = types.str;
-          default = colors.base05;
-        };
-        bg-status = mkOption {
-          type = types.str;
-          default = colors.base01;
-        };
-        fg-status = mkOption {
-          type = types.str;
-          default = colors.base04;
-        };
-        bg-selection = mkOption {
-          type = types.str;
-          default = colors.base02;
-        };
-        bg-highlight = mkOption {
-          type = types.str;
-          default = colors.base03;
-        };
-        fg-search = mkOption {
-          type = types.str;
-          default = colors.base0A;
-        };
-        accent = mkOption {
-          type = types.str;
-          default = colors.base0E;
-        };
-        border-focused = mkOption {
-          type = types.str;
-          default = cfg.colors.fg;
-        };
-        border-unfocused = mkOption {
-          type = types.str;
-          default = cfg.colors.bg-selection;
-        };
-      };
-
-      colorsCSS = mkOption {
-        type = types.lines;
-        default =
-          ":root {\n"
-          + concatStrings (
-            map (color: "  --nix-color-${color.name}: #${color.value};\n") (attrsToList cfg.colors)
-          )
-          + "}\n\n";
-        description = "Colors as css variables";
-      };
-
-      layout = {
-        borderRadius = mkOption {
-          type = types.int;
-          default = 0;
-          description = "Border radius of windows.";
-        };
-
-        borderSize = mkOption {
-          type = types.int;
-          default = 1;
-          description = "Size of borders used throughout UI.";
-        };
-
-        windowPadding = mkOption {
-          type = types.int;
-          default = 2;
-          description = "Margin of each window, actual space between windows will be twice this number.";
-        };
-      };
-
-      fonts = {
-        pkgs = mkOption {
-          type = types.attrsOf fontModule;
-          default = builtins.listToAttrs (
-            map (module: {
-              name = module.name;
-              value = module;
-            }) (map (module: (import module) { inherit lib config pkgs; }) fontModules)
-          );
-          description = "All available font modules.";
-        };
-
-        installed = mkOption {
-          type = types.listOf types.str;
-          default = fontNameList;
-          description = "List of installed fonts.";
-        };
-
-        serif = mkOption {
-          type = fontModule;
-          description = "Default serif font";
-        };
-
-        sansSerif = mkOption {
-          type = fontModule;
-          description = "Default sansSerif font.";
-        };
-
-        monospace = mkOption {
-          type = fontModule;
-          description = "Default monospace font.";
-        };
-
-        emoji = mkOption {
-          type = fontModule;
-          description = "Default emoji font.";
-        };
-
-        extraFonts = mkOption {
-          type = types.listOf fontModule;
-          default = [ ];
-          description = "Additional fonts to install.";
-        };
-      };
-    };
-
-  config = mkIf config.modules.theming.enable {
-    # Enable fontconfig
-    modules.fontconfig.enable = true;
-
-    # Install configured fonts
-    home.packages = fontPackageList;
-
-    # Configure gnome theme
-    dconf.settings = {
-      "org/gnome/desktop/interface" = {
-        color-scheme = if cfg.darkMode then "prefer-dark" else "prefer-light";
-      };
-    };
-
-    # Configure qt theme
-    qt = {
-      enable = true;
-      platformTheme.name = "adwaita";
-      style.name = if cfg.darkMode then "adwaita-dark" else "adwaita-light";
-    };
-
-    # Configure gtk theme
-    gtk =
-      let
-        disableCSD = ''
-          headerbar.default-decoration {
-            margin-bottom: 50px;
-            margin-top: -100px;
-          }
-
-          window.csd,
-          window.csd decoration {
-            box-shadow: none;
-          }
-        '';
-      in
-      {
-        enable = true;
-
-        theme = {
-          name = if cfg.darkMode then "Adwaita-dark" else "Adwaita-light";
-          package = pkgs.gnome-themes-extra;
-        };
-
-        gtk3.extraCss = mkIf (!cfg.clientSideDecorations) disableCSD;
-        gtk4.extraCss = mkIf (!cfg.clientSideDecorations) disableCSD;
-      };
-
-    # TODO: This should just straight up not be here
-    programs.direnv = {
-      enable = true;
-      nix-direnv.enable = true;
-    };
-
-    # TODO: Make cursors configurable using modules.
-    home.pointerCursor = {
-      gtk.enable = true;
-      name = lib.mkForce "BreezeX-RosePine-Linux";
-      package = lib.mkForce pkgs.rose-pine-cursor;
-      size = lib.mkForce 24;
-      x11 = {
-        defaultCursor = lib.mkForce "BreezeX-RosePine-Linux";
-        enable = true;
-      };
-    };
-
-    # Enable stylix
-    # TODO: Move to own module
-    stylix = {
-      enable = true;
-      autoEnable = false;
-
-      targets = {
-        foot.enable = true;
-        nixvim.enable = true;
-        qutebrowser.enable = true;
-        vscode.enable = true;
-        zathura.enable = true;
-      };
-
-      base16Scheme = cfg.colorScheme;
-      polarity = if cfg.darkMode then "dark" else "light";
-
-      fonts = {
-        serif = getAttrs [
-          "name"
-          "package"
-        ] cfg.fonts.serif;
-        sansSerif = getAttrs [
-          "name"
-          "package"
-        ] cfg.fonts.sansSerif;
-        monospace = getAttrs [
-          "name"
-          "package"
-        ] cfg.fonts.monospace;
-        emoji = getAttrs [
-          "name"
-          "package"
-        ] cfg.fonts.emoji;
-
-        sizes = {
-          applications = mkDefault cfg.fonts.serif.recommendedSize;
-          desktop = mkDefault cfg.fonts.monospace.recommendedSize; # TODO: See below
-          popups = mkDefault cfg.fonts.monospace.recommendedSize; # TODO: Add dedicated UI font
-          terminal = mkDefault cfg.fonts.monospace.recommendedSize;
-        };
-      };
-    };
-  };
-}

modules/users/modules/theming/fonts/cozette-vector.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-
-{
-  name = "Cozette Vector";
-  package = pkgs.cozette;
-  recommendedSize = 9;
-  fallbackFonts = [ ];
-}

modules/users/modules/theming/fonts/cozette.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-
-{
-  name = "Cozette";
-  package = pkgs.cozette;
-  recommendedSize = 9;
-  fallbackFonts = [ "Cozette Vector" ];
-}

modules/users/modules/theming/fonts/dejavu-sans.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-
-{
-  name = "DejaVu Sans";
-  package = pkgs.dejavu_fonts;
-  recommendedSize = 12;
-  fallbackFonts = [ ];
-}

modules/users/modules/theming/fonts/dejavu-serif.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-
-{
-  name = "DejaVu Serif";
-  package = pkgs.dejavu_fonts;
-  recommendedSize = 12;
-  fallbackFonts = [ ];
-}

modules/users/modules/theming/fonts/dina.nix

@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-
-{
-  name = "Dina";
-  package = pkgs.dina-font;
-  recommendedSize = 9;
-  fallbackFonts = [
-    "Cozette"
-    "wenquanyi bitmap song"
-    "Symbols Nerd Font Mono"
-  ];
-}

modules/users/modules/theming/fonts/fira-code.nix

@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-
-{
-  name = "Fira Code";
-  package = pkgs.fira-code;
-  recommendedSize = 12;
-  fallbackFonts = [ "Symbols Nerd Font Mono" ];
-}