Update ankaa

Add anki and update
Add Vintage Story to games
2025-12-17 11:57:02 -06:00 · 2025-10-30 18:47:55 -05:00 · 2025-10-30 18:47:32 -05:00 · 2025-09-02 11:51:55 -05:00 · 2025-09-02 11:44:22 -05:00 · 2025-09-02 11:44:22 -05:00
92 changed files with 2806 additions and 937 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/hostname
+/hostname/flake.nix
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -0,0 +1,35 @@
+keys:
+  - &admin_ankaa age1079fszreaakwf6xnwu9kra8xcsp4e8q8ed3y99yrhjnz9n3t9pnsj05m97
+  - &admin_alpheratz age1gdtjn3jgvvvspa86q3lnklflnvyf3s75y2rw23l7nk7hwcsfpg7qkq7msr
+  - &diphda age1rxqyz6watg05r3rzlme7grpgfgezhlt535gdl7psqys2ec8eegmqchfk4d
+  - &alpheratz age1cla0k3yffcelphkrmgz5upc0chgtdef25ne833jeqtapceux59rqkmhxf7
+  - &ankaa age15z4s7nts7ls5h3tu5zesghvnm3kj2qk3dsr004g8rwy578mq4q4qew7wl7
+creation_rules:
+  - path_regex: secrets/[^/]+\.yaml$
+    key_groups:
+    - age:
+      - *admin_ankaa
+      - *admin_alpheratz
+  - path_regex: secrets/shared/[^/]+\.(yaml|otf)$
+    key_groups:
+    - age:
+      - *admin_ankaa
+      - *admin_alpheratz
+      - *alpheratz
+      - *ankaa
+      - *diphda
+  - path_regex: secrets/ankaa/[^/]+\.yaml$
+    key_groups:
+    - age:
+      - *admin_ankaa
+  - path_regex: secrets/alpheratz/[^/]+\.yaml$
+    key_groups:
+    - age:
+      - *admin_alpheratz
+      - *alpheratz
+  - path_regex: secrets/diphda/[^/]+\.(yaml|keytab)$
+    key_groups:
+    - age:
+      - *admin_ankaa
+      - *admin_alpheratz
+      - *diphda
--- a/features/common.nix
+++ b/features/common.nix
@@ -1,26 +0,0 @@
-{ lib, pkgs, localPackages, ... }: {
-
-    imports = [];
-
-    environment.systemPackages = with pkgs; [
-        curl
-        wget
-        git
-        killall
-        vim
-        eza
-        ripgrep
-        fzf
-        ncdu
-        btop
-        nil
-    ];
-
-    programs.neovim = {
-        enable = true;
-        defaultEditor = true;
-    };
-
-    programs.fish.enable = true;
-
-}
--- a/features/gaming.nix
+++ b/features/gaming.nix
@@ -1,13 +0,0 @@
-{ lib, pkgs, localPackages, ... }: {
-    environment.systemPackages = with pkgs; with localPackages.x86_64-linux; [
-        protonup-qt
-        vesktop
-        lutris
-        gamescope-old
-        wine
-    ];
-
-    programs.steam = {
-        enable = true;
-    };
-}
--- a/features/gui.nix
+++ b/features/gui.nix
@@ -1,33 +0,0 @@
-{ lib, pkgs, localPackages, ... }: {
-
-    environment.systemPackages = with pkgs; with localPackages.x86_64-linux; [
-        wl-clipboard
-        grim
-        slurp
-        swaybg
-        waybar
-        alacritty
-        kickoff
-        kickoff-dot-desktop
-        wayland-pipewire-idle-inhibit
-        firefox
-        mpv
-        cinny-desktop
-        thunderbird
-        protonmail-bridge
-        libsecret
-    ];
-
-    programs.sway.enable = true;
-    programs.thunar.enable = true;
-    programs.dconf.enable = true;
-
-    services.gnome.gnome-keyring.enable = true;
-    services.dbus.packages = [ pkgs.gnome.seahorse ];
-
-    xdg.portal.wlr.enable = true;
-
-    fonts.packages = with pkgs; [
-        font-awesome
-    ];
-}
--- a/features/laptop.nix
+++ b/features/laptop.nix
@@ -1,5 +0,0 @@
-{ lib, pkgs, localPackages, ... }:
-
-{
-    programs.light.enable = true;
-}
--- a/features/networking.nix
+++ b/features/networking.nix
@@ -1,8 +0,0 @@
-{ lib, pkgs, localPackages, ... }: {
-
-    environment.systemPackages = with pkgs; [
-        ldns
-        wireguard-tools
-    ];
-
-}
--- a/flake.lock
+++ b/flake.lock
@@ -1,29 +1,90 @@
 {
  "nodes": {
-    "currentSystem": {
+    "flake-compat": {
+      "flake": false,
      "locked": {
-        "lastModified": 1717562249,
-        "narHash": "sha256-WdcVxEl64ZRLVUmnn9ZVXBId0eGkzxwZSVDxZDy0mgU=",
-        "path": "/etc/nixos/hostname",
-        "type": "path"
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "type": "github"
      },
      "original": {
-        "path": "/etc/nixos/hostname",
-        "type": "path"
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
      }
    },
-    "home-manager": {
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1730504689,
+        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "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-stable": {
      "inputs": {
        "nixpkgs": [
-          "nixpkgs"
+          "nixpkgs-stable"
        ]
      },
      "locked": {
-        "lastModified": 1717525419,
-        "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=",
+        "lastModified": 1747688870,
+        "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "a7117efb3725e6197dd95424136f79147aa35e5b",
+        "rev": "d5f1f641b289553927b3801580598d200a501863",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-24.11",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "home-manager-unstable": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ]
+      },
+      "locked": {
+        "lastModified": 1761845621,
+        "narHash": "sha256-d+R4MHsGmdebvSMsYUFWONsZSlUbOo8Zq/wjMdMiIac=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "97e3022a8d2c09313fa49847f6da4d76abcfc72d",
        "type": "github"
      },
      "original": {
@@ -32,13 +93,95 @@
        "type": "github"
      }
    },
+    "llama-cpp": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1761867267,
+        "narHash": "sha256-b2vU6HzMR26JnHmnkvNZgefyfzAZOi9wLZdA+WOymHU=",
+        "owner": "ggerganov",
+        "repo": "llama.cpp",
+        "rev": "6eb208d17ea29bb60295d9a2b5e7122dfb8f4b55",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ggerganov",
+        "repo": "llama.cpp",
+        "type": "github"
+      }
+    },
+    "nix-matlab": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1754476755,
+        "narHash": "sha256-vSF0VMEmPMzwNkrXIZwkhOSYmKES9BaDK/LlEe7/q8E=",
+        "owner": "doronbehar",
+        "repo": "nix-matlab",
+        "rev": "0e9c9fb660f9e1a1e4d59fd083e0212a15b513e2",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "doronbehar",
+        "repo": "nix-matlab",
+        "type": "gitlab"
+      }
+    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1717602782,
-        "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
+        "lastModified": 1732014248,
+        "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1730504152,
+        "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1751274312,
+        "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6",
+        "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1761672384,
+        "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
        "type": "github"
      },
      "original": {
@@ -48,11 +191,79 @@
        "type": "github"
      }
    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1754340878,
+        "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "cab778239e705082fe97bb4990e0d24c50924c04",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1760596604,
+        "narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3cbe716e2346710d6e1f7c559363d14e11c32a43",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
    "root": {
      "inputs": {
-        "currentSystem": "currentSystem",
-        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "flake-utils": "flake-utils",
+        "home-manager-stable": "home-manager-stable",
+        "home-manager-unstable": "home-manager-unstable",
+        "llama-cpp": "llama-cpp",
+        "nix-matlab": "nix-matlab",
+        "nixpkgs-stable": "nixpkgs-stable",
+        "nixpkgs-unstable": "nixpkgs-unstable",
+        "sops-nix": "sops-nix"
+      }
+    },
+    "sops-nix": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1760998189,
+        "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
+        "owner": "Mic92",
+        "repo": "sops-nix",
+        "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "sops-nix",
+        "type": "github"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
      }
    }
  },
--- a/flake.nix
+++ b/flake.nix
@@ -2,157 +2,316 @@
    description = "NixOS configuration";

    inputs = {
-        currentSystem.url = "path:/etc/nixos/hostname";
-        nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-        home-manager.url = "github:nix-community/home-manager";
-        home-manager.inputs.nixpkgs.follows = "nixpkgs";
+        nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
+
+        nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+
+        home-manager-stable.url = "github:nix-community/home-manager/release-24.11";
+        home-manager-stable.inputs.nixpkgs.follows = "nixpkgs-stable";
+
+        home-manager-unstable.url = "github:nix-community/home-manager";
+        home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable";
+
+        flake-utils.url = "github:numtide/flake-utils";
+
+        sops-nix.url = "github:Mic92/sops-nix";
+
+        llama-cpp.url = "github:ggerganov/llama.cpp";
+
+        nix-matlab.url = "gitlab:doronbehar/nix-matlab";
+
    };

-    outputs = inputs@{ self, currentSystem, nixpkgs, home-manager, ... }: let
-        inherit (self) outputs;
+    outputs = inputs@{ self
+                     , nixpkgs-stable
+                     , nixpkgs-unstable
+                     , home-manager-stable
+                     , home-manager-unstable
+                     , flake-utils
+                     , sops-nix
+                     , llama-cpp
+                     , nix-matlab
+                     , ...
+                     }:
+        let
+            inherit (self) outputs;
+            lib = nixpkgs-stable.lib;

-        hostname = currentSystem.hostname;
+            overlays = import ./overlays { inherit inputs; };
+            utils = import ./utils;

-        configs."ankaa" = {
-            system = "x86_64-linux";
+            configs = [
+                {
+                    hostname = "ankaa";
+                    system = "x86_64-linux";
+                    nixpkgs = nixpkgs-unstable;
+                    home-manager = home-manager-unstable;
                    
-            openssh = {
-                enable = true;
-                port = 2222;
-            };
+                    options = {
+                        openssh = {
+                            enable = true;
+                            port = 2222;
+                        };

-            backup = {
-                enable = true;
-                user = "eesim";
-                paths = [ "/home/eesim" ];
-                repo = "rf030789@rf030789.repo.borgbase.com:repo";
-                excludes = [ 
-                    "/home/eesim/.local/share/Steam/steamapps/common"
-                    "/home/eesim/.cache"
-                ];
-                passphrase = "/home/eesim/.ssh/borgbase_passphrase";
-                key = "/home/eesim/.ssh/id_ed25519_borgbase";
-                repeat = "daily";
-            };
+                        backup = {
+                            enable = true;
+                            user = "eesim";
+                            paths = [ "/home/eesim" ];
+                            repo = "rf030789@rf030789.repo.borgbase.com:repo";
+                            excludes = [ 
+                                "/home/eesim/.local/share/Steam/steamapps/common"
+                                "/home/eesim/.cache"
+                                "/home/eesim/llama/models"
+                                "/home/eesim/.local/share/Trash"
+                                "/home/eesim/Games"
+                                "/home/eesim/nixpkgs"
+                            ];
+                            passphrase = "/home/eesim/.ssh/borgbase_passphrase";
+                            key = "/home/eesim/.ssh/id_ed25519_borgbase";
+                            repeat = "daily";
+                        };

-            audio = {
-                pipewire.enable = true;
-                music.enable = true;
-                tools = {
-                    helvum = true;
-                    easyeffects = true;
-                };
-            };
+                        audio = {
+                            pipewire.enable = true;
+                            music.enable = true;
+                            tools = {
+                                helvum = true;
+                                easyeffects = true;
+                            };
+                        };

-            gui = {
-                enable = true;
-                protonmail = true;
-                matrix = true;
-                gtk = false;
+                        term = {
+                          terminal = "kitty";
+                          font = "codelia";
+                        };

-                sway = {
-                    enable = true;
-                    desktop = true;
-                };
+                        gui = {
+                            enable = true;
+                            protonmail = true;
+                            secrets = true;
+                            gtk = false;

-                monitors = pkgs.lib.mkMerge [
-                    (utils.mkMonitor {
-                        monitor = "DP-2";
-                        resolution = "3440x1440";
-                        refreshRate = 144;
-                        x = 1920;
-                        wallpaper = "ship_moon.png";
-                    })
-                    (utils.mkMonitor {
-                        monitor = "HDMI-A-1";
-                        resolution = "1920x1080";
-                        refreshRate = 75;
-                    })
-                ];
-
-            };
-
-            games = {
-                enable = true;
-                lutris.enable = true;
-            };
-
-            common.nil.enable = true;
-
-            networking.wireguard.enable = true;
-
-
-        };
-
-        configs."alpheratz" = {
-            system = "x86_64-linux";
-            
-            audio = {
-                pipewire.enable = true;
-                music.enable = true;
-
-            };
-
-            gui = {
-                enable = true;
-                protonmail = true;
-                matrix = true;
-
-                monitors = utils.mkMonitor {
-                    monitor = "eDP-1";
-                    resolution = "1920x1200";
-                    refreshRate = 60;
-                };
-
-            };
-
-            common.nil.enable = true;
-
-            networking.wireguard.enable = true;
-        };
-
-        configs."default-hostname" = {
-
-        };
-
-        utils = import ./utils;
-        system = configs."${hostname}".system;
-        pkgs = nixpkgs.legacyPackages.${system};
-
-        in {
-            nixosConfigurations = {
-                "${hostname}" = nixpkgs.lib.nixosSystem {
-                    specialArgs = {
-                        inherit (outputs) localPackages;
-                    };
-                    modules = [
-                        {
-                            networking.hostName = hostname;
-                            simmer = configs."${hostname}";
-                        }
-                        (import ./modules/nix)
-                        (./. + "/hosts/${hostname}/system.nix")
-                        (./. + "/hosts/${hostname}/hardware-configuration.nix")
-                        home-manager.nixosModules.home-manager
-                        {
-                            home-manager.useGlobalPkgs = true;
-                            home-manager.useUserPackages = true;
-                            home-manager.extraSpecialArgs = { 
-                                inherit utils;
-                                systemConfig = configs."${hostname}";
+                            sway = {
+                                enable = true;
+                                desktop = true;
                            };

-                            home-manager.users.eesim = import (./. + "/hosts/${hostname}/home.nix");
-                        }
-                    ];
-                };
-            };
-            localPackages = nixpkgs.lib.genAttrs [ "x86_64-linux" ] (system:
-                {
-                    kickoff-dot-desktop = pkgs.callPackage ./pkgs/kickoff-dot-desktop.nix {};
-                    gamescope-old = pkgs.callPackage ./pkgs/gamescope-old {};
-                    gamescope-dbg = pkgs.callPackage ./pkgs/gamescope-dbg {};
+                            monitors = lib.mkMerge [
+                                (utils.mkMonitor {
+                                    monitor = "DP-2";
+                                    resolution = "3440x1440";
+                                    refreshRate = 144;
+                                    wallpaper = "solar_system.png";
+                                })
+                                (utils.mkMonitor {
+                                    monitor = "HDMI-A-1";
+                                    resolution = "1920x1080";
+                                    x = 3440;
+                                    refreshRate = 75;
+                                })
+                            ];
+
+                        };
+
+                        school = {
+                            enable = true;
+                            citrix = true;
+                        };
+
+                        games = {
+                            enable = true;
+                            lutris.enable = true;
+                            minecraft.enable = true;
+                            vintagestory.enable = true;
+                        };
+
+                        common.nil.enable = true;
+
+                        networking = {
+                            wireguard.enable = true;
+                            firewall.allowedTCPPorts = [ 8080 ];
+                        };
+                    };
                }
+                {
+                    hostname = "alpheratz";
+                    system = "x86_64-linux";
+                    nixpkgs = nixpkgs-unstable;
+                    home-manager = home-manager-unstable;
+
+                    options = {
+                        laptop = {
+                            powersave.enable = true;
+                            backlight.enable = true;
+                        };
+                        
+                        audio = {
+                            pipewire.enable = true;
+                            music.enable = true;
+                        };
+
+                        gui = {
+                            enable = true;
+                            protonmail = true;
+
+                            sway = {
+                                enable = true;
+                                desktop = false;
+                            };
+
+                            monitors = utils.mkMonitor {
+                                monitor = "eDP-1";
+                                resolution = "1920x1200";
+                                refreshRate = 60;
+                            };
+
+                        };
+
+                        school = {
+                            enable = true;
+                            citrix = true;
+                        };
+
+                        games = {
+                          enable = true;
+                        };
+ 
+                        backup = {
+                           user = "eesim";
+                           paths = [ "/home/eesim" ];
+                           repo = "t643s856@t643s856.repo.borgbase.com:repo";
+                           excludes = [
+                              "/home/eesim/.cache/"
+                              "/home/eesim/configs/mc-distant-horizons"
+                              "/home/eesim/configs/mc-arcadia"
+                           ];
+                           key = "/home/eesim/.ssh/id_ed25519";
+                           passphrase = "/run/secrets/borgbase/nix-alpheratz";
+                           repeat = "daily";
+                        };
+
+                        common.nil.enable = true;
+
+                        networking = {
+                            wireguard.enable = true;
+                        };
+
+                        term.terminal = "kitty";
+                    };
+                }
+                {
+                    hostname = "diphda";
+                    system = "x86_64-linux";
+                    nixpkgs = nixpkgs-stable;
+                    home-manager = home-manager-stable;
+
+                    options = {
+                        openssh.enable = true;
+
+                        backup = {
+                          enable = true;
+                          user = "eesim";
+                          paths = [ "/home/eesim" ];
+                          repo = "ssh://p9h977h3@p9h977h3.repo.borgbase.com/./repo";
+                          excludes = [
+                            "/home/eesim/.cache"
+                          ];
+                          passphrase = "/run/secrets/backup/repo_password";
+                          key = "/home/eesim/.ssh/id_ed25519_borgbase";
+                          repeat = "daily";
+                        };
+
+                        networking = {
+                            firewall = {
+                                allowedTCPPorts = [ 80 443 3000 3843 4533 5030 6600 6722 7474 7878 8000 8080 8081 8083 8089 8096 8120 8181 8443 8787 8889 8902 8989 8998 9000 9091 9696 11112 13378 24454 25565 25600 50300 ];
+                                allowedUDPPorts = [ 3478 10001 ];
+                            };
+                        };
+                    };
+                }
+            ];
+
+        in {
+            nixosConfigurations = builtins.listToAttrs (map (config: 
+                let 
+                    inherit (config) nixpkgs home-manager system hostname;
+
+                    pkgs = import nixpkgs {
+                        inherit system;
+                        overlays = with overlays; [ printrun shadps4 nix-matlab.overlay ];
+                        config = {
+                          allowUnfree = true;
+                          permittedInsecurePackages = [
+                            "electron-31.7.7"
+                            # TODO: Remove when fixed https://github.com/NixOS/nixpkgs/issues/433004
+                            "libsoup-2.74.3"
+                            "libxml2-2.13.8"
+                          ];
+                        };
+                    };
+
+                    # TODO: Remove when Citrix is fixed
+                    pkgs_stable_tmp = import nixpkgs-stable {
+                      inherit system; 
+                      config = {
+                        allowUnfree = true;   
+                      };
+                    };
+
+                    localPackages = pkgs.lib.genAttrs flake-utils.lib.defaultSystems (system: {
+                            kickoff-dot-desktop = pkgs.callPackage ./pkgs/kickoff-dot-desktop.nix {};
+                            jhelioviewer = pkgs.callPackage ./pkgs/jhelioviewer.nix {};
+                            llama-cpp = llama-cpp.packages.${system}.rocm;
+                            shadps4 = pkgs.callPackage ./pkgs/shadps4.nix {};
+                            gazou = pkgs.callPackage ./pkgs/gazou.nix {};
+                        }
+                    );
+
+                    systemConfig = if builtins.pathExists (./. + "/hosts/${hostname}/system.nix") then
+                        (./. + "/hosts/${hostname}/system.nix")
+                    else
+                        ./hosts/default/system.nix;
+
+                    homeConfig = if builtins.pathExists (./. + "/hosts/${hostname}/home.nix") then
+                        (./. + "/hosts/${hostname}/home.nix")
+                    else 
+                        ./hosts/default/home.nix;
+                in
+                {
+                    name = config.hostname;
+                    value = nixpkgs.lib.nixosSystem {
+                        specialArgs = {
+                            inherit localPackages;
+                            inherit pkgs;
+                            inherit pkgs_stable_tmp;
+                        };
+                        modules = [
+                            {
+                                networking.hostName = hostname;
+                                simmer = config.options;
+                                nix.settings.trusted-users = [ "eesim" ];
+                            }
+                            systemConfig
+                            (./. + "/hosts/${hostname}/hardware-configuration.nix")
+                            sops-nix.nixosModules.sops
+                            (import ./modules/nix)
+                            (import ./modules/options)
+                            home-manager.nixosModules.home-manager
+                            {
+                                home-manager.useGlobalPkgs = true;
+                                home-manager.useUserPackages = true;
+                                home-manager.extraSpecialArgs = { 
+                                    inherit utils;
+                                    inherit localPackages;
+                                    systemConfig = config.options;
+                                };
+
+                                home-manager.users.eesim = import homeConfig;
+                            }
+                        ];
+                    };
+                })
+                configs
            );
        };
 }
--- a/hosts/alpheratz/dotfiles/fish/config.fish
+++ b/hosts/alpheratz/dotfiles/fish/config.fish
@@ -1,13 +1,41 @@
 if status is-interactive
-    ### Local environment variables
+    fish_add_path "/home/eesim/.cargo/bin/"
+
+    set fish_greeting
+
+    set fish_cursor_default block
+    set fish_cursor_insert line
+    set fish_cursor_replace_one	underscore
+    set fish_cursor_replace underscore
+    set fish_cursor_external line
+    set fish_cursor_visual block
+
+    function fish_mode_prompt
+    end
+
+    ### Local environment variables
+    set -x DENO_INSTALL "/home/eesim/.deno"
+
+    direnv hook fish | source
+
+end
+
+if status is-login
+
+    # SSH settings
+    eval (ssh-agent -c)
+    ssh-add /home/eesim/.ssh/id_ed25519
+
+    # Set environment variables in /etc/profile.d/
+    # exec bash -c "test -e /etc/profile && source /etc/profile"
+
+    # Disable GTK portal
+    set -x GTK_USE_PORTAL "0"
+
+
+    # Java fix
+    set -x _JAVA_AWT_WM_NONREPARENTING "1"

-    set -g fish_greeting
-    set -g fish_cursor_default block
-    set -g fish_cursor_insert line
-    set -g fish_cursor_replace_one underscore
-    set -g fish_cursor_replace underscore
-    set -g fish_cursor_external line
-    set -g fish_cursor_visual block

 end

@@ -15,33 +43,3 @@ if test (tty) = "/dev/tty1"
    sway
 end

-if status is-login
-
-    ### Environment Variables
-
-    # Set nvim to default editor
-    set -x SUDO_EDITOR = "/usr/bin/nvim"
-
-    # Set R library location
-    set -x R_LIBS_USER = "/home/eesim/.local/lib/R"
-
-    # Disable GTK portal
-    set -x GTK_USE_PORTAL=0
-
-    # Wayland environment variables
-    set -x XDG_CURRENT_DESKTOP = "sway"
-    set -x XDG_CURRENT_SESSION = "sway"
-    set -x XDG_SESSION_TYPE = "wayland"
-    set -x ELECTRON_OZONE_PLATFORM_HINT = "auto"
-    set -x QT_QPA_PLATFORM = "wayland;xcb"
-    set -x SDL_VIDEODRIVER = "wayland,x11"
-
-    # Java fix
-    set -x _JAVA_AWT_WM_NONREPARENTING = "1"
-
-    ### Themes
-    set -x QT_QPA_PLATFORMTHEME = "qt5ct"
-
-    ### Start fish
-    exec fish
-end
--- a/hosts/alpheratz/dotfiles/nvim/init.lua
+++ b/hosts/alpheratz/dotfiles/nvim/init.lua
@@ -1,9 +0,0 @@
-require('config/keymaps')
-require('config/settings')
-require('config/plugins')
-require('config/plugins/lualine')
-require('config/plugins/lspconfig')
-
-local vimscriptpath = vim.fn.stdpath("config") .. "/lua/config/vimscript/"
-
-vim.cmd('source' .. vimscriptpath .. 'init.vim')
--- a/hosts/alpheratz/dotfiles/nvim/lazy-lock.json
+++ b/hosts/alpheratz/dotfiles/nvim/lazy-lock.json
@@ -1,15 +0,0 @@
-{
-  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "fzf-lua": { "branch": "main", "commit": "b442569ab827f72e344236c598b02cb9dc754e9f" },
-  "kanagawa.nvim": { "branch": "master", "commit": "860e4f80df71221d18bf2cd9ef1deb4d364274d2" },
-  "lazy.nvim": { "branch": "main", "commit": "8f19915175395680808de529e4220da8dafc0759" },
-  "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
-  "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
-  "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
-  "nvim-lspconfig": { "branch": "master", "commit": "b972e7154bc94ab4ecdbb38c8edbccac36f83996" },
-  "nvim-surround": { "branch": "main", "commit": "79aaa42da1f698ed31bcbe7f83081f69dca7ba17" },
-  "nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" },
-  "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" },
-  "typst.vim": { "branch": "main", "commit": "d9a7650e76c85f8ba437e056d08dd43b01b8bfd6" }
-}
--- a/hosts/alpheratz/dotfiles/nvim/lua/config/keymaps.lua
+++ b/hosts/alpheratz/dotfiles/nvim/lua/config/keymaps.lua
@@ -1,15 +0,0 @@
-vim.g.mapleader=','
-vim.g.maplocalleader=','
-
-vim.keymap.set('n', '<C-h>', '<C-w>h')
-vim.keymap.set('n', '<C-j>', '<C-w>j')
-vim.keymap.set('n', '<C-k>', '<C-w>k')
-vim.keymap.set('n', '<C-l>', '<C-w>l')
-
-vim.keymap.set('n', '<leader>ff', ':FzfLua files<CR>')
-vim.keymap.set('n', '<leader>fb', ':FzfLua buffers<CR>')
-vim.keymap.set('n', '<leader>rg', ':FzfLua grep<CR>')
-
-vim.keymap.set('i', '<S-Tab>', '<C-d>')
-
-vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
--- a/hosts/alpheratz/dotfiles/nvim/lua/config/plugins/init.lua
+++ b/hosts/alpheratz/dotfiles/nvim/lua/config/plugins/init.lua
@@ -1,50 +0,0 @@
-local plugins = {
-    'rebelot/kanagawa.nvim',
-
-    'nvim-lualine/lualine.nvim',
-    'kyazdani42/nvim-web-devicons',
-
-    'kylechui/nvim-surround',
-
-    {
-    'ibhagwan/fzf-lua',
-    config = function()
-        require('fzf-lua').setup({'skim'})
-    end
-    },
-
-    'neovim/nvim-lspconfig',
-    'hrsh7th/nvim-cmp',
-    'hrsh7th/cmp-nvim-lsp',
-    'hrsh7th/cmp-path',
-
-    'rust-lang/rust.vim',
-
-    {
-    'windwp/nvim-autopairs',
-    event = 'InsertEnter',
-    opts={},
-    },
-
-    {
-        'kaarmu/typst.vim',
-        ft = 'typst',
-        lazy = false,
-    },
-
-}
-
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
-  vim.fn.system({
-    "git",
-    "clone",
-    "--filter=blob:none",
-    "https://github.com/folke/lazy.nvim.git",
-    "--branch=stable", -- latest stable release
-    lazypath,
-  })
-end
-vim.opt.rtp:prepend(lazypath)
-
-require("lazy").setup(plugins, opts)
--- a/hosts/alpheratz/dotfiles/nvim/lua/config/plugins/lspconfig.lua
+++ b/hosts/alpheratz/dotfiles/nvim/lua/config/plugins/lspconfig.lua
@@ -1,59 +0,0 @@
-local capabilities = require('cmp_nvim_lsp').default_capabilities()
-capabilities.textDocument.completion.completionItem.snippetSupport = false;
-
-local lspconfig = require('lspconfig')
-
-lspconfig.rust_analyzer.setup {
-    capabilities = capabilities,
-    settings = {
-        ["rust-analyzer"] = {
-            cargo = {
-                allFeatures = true,
-            },
-            imports = {
-                group = {
-                    enable = false,
-                },
-            },
-            completion = {
-                postfix = {
-                    enable = false,
-                },
-            },
-        },
-    },
-}
-
-local servers = {'ccls', 'typst_lsp'}
-
-for _, lsp in ipairs(servers) do
-    lspconfig[lsp].setup {
-        capabilities = capabilities
-    }
-end
-
-local cmp = require 'cmp'
-
-cmp.setup {
-    preselect = cmp.PreselectMode.None,
-    mapping = cmp.mapping.preset.insert({
-        ['<Tab>'] = cmp.mapping(function(fallback)
-            if cmp.visible() then
-                cmp.select_next_item()
-            else
-                fallback()
-            end
-        end, { 'i', 's' }),
-        ['<S-Tab>'] = cmp.mapping(function(fallback)
-            if cmp.visible() then
-                cmp.select_prev_item()
-            else
-                fallback()
-            end
-        end, { 'i', 's' }),
-    }),
-    sources = {
-        { name = 'nvim_lsp' },
-        { name = 'path' },
-    },
-}
--- a/hosts/alpheratz/dotfiles/sway/config
+++ b/hosts/alpheratz/dotfiles/sway/config
@@ -120,7 +120,7 @@ bindsym $mod+Shift+9 move container to workspace number 9
 bindsym $mod+Shift+0 move container to workspace number 10

 for_window [app_id="simmer505.waywrite"] floating enable
-for_window [app_id="org.speedcrunch.speedcrunch"] floating enable
+for_window [app_id="org.speedcrunch."] floating enable

 # Horizontal and vertical splits
 bindsym $mod+b splith
--- a/hosts/alpheratz/hardware-configuration.nix
+++ b/hosts/alpheratz/hardware-configuration.nix
@@ -31,6 +31,13 @@
      options = [ "subvol=nix" ];
    };

+# Remove comments for optical drive in wine
+#  fileSystems."/mnt/drive0" = 
+#    { device = "/dev/sr0";
+#      fsType = "auto"; 
+#      options = [ "ro" "user" "noauto" "unhide" ];
+#    };
+
  swapDevices = [ ];

  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
--- a/hosts/alpheratz/home.nix
+++ b/hosts/alpheratz/home.nix
@@ -1,23 +1,27 @@
 {
    config,
    pkgs,
+    systemConfig,
    ...
 }:
 {

    imports = [
    ../../modules/home
+    ../../modules/options
    ];

+    simmer = systemConfig;
+
    home = {
        username = "eesim";
        homeDirectory = "/home/eesim";
    };

-    home.file.".config/sway/config".source = ./dotfiles/sway/config;
-    home.file.".config/nvim".source = ./dotfiles/nvim;
+    home.file.".config/nvim".source = ../shared/dotfiles/nvim;
+    home.file.".tmux.conf".source = ../shared/dotfiles/tmux;
+    home.file.".config/fish/config.fish".source = ../shared/dotfiles/fish/gui-config.fish;
    home.file.".config/waybar".source = ./dotfiles/waybar;
-    home.file.".config/fish/config.fish".source = ./dotfiles/fish/config.fish;

    programs.home-manager.enable = true;

--- a/hosts/alpheratz/incommon-rsa-ca2.pem
+++ b/hosts/alpheratz/incommon-rsa-ca2.pem
@@ -0,0 +1,36 @@
+-----BEGIN CERTIFICATE-----
+MIIGSjCCBDKgAwIBAgIRAINbdhUgbS1uCX4LbkCf78AwDQYJKoZIhvcNAQEMBQAw
+gYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5MRQwEgYDVQQHEwtK
+ZXJzZXkgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMS4wLAYD
+VQQDEyVVU0VSVHJ1c3QgUlNBIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTIy
+MTExNjAwMDAwMFoXDTMyMTExNTIzNTk1OVowRDELMAkGA1UEBhMCVVMxEjAQBgNV
+BAoTCUludGVybmV0MjEhMB8GA1UEAxMYSW5Db21tb24gUlNBIFNlcnZlciBDQSAy
+MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAifBcxDi60DRXr5dVoPQi
+Q/w+GBE62216UiEGMdbUt7eSiIaFj/iZ/xiFop0rWuH4BCFJ3kSvQF+aIhEsOnuX
+R6mViSpUx53HM5ApIzFIVbd4GqY6tgwaPzu/XRI/4Dmz+hoLW/i/zD19iXvS95qf
+NU8qP7/3/USf2/VNSUNmuMKlaRgwkouue0usidYK7V8W3ze+rTFvWR2JtWKNTInc
+NyWD3GhVy/7G09PwTAu7h0qqRyTkETLf+z7FWtc8c12f+SfvmKHKFVqKpNPtgMkr
+wqwaOgOOD4Q00AihVT+UzJ6MmhNPGg+/Xf0BavmXKCGDTv5uzQeOdD35o/Zw16V4
+C4J4toj1WLY7hkVhrzKG+UWJiSn8Hv3dUTj4dkneJBNQrUfcIfTHV3gCtKwXn1eX
+mrxhH+tWu9RVwsDegRG0s28OMdVeOwljZvYrUjRomutNO5GzynveVxJVCn3Cbn7a
+c4L+5vwPNgs04DdOAGzNYdG5t6ryyYPosSLH2B8qDNzxAgMBAAGjggFwMIIBbDAf
+BgNVHSMEGDAWgBRTeb9aqitKz1SA4dibwJ3ysgNmyzAdBgNVHQ4EFgQU70wAkqb7
+di5eleLJX4cbGdVN4tkwDgYDVR0PAQH/BAQDAgGGMBIGA1UdEwEB/wQIMAYBAf8C
+AQAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYL
+KwYBBAGyMQECAmcwCAYGZ4EMAQICMFAGA1UdHwRJMEcwRaBDoEGGP2h0dHA6Ly9j
+cmwudXNlcnRydXN0LmNvbS9VU0VSVHJ1c3RSU0FDZXJ0aWZpY2F0aW9uQXV0aG9y
+aXR5LmNybDBxBggrBgEFBQcBAQRlMGMwOgYIKwYBBQUHMAKGLmh0dHA6Ly9jcnQu
+dXNlcnRydXN0LmNvbS9VU0VSVHJ1c3RSU0FBQUFDQS5jcnQwJQYIKwYBBQUHMAGG
+GWh0dHA6Ly9vY3NwLnVzZXJ0cnVzdC5jb20wDQYJKoZIhvcNAQEMBQADggIBACaA
+DTTkHq4ivq8+puKE+ca3JbH32y+odcJqgqzDts5bgsapBswRYypjmXLel11Q2U6w
+rySldlIjBRDZ8Ah8NOs85A6MKJQLaU9qHzRyG6w2UQTzRwx2seY30Mks3ZdIe9rj
+s5rEYliIOh9Dwy8wUTJxXzmYf/A1Gkp4JJp0xIhCVR1gCSOX5JW6185kwid242bs
+Lm0vCQBAA/rQgxvLpItZhC9US/r33lgtX/cYFzB4jGOd+Xs2sEAUlGyu8grLohYh
+kgWN6hqyoFdOpmrl8yu7CSGV7gmVQf9viwVBDIKm+2zLDo/nhRkk8xA0Bb1BqPzy
+bPESSVh4y5rZ5bzB4Lo2YN061HV9+HDnnIDBffNIicACdv4JGyGfpbS6xsi3UCN1
+5ypaG43PJqQ0UnBQDuR60io1ApeSNkYhkaHQ9Tk/0C4A+EM3MW/KFuU53eHLVlX9
+ss1iG2AJfVktaZ2l/SbY7py8JUYMkL/jqZBRjNkD6srsmpJ6utUMmAlt7m1+cTX8
+6/VEBc5Dp9VfuD6hNbNKDSg7YxyEVaBqBEtN5dppj4xSiCrs6LxLHnNo3rG8VJRf
+NVQdgFbMb7dOIBokklzfmU69lS0kgyz2mZMJmW2G/hhEdddJWHh3FcLi2MaeYiOV
+RFrLHtJvXEdf2aEaZ0LOb2Xo3zO6BJvjXldv2woN
+-----END CERTIFICATE-----
--- a/hosts/alpheratz/system.nix
+++ b/hosts/alpheratz/system.nix
@@ -6,6 +6,7 @@
    lib,
    config,
    pkgs,
+    localPackages,
    ...
 }: {

@@ -22,13 +23,69 @@
        };
    };

+    sops = {
+        defaultSopsFile = ../../secrets/alpheratz/secrets.yaml;
+        age.keyFile = "/etc/sops.key";
+
+        secrets."wireguard/private" = {};
+        secrets."wireguard/preshared" = {};
+        secrets."borgbase/nix-alpheratz" = {
+          owner = "eesim";
+        };
+
+        secrets."Codelia-Regular.otf" = {
+          format = "binary";
+          sopsFile = ../../secrets/shared/Codelia-Regular;
+          owner = "eesim";
+          path = "/home/eesim/.local/share/fonts/Codelia Regular.otf";
+        };
+
+        secrets."Codelia-Bold.otf" = {
+          format = "binary";
+          sopsFile = ../../secrets/shared/Codelia-Bold;
+          owner = "eesim";
+          path = "/home/eesim/.local/share/fonts/Codelia Bold.otf";
+        };
+
+        secrets."Codelia-Italic.otf" = {
+          format = "binary";
+          sopsFile = ../../secrets/shared/Codelia-Italic;
+          owner = "eesim";
+          path = "/home/eesim/.local/share/fonts/Codelia Italic.otf";
+        };
+
+        secrets."Codelia-BoldItalic.otf" = {
+          format = "binary";
+          sopsFile = ../../secrets/shared/Codelia-BoldItalic;
+          owner = "eesim";
+          path = "/home/eesim/.local/share/fonts/Codelia BoldItalic.ttf";
+        };
+    };
+
+    environment.systemPackages = with pkgs; [
+        localPackages.x86_64-linux.jhelioviewer
+        bottles
+        matlab
+        discord
+        wine
+        matlab-language-server
+    ];
+
+    services.printing.enable = false;
+    services.avahi = {
+        enable = true;
+        nssmdns4 = true;
+        openFirewall = true;
+    };
+
    # Use the systemd-boot EFI boot loader.
    boot.loader.systemd-boot.enable = true;
    boot.loader.systemd-boot.xbootldrMountPoint = "/boot";
    boot.loader.efi.efiSysMountPoint = "/efi";
    boot.loader.efi.canTouchEfiVariables = true;

-    powerManagement.powertop.enable = true;
+    hardware.bluetooth.enable = true;
+    hardware.bluetooth.powerOnBoot = true;

    fileSystems = {
        "/".options = [ "compress=zstd" ];
@@ -38,18 +95,17 @@

    networking.wg-quick.interfaces = {
        wg0 = {
-            address = [ "10.6.0.5" ];
+            address = [ "10.137.175.3/32" ];
            listenPort = 51820;
-            privateKeyFile = "/root/wireguard-keys/wg0/private";
-            dns = [ "10.2.0.100" ];
+            privateKeyFile = "/run/secrets/wireguard/private";
+            dns = [ "10.137.175.1" ];
+            autostart = true;

            peers = [
                {
-                    publicKey = "pEWHugUnnhWXkJzCIhXryRRZMoCAuvAITDeP4ItenQk=";
-                    presharedKeyFile = "/root/wireguard-keys/wg0/preshared";
-                    allowedIPs = [ "10.2.0.0/24" "192.168.0.0/24" ];
-                    endpoint = "simmer505.com:51820";
-                    persistentKeepalive = 25;
+                    publicKey = "sWdXHlBqH+tAgSl0Tqr46sfKvgFN/vMDiuN08HjzaSg=";
+                    allowedIPs = [ "0.0.0.0/0" "::/0" ];
+                    endpoint = "mc.simmer505.com:51820";
                }
            ];
        };
@@ -64,8 +120,7 @@
    # Define a user account.
    users.users.eesim = {
        isNormalUser = true;
-        extraGroups = [ "wheel" "video" "audo" "networkmanager" ];
-        packages = with pkgs; [];
+        extraGroups = [ "wheel" "video" "audio" "networkmanager" "cdrom" ];
        shell = pkgs.fish;
    };

--- a/hosts/ankaa/dotfiles/fish/config.fish
+++ b/hosts/ankaa/dotfiles/fish/config.fish
@@ -13,30 +13,18 @@ if status is-interactive
    function fish_mode_prompt
    end

-    ### Local environment variables
-    set -x DENO_INSTALL "/home/eesim/.deno"
-
    direnv hook fish | source

 end

 if status is-login

-    # SSH settings
-    eval (ssh-agent -c)
-    ssh-add /home/eesim/.ssh/id_ed25519
-
-    # Set environment variables in /etc/profile.d/
-    # exec bash -c "test -e /etc/profile && source /etc/profile"
-
    # Disable GTK portal
    set -x GTK_USE_PORTAL "0"

-
    # Java fix
    set -x _JAVA_AWT_WM_NONREPARENTING "1"

-
 end

 if test (tty) = "/dev/tty1"
--- a/hosts/ankaa/dotfiles/lemurs/config.toml
+++ b/hosts/ankaa/dotfiles/lemurs/config.toml
@@ -0,0 +1,247 @@
+# Lemurs configuration file.
+# Contains all the customization options of lemurs.
+#
+# Note: that as of now you need to have all options in the selected
+# configuration file. Otherwise Lemurs will not work.
+#
+# Colors:
+# ---------
+# There is a list of predefined colors. These include:
+# - black
+# - white
+# - (dark) gray
+# - (light) red
+# - (light) blue
+# - (light) green
+# - (light) magenta
+# - (light) cyan
+# - (light) yellow
+# - orange
+#
+# You can also utilize custom colors with hex color codes.
+# "#87CEEB" will create a Sky Blue color.
+#
+# Note: If the color wasn't recognized, it will default to white.
+# ---------
+# 
+# Modifiers:
+# ---------
+# There is a number of modifiers you can use. These can be combined by
+# delimiting them with a comma (e.g. "bold,italic"). The modifiers are:
+# - bold
+# - dim
+# - italic
+# - underlined
+# - reverse
+# - crossed out
+# - hidden
+# ---------
+#
+
+# The tty which contains lemurs. This has to be mirrored in the lemurs.service
+tty = 2
+
+# The PAM service that should be used to login
+pam_service = "lemurs"
+
+# Focus behaviour of fields when Lemurs is initially started
+# 
+# Possible values:
+# - default: Initially focus on first non-cached value
+# - no-focus: No initial focus
+# - environment: Initially focus on the environment selector
+# - username: Initially focus on the username field
+# - password: Initially focus on the password field
+focus_behaviour = "default"
+
+[power_controls]
+# Allow for the shutdown option to be used
+allow_shutdown = true
+# The text in the top-left to display how to shutdown. The text '%key%' will be
+# replaced with the shutdown_key.
+shutdown_hint = "Shutdown %key%"
+
+# The color and modifiers of the hint in the top-left corner
+shutdown_hint_color = "dark gray"
+shutdown_hint_modifiers = ""
+
+# The key used to shutdown. Possibilities are F1 to F12.
+shutdown_key = "F1"
+# The command that is executed when the key is pressed
+shutdown_cmd = "systemctl poweroff -l"
+
+# Allow for the reboot option to be used
+allow_reboot = true
+
+# The text in the top-left to display how to reboot. The text '%key%' will be
+# replaced with the shutdown_key.
+reboot_hint = "Reboot %key%"
+
+# The color and modifiers of the hint in the top-left corner
+reboot_hint_color = "dark gray"
+reboot_hint_modifiers = ""
+
+# The key used to reboot. Possibilities are F1 to F12.
+reboot_key = "F2"
+# The command that is executed when the key is pressed
+reboot_cmd = "systemctl reboot -l"
+
+# The margin between the shutdown and reboot hints
+hint_margin = 2
+
+# Setting for the selector of the desktop environment you are using.
+[environment_switcher]
+# Terms:
+# ---------
+# Movers: indicators which show which direction one can move whilst selecting
+# the desktop environment
+# Selected: The currently selected desktop environment.
+# Neighbours: The adjacent desktop environment to the one current selected
+#
+# Visualisation:
+#
+#    <     i3       bspwm     awesome   >
+#
+#    ^      ^         ^          ^      ^
+#    |      |         |          |      |
+#  mover    |      selected      |    mover
+#           |                    |      
+#       neighbour            neighbour
+# ---------
+#
+
+# Show an option for the TTY shell when logging in as one of the environments. 
+# NOTE: it is always shown when no viable options are found. 
+include_tty_shell = false
+
+# Remember the selected environment after logging in for the next time
+remember = true
+
+# Enables showing the movers
+show_movers = true
+
+# Mover's color and modifiers whilst the selector is unfocused
+mover_color = "dark gray" 
+mover_modifiers = ""
+
+# Mover's color and modifiers whilst the selector is focused
+mover_color_focused = "orange"
+mover_modifiers_focused = "bold" 
+
+# The characters used to display the movers. Suggestions are:
+# -  "<"  ">"
+# - "<-"  "->"
+# - "<<"  ">>"
+# -  "["  "]"
+left_mover = "<"
+right_mover = ">"
+
+# The margin between the movers and the neighbours or selected (depending on
+# `show_neighbours`)
+mover_margin = 1
+
+# Enables showing the neighbours
+show_neighbours = true
+
+# Neighbours' color and modifiers whilst the selector is unfocused
+neighbour_color = "dark gray"
+neighbour_modifiers = ""
+
+# Neighbours' color and modifiers whilst the selector is focused
+neighbour_color_focused = "gray"
+neighbour_modifiers_focused = ""
+
+# Margin between neighbours and selected
+neighbour_margin = 1
+
+# Selected's color and modifiers whilst the selector is unfocused
+selected_color = "gray"
+selected_modifiers = "underlined"
+
+# Selected's color and modifiers whilst the selector is focused
+selected_color_focused = "white"
+selected_modifiers_focused = "bold"
+
+# The length of the name of the desktop environment which is displayed.
+max_display_length = 8
+
+# The text used when no desktop environments are available
+no_envs_text = "No environments..."
+
+# The color and modifiers of the 'no desktop environments available text'
+# whilst the selector is unfocused
+no_envs_color = "white"
+no_envs_modifiers = ""
+
+# The color and modifiers of the 'no desktop environments available text'
+# whilst the selector is focused
+no_envs_color_focused = "red"
+no_envs_modifiers_focused = ""
+
+[username_field]
+
+# Remember the username for the next time after a successful login attempt.
+remember = true
+
+[username_field.style]
+# Enables showing a title
+show_title = true
+# The text used within the title
+title = "Login"
+
+# The title's color and modifiers whilst the username field is unfocused
+title_color = "white"
+content_color = "white"
+
+# The title's color and modifiers whilst the username field is focused
+title_color_focused = "orange"
+content_color_focused = "orange"
+
+# Enables showing the borders
+show_border = true
+# The borders' color and modifiers whilst the username field is unfocused
+border_color = "white"
+# The borders' color and modifiers whilst the username field is focused
+border_color_focused = "orange"
+
+# Constrain the width of the username field
+use_max_width = true
+# The contraint of the username field's width
+max_width = 48
+
+[password_field]
+
+# The character used for replacement when typing a password. Leave empty for no
+# feedback.
+# Note: Only one character is accepted.
+content_replacement_character = "*"
+
+[password_field.style]
+# Enables showing a title
+show_title = true
+# The text used within the title
+title = "Password"
+
+# The title's color and modifiers whilst the password field is unfocused
+title_color = "white"
+content_color = "white"
+
+# The title's color and modifiers whilst the password field is focused
+title_color_focused = "orange"
+content_color_focused = "orange"
+
+# Enables showing the borders
+show_border = true
+# The borders' color and modifiers whilst the username field is unfocused
+border_color = "white"
+# The borders' color and modifiers whilst the username field is focused
+border_color_focused = "orange"
+
+# Constrain the width of the password field
+use_max_width = true
+# The contraint of the password field's width
+max_width = 48
+
+[wayland]
+
+scripts_path = "/etc/lemurs/wayland"
--- a/hosts/ankaa/dotfiles/nvim/lua/config/plugins/lualine.lua
+++ b/hosts/ankaa/dotfiles/nvim/lua/config/plugins/lualine.lua
@@ -1,36 +0,0 @@
-require('lualine').setup {
-  options = {
-    icons_enabled = true,
-    theme = 'wombat',
-    component_separators = { left = '', right = ''},
-    section_separators = { left = '', right = ''},
-    disabled_filetypes = {},
-    always_divide_middle = true,
-    globalstatus = true,
-  },
-  sections = {
-    lualine_a = {'mode'},
-    lualine_b = {'branch', 'diff', 'diagnostics'},
-    lualine_c = {'filename'},
-    lualine_x = {'encoding', 'fileformat', 'filetype'},
-    lualine_y = {'progress'},
-    lualine_z = {'location'}
-  },
-  inactive_sections = {
-    lualine_a = {},
-    lualine_b = {},
-    lualine_c = {'filename'},
-    lualine_x = {'location'},
-    lualine_y = {},
-    lualine_z = {}
-  },
-  tabline = {
-    lualine_a = {'buffers'},
-    lualine_b = {'branch'},
-    lualine_c = {'filename'},
-    lualine_x = {},
-    lualine_y = {},
-    lualine_z = {'tabs'}
-  },
-  extensions = {}
-}
--- a/hosts/ankaa/dotfiles/nvim/lua/config/settings.lua
+++ b/hosts/ankaa/dotfiles/nvim/lua/config/settings.lua
@@ -1,39 +0,0 @@
-vim.opt.cursorline=true
-vim.opt.relativenumber=true
-vim.opt.number=true
-
-vim.opt.scrolloff=10
-
-vim.opt.autoindent=true
-vim.opt.expandtab=true
-vim.opt.softtabstop=4
-vim.opt.shiftwidth=4
-vim.opt.shiftround=true
-
-vim.opt.backspace={'indent','eol','start'}
-vim.opt.hidden=true
-vim.opt.laststatus=2
-vim.opt.display='lastline'
-
-vim.opt.showmode=true
-vim.opt.showcmd=true
-
-vim.opt.incsearch=true
-vim.opt.ignorecase=true
-vim.opt.smartcase=true
-
-vim.opt.ttyfast=true
-vim.opt.updatetime=300
-
-vim.opt.splitright=true
-
-vim.opt.wrapscan=true
-vim.opt.report=0
-
-vim.opt.list=true
-vim.opt.completeopt=menuone,noselect
-
-vim.opt.undofile=true
-
-vim.g['loaded_perl_provider']=0
-vim.g['python3_host_prog']='/usr/bin/python3'
--- a/hosts/ankaa/dotfiles/nvim/lua/config/vimscript/init.vim
+++ b/hosts/ankaa/dotfiles/nvim/lua/config/vimscript/init.vim
@@ -1,9 +0,0 @@
-filetype plugin indent on
-syntax on
-colorscheme kanagawa
-
-if has('multi_byte') && &encoding ==# 'utf-8'
-    let &listchars = 'tab:▸ ,extends:❯,precedes:❮,nbsp:±'
-else
-    let &listchars = 'tab:> ,extends:>,precedes:<,nbsp:.'
-endif
--- a/hosts/ankaa/dotfiles/ssh/config
+++ b/hosts/ankaa/dotfiles/ssh/config
@@ -1,2 +0,0 @@
-Host git.simmer505.com
-Port 222
--- a/hosts/ankaa/hardware-configuration.nix
+++ b/hosts/ankaa/hardware-configuration.nix
@@ -11,7 +11,7 @@
  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
  boot.initrd.kernelModules = [ ];
  boot.kernelModules = [ "kvm-amd" "wl" ];
-  boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
+  boot.extraModulePackages = [];

  fileSystems."/" =
    { device = "/dev/disk/by-uuid/c9d87455-b02f-465d-8d63-1858dc2164fe";
--- a/hosts/ankaa/home.nix
+++ b/hosts/ankaa/home.nix
@@ -1,6 +1,7 @@
 {
    config,
    pkgs,
+    systemConfig,
    ...
 }:

@@ -8,18 +9,21 @@

    imports = [
        ../../modules/home
+        ../../modules/options
    ];

+    simmer = systemConfig;
+
    home = {
        username = "eesim";
        homeDirectory = "/home/eesim";
    };

-    home.file.".config/nvim".source = ./dotfiles/nvim;
+    home.file.".config/nvim".source = ../shared/dotfiles/nvim;
+    home.file.".config/fish/config.fish".source = ../shared/dotfiles/fish/gui-config.fish;
+
    home.file.".config/waybar".source = ./dotfiles/waybar;
-    home.file.".config/fish/config.fish".source = ./dotfiles/fish/config.fish;
    home.file.".config/alacritty/alacritty.toml".source = ./dotfiles/alacritty/alacritty.toml;
-    home.file.".ssh/config".source = ./dotfiles/ssh/config;

    # Fix for slow steam download speeds https://old.reddit.com/r/linux_gaming/comments/16e1l4h/slow_steam_downloads_try_this/
    home.file.".steam/steam/steam_dev.cfg".source = ./dotfiles/steam/steam_dev.cfg;
--- a/hosts/ankaa/system.nix
+++ b/hosts/ankaa/system.nix
@@ -10,19 +10,71 @@
    ...
 }: {

-    nixpkgs = {
-        overlays = [];
-        config = {
-            allowUnfree = true;
-        };
-    };
-
    nix = {
        settings = {
            experimental-features = "nix-command flakes";
        };
    };

+    sops = {
+      defaultSopsFile = ../../secrets/ankaa/secrets.yaml;
+      age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
+
+      secrets."Codelia-Regular.otf" = {
+        format = "binary";
+        sopsFile = ../../secrets/shared/Codelia-Regular;
+        owner = "eesim";
+        path = "/home/eesim/.local/share/fonts/Codelia Regular.otf";
+      };
+
+      secrets."Codelia-Bold.otf" = {
+        format = "binary";
+        sopsFile = ../../secrets/shared/Codelia-Bold;
+        owner = "eesim";
+        path = "/home/eesim/.local/share/fonts/Codelia Bold.otf";
+      };
+
+      secrets."Codelia-Italic.otf" = {
+        format = "binary";
+        sopsFile = ../../secrets/shared/Codelia-Italic;
+        owner = "eesim";
+        path = "/home/eesim/.local/share/fonts/Codelia Italic.otf";
+      };
+
+      secrets."Codelia-BoldItalic.otf" = {
+        format = "binary";
+        sopsFile = ../../secrets/shared/Codelia-BoldItalic;
+        owner = "eesim";
+        path = "/home/eesim/.local/share/fonts/Codelia BoldItalic.ttf";
+      };
+    };
+
+    environment.systemPackages = with pkgs; [
+        localPackages.x86_64-linux.jhelioviewer
+        pciutils
+        bottles
+        inkscape
+        orca-slicer
+        qemu
+        protonvpn-gui
+        anki
+    ];
+
+    services.hardware.openrgb.enable = true;
+    services.avahi.enable = true;
+
+    services.udev.extraRules = ''
+      KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl"
+    '';
+
+    hardware.graphics.extraPackages = with pkgs; [
+        rocmPackages.clr.icd
+    ];
+
+    systemd.tmpfiles.rules = [
+        "L+    /opt/rocm/hip    -    -    -    -    ${pkgs.rocmPackages.clr}"
+    ];
+
    # Use the systemd-boot EFI boot loader.
    boot.loader.systemd-boot.enable = true;
    boot.loader.efi.canTouchEfiVariables = true;
@@ -33,18 +85,21 @@
        "/nix".options = [ "compress=zstd" "noatime" ];
    };

+    virtualisation.docker = {
+        enable = true;
+        storageDriver = "btrfs";
+    };
+
    # Set your time zone.
    time.timeZone = "America/Chicago";

    # Select internationalisation properties.
    i18n.defaultLocale = "en_US.UTF-8";

-    programs.ssh.startAgent = true;
-
    # Define a user account.
    users.users.eesim = {
        isNormalUser = true;
-        extraGroups = [ "wheel" "video" "audo" "networkmanager" ];
+        extraGroups = [ "wheel" "video" "audio" "networkmanager" "dialout" ];
        packages = with pkgs; [];
        shell = pkgs.fish;
        openssh.authorizedKeys.keys = [
--- a/hosts/default/home.nix
+++ b/hosts/default/home.nix
@@ -0,0 +1,28 @@
+{
+    config,
+    pkgs,
+    systemConfig,
+    ...
+}:
+{
+
+    imports = [
+    ../../modules/home
+    ../../modules/options
+    ];
+
+    simmer = systemConfig;
+
+    home = {
+        username = "eesim";
+        homeDirectory = "/home/eesim";
+    };
+
+    home.file.".config/nvim".source = ../shared/dotfiles/nvim;
+    home.file.".tmux.conf".source = ../shared/dotfiles/tmux;
+    home.file.".config/fish/config.fish".source = ../shared/dotfiles/fish/cli-config.fish;
+
+    programs.home-manager.enable = true;
+
+    home.stateVersion = "23.11";
+}
--- a/hosts/default/system.nix
+++ b/hosts/default/system.nix
@@ -0,0 +1,39 @@
+# Edit this configuration file to define what should be installed on
+# your system. Help is available in the configuration.nix(5) man page, on
+# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
+
+{ 
+    lib,
+    config,
+    pkgs,
+    ...
+}: {
+    nix = {
+        settings = {
+            experimental-features = "nix-command flakes";
+        };
+    };
+
+    # Use the systemd-boot EFI boot loader.
+    boot.loader.systemd-boot.enable = true;
+    boot.loader.efi.canTouchEfiVariables = true;
+
+    # Set your time zone.
+    time.timeZone = "America/Chicago";
+
+    # Select internationalisation properties.
+    i18n.defaultLocale = "en_US.UTF-8";
+
+    # Define a user account.
+    users.users.eesim = {
+        isNormalUser = true;
+        extraGroups = [ "wheel" ];
+    };
+
+    # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
+    # and migrated your data accordingly.
+    # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
+    system.stateVersion = "23.11"; # Did you read the comment?
+
+}
+
--- a/hosts/diphda/hardware-configuration.nix
+++ b/hosts/diphda/hardware-configuration.nix
@@ -0,0 +1,55 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/profiles/qemu-guest.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/a60ac6e2-b56e-49f8-bfcc-64b099dc6569";
+      fsType = "btrfs";
+      options = [ "subvol=root" ];
+    };
+
+  fileSystems."/home" =
+    { device = "/dev/disk/by-uuid/a60ac6e2-b56e-49f8-bfcc-64b099dc6569";
+      fsType = "btrfs";
+      options = [ "subvol=home" ];
+    };
+
+  fileSystems."/nix" =
+    { device = "/dev/disk/by-uuid/a60ac6e2-b56e-49f8-bfcc-64b099dc6569";
+      fsType = "btrfs";
+      options = [ "subvol=nix" ];
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/2E79-9765";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  fileSystems."/media" = 
+  { device = "10.137.177.10:/volume1/Media";
+    fsType = "nfs";
+  };
+
+  swapDevices = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp6s18.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+}
--- a/hosts/diphda/mc-dh-backup.yaml
+++ b/hosts/diphda/mc-dh-backup.yaml
@@ -0,0 +1,19 @@
+source_directories:
+    - /home/eesim/configs/mc-distant-horizons/
+
+repositories:
+    - path: ssh://lxojwl95@lxojwl95.repo.borgbase.com/./repo
+      label: "Minecraft-DH borgbase"
+
+exclude_if_present:
+    - .nobackup
+
+compression: auto,zstd
+archive_name_format: '{hostname}-{now:%Y-%m-%d-%H%M%S}'
+encryption_passcommand: 'cat /run/secrets/mc-dh/repo_password'
+
+keep_hourly: 24
+keep_daily: 7
+keep_weekly: 4
+keep_monthly: 2
+keep_yearly: 1
--- a/hosts/diphda/system.nix
+++ b/hosts/diphda/system.nix
@@ -0,0 +1,117 @@
+# Edit this configuration file to define what should be installed on
+# your system. Help is available in the configuration.nix(5) man page, on
+# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
+
+{ 
+    lib,
+    config,
+    pkgs,
+    localPackages,
+    ...
+}: {
+
+    nix = {
+        settings = {
+            experimental-features = "nix-command flakes";
+        };
+    };
+
+    sops = {
+        defaultSopsFile = ../../secrets/diphda/secrets.yaml;
+        age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
+
+        secrets."backup/repo_password" = {
+          owner = "eesim";
+        };
+
+        secrets."mc-arcadia/repo_password" = {};
+        secrets."mc-dh/repo_password" = {};
+
+        secrets."tandoor/secret_key" = {
+            owner = "tandoor";
+        };
+        secrets."tandoor/db_password" = {
+            owner = "tandoor";
+        };
+        secrets."porkbun.keytab" = {
+            format = "binary";
+            sopsFile = ../../secrets/diphda/porkbun.keytab;
+        };
+        secrets."caddy/porkbun_api_key" = {};
+        secrets."caddy/porkbun_secret_key" = {};
+    };
+
+    systemd.services."qbit-update-port" = {
+        enable = true;
+        path = [ pkgs.bash pkgs.docker pkgs.curl pkgs.netcat ];
+        serviceConfig = {
+            Type = "oneshot";
+            User = "root";
+            Group = "root";
+            ExecStart = ''
+                /home/eesim/configs/qbittorrent/update-port.sh
+            '';
+        };
+    };
+
+    systemd.timers."qbit-update-port" = {
+        wantedBy = [ "timers.target" ];
+        timerConfig = {
+            OnCalendar = "*:0/5";
+            Persistent = true;
+        };
+    };
+
+    # Use the systemd-boot EFI boot loader.
+    boot.loader.systemd-boot.enable = true;
+    boot.loader.efi.canTouchEfiVariables = true;
+
+    fileSystems = {
+        "/".options = [ "compress=zstd" ];
+        "/home".options = [ "compress=zstd" ];
+        "/nix".options = [ "compress=zstd" "noatime" ];
+    };
+
+    virtualisation.docker = {
+        enable = true;
+        storageDriver = "btrfs";
+    };
+
+    environment.systemPackages = with pkgs; [
+        docker-compose
+        beets-unstable
+    ];
+
+    # Set your time zone.
+    time.timeZone = "America/Chicago";
+
+    # Select internationalisation properties.
+    i18n.defaultLocale = "en_US.UTF-8";
+
+    # Define a user account.
+    users.users.eesim = {
+        isNormalUser = true;
+        extraGroups = [ "wheel" "networkmanager" ];
+        shell = pkgs.fish;
+        openssh.authorizedKeys.keys = [
+            "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEO9a9lCSa84Acv0SqOI608IJGa61dT5Frbw2Y/ABCB9 eesim@ankaa"
+            "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDvWgI2hkcjZvI9LcBEbH+1OuC3ULImTmd1qzOgcIuE7 eesim@alpheratz"
+        ];
+    };
+
+    users.users.tandoor = {
+        uid = 701;
+        group = "services";
+        extraGroups = [ "keys" ];
+    };
+
+    users.groups = {
+        services = {
+            gid = 1001;
+        };
+    };
+
+    system.stateVersion = "23.11";
+
+}
+
--- a/hosts/shared/dotfiles/fish/cli-config.fish
+++ b/hosts/shared/dotfiles/fish/cli-config.fish
@@ -0,0 +1,32 @@
+if status is-interactive
+    fish_add_path "/home/eesim/.cargo/bin/"
+
+    abbr ll 'eza'
+
+    set fish_greeting
+
+    set -g fish_key_bindings fish_vi_key_bindings
+
+    set fish_cursor_default block
+    set fish_cursor_insert line
+    set fish_cursor_replace_one	underscore
+    set fish_cursor_replace underscore
+    set fish_cursor_external line
+    set fish_cursor_visual block
+
+    function fish_mode_prompt
+    end
+
+    direnv hook fish | source
+
+end
+
+if status is-login
+
+    # Disable GTK portal
+    set -x GTK_USE_PORTAL "0"
+
+    # Java fix
+    set -x _JAVA_AWT_WM_NONREPARENTING "1"
+
+end
--- a/hosts/shared/dotfiles/fish/gui-config.fish
+++ b/hosts/shared/dotfiles/fish/gui-config.fish
@@ -0,0 +1,37 @@
+if status is-interactive
+    fish_add_path "/home/eesim/.cargo/bin/"
+
+    abbr ll 'eza'
+
+    set fish_greeting
+
+    set -g fish_key_bindings fish_vi_key_bindings
+
+    set fish_cursor_default block
+    set fish_cursor_insert line
+    set fish_cursor_replace_one	underscore
+    set fish_cursor_replace underscore
+    set fish_cursor_external line
+    set fish_cursor_visual block
+
+    function fish_mode_prompt
+    end
+
+    direnv hook fish | source
+
+end
+
+if status is-login
+
+    # Disable GTK portal
+    set -x GTK_USE_PORTAL "0"
+
+    # Java fix
+    set -x _JAVA_AWT_WM_NONREPARENTING "1"
+
+end
+
+if test (tty) = "/dev/tty1"
+    sway
+end
+
--- a/hosts/shared/dotfiles/nvim/init.lua
+++ b/hosts/shared/dotfiles/nvim/init.lua
@@ -3,6 +3,7 @@ require('config/settings')
 require('config/plugins')
 require('config/plugins/lualine')
 require('config/plugins/lspconfig')
+require('config/plugins/iron')

 local vimscriptpath = vim.fn.stdpath("config") .. "/lua/config/vimscript/"

--- a/hosts/shared/dotfiles/nvim/lua/config/keymaps.lua
+++ b/hosts/shared/dotfiles/nvim/lua/config/keymaps.lua
@@ -10,6 +10,9 @@ vim.keymap.set('n', '<leader>ff', ':FzfLua files<CR>')
 vim.keymap.set('n', '<leader>fb', ':FzfLua buffers<CR>')
 vim.keymap.set('n', '<leader>rg', ':FzfLua grep_project<CR>')

+vim.keymap.set('n', 'ga', '<Plug>(EasyAlign)')
+vim.keymap.set('x', 'ga', '<Plug>(EasyAlign)')
+


 vim.keymap.set('i', '<S-Tab>', '<C-d>')
--- a/hosts/shared/dotfiles/nvim/lua/config/plugins/init.lua
+++ b/hosts/shared/dotfiles/nvim/lua/config/plugins/init.lua
@@ -6,12 +6,7 @@ local plugins = {

    'kylechui/nvim-surround',

-    {
    'ibhagwan/fzf-lua',
-    config = function()
-        require('fzf-lua').setup({'skim'})
-    end
-    },

    'neovim/nvim-lspconfig',
    'hrsh7th/nvim-cmp',
@@ -20,15 +15,15 @@ local plugins = {
    'L3MON4D3/LuaSnip',

    {
-    'windwp/nvim-autopairs',
-    event = 'InsertEnter',
-    opts = {},
+        'windwp/nvim-autopairs',
+        event = 'InsertEnter',
+        opts = {},
    },

    {
-    'kaarmu/typst.vim',
-    ft = 'typst',
-    lazy = false,
+        'kaarmu/typst.vim',
+        ft = 'typst',
+        lazy = false,
    },

    'jalvesaq/Nvim-R',
@@ -40,6 +35,10 @@ local plugins = {
        end
    },

+    'Vigemus/iron.nvim',
+
+    'junegunn/vim-easy-align',
+
 }

 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
--- a/hosts/shared/dotfiles/nvim/lua/config/plugins/iron.lua
+++ b/hosts/shared/dotfiles/nvim/lua/config/plugins/iron.lua
@@ -0,0 +1,61 @@
+local iron = require("iron.core")
+
+iron.setup {
+  config = {
+    -- Whether a repl should be discarded or not
+    scratch_repl = true,
+    -- Your repl definitions come here
+    repl_definition = {
+      sh = {
+        -- Can be a table or a function that
+        -- returns a table (see below)
+        command = {"fish"}
+      },
+      python = {
+        command = { "python3" },  -- or { "ipython", "--no-autoindent" }
+        format = require("iron.fts.common").bracketed_paste_python
+      },
+      matlab = {
+        command = { 
+            "matlab",
+            "-nosplash",
+            "-nodesktop"
+        },
+        
+      }
+    },
+    -- How the repl window will be displayed
+    -- See below for more information
+    repl_open_cmd = require('iron.view').split.vertical.rightbelow("%40"),
+  },
+  -- Iron doesn't set keymaps by default anymore.
+  -- You can set them here or manually add keymaps to the functions in iron.core
+  keymaps = {
+    send_motion = "<space>sc",
+    visual_send = "<space>sc",
+    send_file = "<space>sf",
+    send_line = "<space>sl",
+    send_paragraph = "<space>sp",
+    send_until_cursor = "<space>su",
+    send_mark = "<space>sm",
+    mark_motion = "<space>mc",
+    mark_visual = "<space>mc",
+    remove_mark = "<space>md",
+    cr = "<space>s<cr>",
+    interrupt = "<space>s<space>",
+    exit = "<space>sq",
+    clear = "<space>cl",
+  },
+  -- If the highlight is on, you can change how it looks
+  -- For the available options, check nvim_set_hl
+  highlight = {
+    italic = true
+  },
+  ignore_blank_lines = true, -- ignore blank lines when sending visual select lines
+}
+
+-- iron also has a list of commands, see :h iron-commands for all available commands
+vim.keymap.set('n', '<space>rs', '<cmd>IronRepl<cr>')
+vim.keymap.set('n', '<space>rr', '<cmd>IronRestart<cr>')
+vim.keymap.set('n', '<space>rf', '<cmd>IronFocus<cr>')
+vim.keymap.set('n', '<space>rh', '<cmd>IronHide<cr>')
--- a/hosts/shared/dotfiles/nvim/lua/config/plugins/lspconfig.lua
+++ b/hosts/shared/dotfiles/nvim/lua/config/plugins/lspconfig.lua
@@ -24,11 +24,21 @@ lspconfig.rust_analyzer.setup {
    },
 }

+lspconfig.matlab_ls.setup {
+    capabilities = capabilities,
+    settings = {
+        MATLAB = {
+            indexWorkspace = false,
+            installPath = "",
+        },
+    },
+}
+
 lspconfig.omnisharp.setup {
    cmd = { "dotnet", "/usr/lib/omnisharp-roslyn/OmniSharp.dll"}
 }

-local default_servers = {'pylsp', 'ccls', 'typst_lsp', 'r_language_server', 'lua_ls', 'nil_ls'}
+local default_servers = {'pylsp', 'ccls', 'r_language_server', 'lua_ls', 'nil_ls', 'tinymist'}

 for _, lsp in ipairs(default_servers) do
    lspconfig[lsp].setup {
--- a/hosts/alpheratz/dotfiles/nvim/lua/config/plugins/lualine.lua
+++ b/hosts/alpheratz/dotfiles/nvim/lua/config/plugins/lualine.lua
--- a/hosts/alpheratz/dotfiles/nvim/lua/config/settings.lua
+++ b/hosts/alpheratz/dotfiles/nvim/lua/config/settings.lua
@@ -10,6 +10,16 @@ vim.opt.softtabstop=4
 vim.opt.shiftwidth=4
 vim.opt.shiftround=true

+vim.api.nvim_create_autocmd(
+    { "FileType" },
+    { pattern = "nix",
+      callback = function() 
+          vim.opt.softtabstop=2
+	  vim.opt.shiftwidth=2
+      end
+    }
+)
+
 vim.opt.backspace={'indent','eol','start'}
 vim.opt.hidden=true
 vim.opt.laststatus=2
@@ -35,6 +45,4 @@ vim.opt.completeopt=menuone,noselect

 vim.opt.undofile=true

-
 vim.g['loaded_perl_provider']=0
-vim.g['python3_host_prog']='/usr/bin/python'
--- a/hosts/alpheratz/dotfiles/nvim/lua/config/vimscript/init.vim
+++ b/hosts/alpheratz/dotfiles/nvim/lua/config/vimscript/init.vim
--- a/hosts/shared/dotfiles/nvim/lua/config/~/.vimdid/%home%eesim%.config%nvim%lua%config%keymaps.lua
+++ b/hosts/shared/dotfiles/nvim/lua/config/~/.vimdid/%home%eesim%.config%nvim%lua%config%keymaps.lua
--- a/hosts/shared/dotfiles/nvim/lua/config/~/.vimdid/%home%eesim%.config%nvim%lua%config%plugins%lspconfig.lua
+++ b/hosts/shared/dotfiles/nvim/lua/config/~/.vimdid/%home%eesim%.config%nvim%lua%config%plugins%lspconfig.lua
--- a/hosts/shared/dotfiles/tmux/.tmux.conf
+++ b/hosts/shared/dotfiles/tmux/.tmux.conf
@@ -0,0 +1,20 @@
+unbind C-b
+set-option -g prefix C-a
+bind-key C-a send-prefix
+
+unbind-key '"'
+unbind-key %
+bind-key | split-window -h -c "#{pane_current_path}"
+bind-key - split-window -v -c "#{pane_current_path}"
+
+bind-key h select-pane -L
+bind-key j select-pane -D
+bind-key k select-pane -U
+bind-key l select-pane -R
+bind-key -r H resize-pane -L 5
+bind-key -r J resize-pane -D 5
+bind-key -r K resize-pane -U 5
+bind-key -r L resize-pane -R 5
+
+
+
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -12,5 +12,6 @@
        ./qt.nix
        ./sway.nix
        ./gtk.nix
+        ./term.nix
    ];
 }
--- a/modules/home/git.nix
+++ b/modules/home/git.nix
@@ -14,13 +14,32 @@ in
            type = types.bool;
            default = true;
        };
+
+        jujutsu = {
+            enable = mkOption {
+                description = "Whether to install and configure jujutsu";
+                type = types.bool;
+                default = true;
+            };
+        };
    };

-    config = mkIf cfg.enable {
-        programs.git = {
+
+    config = {
+        programs.git = mkIf cfg.enable {
            enable = true;
            userName = "Ethan Simmons";
-            userEmail = "eesimmons9105@gmail.com";
+            userEmail = "contact@esimmons.me";
+        };
+        programs.jujutsu = mkIf cfg.jujutsu.enable {
+            enable = true;
+            settings = {
+                user = {
+                    name = "Ethan Simmons";
+                    email = "contact@esimmons.me";
+                };
+                ui.paginate = "never";
+            };
        };
    };
 }
--- a/modules/home/gtk.nix
+++ b/modules/home/gtk.nix
@@ -6,7 +6,7 @@
 }:

 with lib; let
-    gui = systemConfig.gui;
+    gui = config.simmer.gui;
 in
 {
    config = {
@@ -18,7 +18,7 @@ in
            };
            iconTheme = {
                name = "awaidta-dark";
-                package = pkgs.gnome.adwaita-icon-theme;
+                package = pkgs.adwaita-icon-theme;
            };
            theme = {
                name = "adw-gtk3-dark";
--- a/modules/home/sway.nix
+++ b/modules/home/sway.nix
@@ -1,5 +1,6 @@
 { lib
 , pkgs
+, localPackages
 , config
 , systemConfig
 , utils
@@ -7,88 +8,131 @@
 }:

 with lib; let
-    gui = systemConfig.gui;
+    gui = config.simmer.gui;
+    term = config.simmer.term;
+    laptop = config.simmer.laptop;
    modifier = "Mod4";
 in
 {
    config = mkIf gui.sway.enable {
+        services.swayidle = {
+            enable = true;
+            timeouts = [
+                (mkIf gui.sway.desktop { 
+                    timeout = 600;
+                    command = "${pkgs.sway}/bin/swaymsg 'output * dpms off'";
+                    resumeCommand = "${pkgs.sway}/bin/swaymsg 'output * dpms on'";
+                })
+                (mkIf (!gui.sway.desktop) {
+                    timeout = 300;
+                    command = "${pkgs.swaylock}/bin/swaylock -f -c 000000";
+                })
+                (mkIf (!gui.sway.desktop) {
+                    timeout = 420;
+                    command = "${pkgs.sway}/bin/swaymsg 'output * dpms off'";
+                    resumeCommand = "${pkgs.sway}/bin/swaymsg 'output * dpms on'";
+                })
+                (mkIf (!gui.sway.desktop) {
+                    timeout = 600;
+                    command = "systemctl suspend";
+                })
+            ];
+            events = [
+                (mkIf (!gui.sway.desktop) {
+                    event = "before-sleep";
+                    command = "${pkgs.swaylock}/bin/swaylock -f -c 000000";
+                })
+            ];
+                
+        };
        wayland.windowManager.sway = {
            enable = true;
            checkConfig = false;
            
            config = {
                modifier = modifier;
-                keybindings = {
-                    "XF86AudioRaiseVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5%";
-                    "XF86AudioLowerVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5%";
-                    "XF86AudioMute" = "exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle";
-                    "XF86AudioMicMute" = "exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle";
-                    "XF86AudioPause" = "exec playerctl play-pause";
-                    "XF86AudioNext" = "exec playerctl next";
-                    "XF86AudioPrev" = "exec playerctl previous";
-                    "${modifier}+Return" = "exec alacritty ";
-                    "${modifier}+Control+f" = "exec MOZ_ENABLE_WAYLAND=1 firefox";
-                    "${modifier}+Control+s" = "exec steam";
-                    "${modifier}+Control+t" = "exec thunar";
-                    "${modifier}+Control+d" = "exec vesktop --enable-features=WebRTCPipeWireCapturer";
-                    "${modifier}+Control+x" = "exec feishin";
-                    "${modifier}+Control+h" = "exec helvum";
-                    "${modifier}+Control+p" = "exec pavucontrol";
-                    "${modifier}+Shift+s" = "exec grip -g $(slurp)";
-                    "${modifier}+Shift+q" = "kill";
-                    "${modifier}+h" = "focus left";
-                    "${modifier}+j" = "focus down";
-                    "${modifier}+k" = "focus up";
-                    "${modifier}+l" = "focus right";
-                    "${modifier}+Left" = "focus left";
-                    "${modifier}+Down" = "focus down";
-                    "${modifier}+Up" = "focus up";
-                    "${modifier}+Right" = "focus right";
-                    "${modifier}+Shift+h" = "move left";
-                    "${modifier}+Shift+j" = "move down";
-                    "${modifier}+Shift+k" = "move up";
-                    "${modifier}+Shift+l" = "move right";
-                    "${modifier}+Shift+Left" = "move left";
-                    "${modifier}+Shift+Down" = "move down";
-                    "${modifier}+Shift+Up" = "move up";
-                    "${modifier}+Shift+Right" = "move right";
-                    "${modifier}+b" = "split h";
-                    "${modifier}+v" = "split v";
-                    "${modifier}+f" = "fullscreen toggle";
-                    "${modifier}+s" = "layout stacking";
-                    "${modifier}+w" = "layout tabbed";
-                    "${modifier}+e" = "layout toggle split";
-                    "${modifier}+Shift+space" = "floating toggle";
-                    "${modifier}+a" = "focus parent";
-                    "${modifier}+1" = "workspace 1 ";
-                    "${modifier}+2" = "workspace 2";
-                    "${modifier}+3" = "workspace 3";
-                    "${modifier}+4" = "workspace 4";
-                    "${modifier}+5" = "workspace 5";
-                    "${modifier}+6" = "workspace 6";
-                    "${modifier}+7" = "workspace 7";
-                    "${modifier}+8" = "workspace 8";
-                    "${modifier}+9" = "workspace 9";
-                    "${modifier}+0" = "workspace 10";
-                    "${modifier}+Shift+1" = "move container to workspace 1";
-                    "${modifier}+Shift+2" = "move container to workspace 2";
-                    "${modifier}+Shift+3" = "move container to workspace 3";
-                    "${modifier}+Shift+4" = "move container to workspace 4";
-                    "${modifier}+Shift+5" = "move container to workspace 5";
-                    "${modifier}+Shift+6" = "move container to workspace 6";
-                    "${modifier}+Shift+7" = "move container to workspace 7";
-                    "${modifier}+Shift+8" = "move container to workspace 8";
-                    "${modifier}+Shift+9" = "move container to workspace 9";
-                    "${modifier}+Shift+0" = "move container to workspace 10";
-                    "${modifier}+Shift+e" = "exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'";
-                    "${modifier}+Shift+c" = "reload";
-                    "${modifier}+r" = "mode 'resize'";
-                };
+                keybindings = mkMerge [
+                    {
+                        "XF86AudioRaiseVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5%";
+                        "XF86AudioLowerVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5%";
+                        "XF86AudioMute" = "exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle";
+                        "XF86AudioMicMute" = "exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle";
+                        "${modifier}+space" = "exec \"kickoff-dot-desktop | ${pkgs.kickoff}/bin/kickoff --from-stdin --stdout | xargs -d '\\n' ${pkgs.sway}/bin/swaymsg exec\"";
+                        "${modifier}+Return" = "exec ${term.terminal}";
+                        "${modifier}+Control+f" = "exec MOZ_ENABLE_WAYLAND=1 firefox";
+                        "${modifier}+Control+t" = "exec thunar";
+                        "${modifier}+Control+h" = "exec helvum";
+                        "${modifier}+Control+p" = "exec pavucontrol";
+                        "${modifier}+h" = "focus left";
+                        "${modifier}+j" = "focus down";
+                        "${modifier}+k" = "focus up";
+                        "${modifier}+l" = "focus right";
+                        "${modifier}+Left" = "focus left";
+                        "${modifier}+Down" = "focus down";
+                        "${modifier}+Up" = "focus up";
+                        "${modifier}+Right" = "focus right";
+                        "${modifier}+Shift+h" = "move left 30px";
+                        "${modifier}+Shift+j" = "move down 30px";
+                        "${modifier}+Shift+k" = "move up 30px";
+                        "${modifier}+Shift+l" = "move right 30px";
+                        "${modifier}+Shift+Left" = "move left";
+                        "${modifier}+Shift+Down" = "move down";
+                        "${modifier}+Shift+Up" = "move up";
+                        "${modifier}+Shift+Right" = "move right";
+                        "${modifier}+b" = "split h";
+                        "${modifier}+v" = "split v";
+                        "${modifier}+r" = "mode 'resize'";
+                        "${modifier}+f" = "fullscreen toggle";
+                        "${modifier}+Shift+space" = "floating toggle";
+                        "${modifier}+s" = "layout stacking";
+                        "${modifier}+w" = "layout tabbed";
+                        "${modifier}+e" = "layout toggle split";
+                        "${modifier}+a" = "focus parent";
+                        "${modifier}+1" = "workspace 1 ";
+                        "${modifier}+2" = "workspace 2";
+                        "${modifier}+3" = "workspace 3";
+                        "${modifier}+4" = "workspace 4";
+                        "${modifier}+5" = "workspace 5";
+                        "${modifier}+6" = "workspace 6";
+                        "${modifier}+7" = "workspace 7";
+                        "${modifier}+8" = "workspace 8";
+                        "${modifier}+9" = "workspace 9";
+                        "${modifier}+0" = "workspace 10";
+                        "${modifier}+Shift+1" = "move container to workspace 1";
+                        "${modifier}+Shift+2" = "move container to workspace 2";
+                        "${modifier}+Shift+3" = "move container to workspace 3";
+                        "${modifier}+Shift+4" = "move container to workspace 4";
+                        "${modifier}+Shift+5" = "move container to workspace 5";
+                        "${modifier}+Shift+6" = "move container to workspace 6";
+                        "${modifier}+Shift+7" = "move container to workspace 7";
+                        "${modifier}+Shift+8" = "move container to workspace 8";
+                        "${modifier}+Shift+9" = "move container to workspace 9";
+                        "${modifier}+Shift+0" = "move container to workspace 10";
+                        "${modifier}+Shift+e" = "exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'";
+                        "${modifier}+Shift+c" = "reload";
+                        "${modifier}+Shift+s" = "exec 'TMPFILE=\"$(mktemp)\"; ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" \"$TMPFILE\"; mv \"$TMPFILE\" \"/home/eesim/Pictures/$(${pkgs.zenity}/bin/zenity --entry).png\"'";
+                        "${modifier}+Shift+o" = "exec '${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | ${localPackages.x86_64-linux.gazou}/bin/gazou | tail -n +2 | ${pkgs.wl-clipboard}/bin/wl-copy'";
+                        "${modifier}+Shift+q" = "kill";
+                        "${modifier}+p" = "focus mode_toggle";
+                        "${modifier}+Control+b" = "exec bluetoothctl connect 18:3F:70:62:A5:3C";
+                        "XF86AudioPause" = "exec playerctl play-pause";
+                        "XF86AudioNext" = "exec playerctl next";
+                        "XF86AudioPrev" = "exec playerctl previous";
+                    }
+                    (mkIf gui.sway.desktop {
+                        "${modifier}+Control+s" = "exec steam";
+                        "${modifier}+Control+d" = "exec vesktop --enable-features=WebRTCPipeWireCapturer";
+                        "${modifier}+Control+x" = "exec feishin";
+                    })
+                    (mkIf laptop.backlight.enable {
+                        "XF86MonBrightnessUp" = "exec ${pkgs.light}/bin/light -A 5";
+                        "XF86MonBrightnessDown" = "exec ${pkgs.light}/bin/light -U 5";
+                    }) 
+                ];

                startup = [
-                    { command = "--no-startup-id swayidle -w timeout 600 'swaymsg \"output * dpms off\"' resume 'swaymsg \"output * dpms on\"'"; }
-                ] 
-                ++ optionals gui.sway.desktop [
+                  { command = "fcitx5 -d"; }
+                ] ++ optionals gui.sway.desktop [
                    { command = "vorta"; }
                    { command = "MOZ_ENABLE_WAYLAND=1 firefox"; }
                    { command = "sleep 20 && vesktop --enable-features=WebRTCPipeWireCapturer"; }
@@ -154,7 +198,7 @@ in

                input."type:keyboard" = {
                    xkb_layout = "us,de";
-                    xkb_options = "caps:escape,grp:shifts_toggle";
+                    xkb_options = "grp:lctrl_lalt_toggle,lv3:ralt_switch";
                };
                
                output = gui.monitors;
@@ -170,9 +214,13 @@ in
                    commands = [
                        { criteria = { class = "vesktop"; }; command = "opacity 0.9"; }
                        { criteria = { app_id = "Alacritty"; }; command = "opacity 0.9"; }
+                        { criteria = { app_id = "kitty"; }; command = "opacity 0.9"; }
+                        { criteria = { class = "feishin"; }; command = "opacity 0.9"; }
                        { criteria = { class = "gamescope"; }; command = "fullscreen"; }
                        { criteria = { app_id = "gamescope"; }; command = "fullscreen"; }
+                        { criteria = { class = "Wfica"; }; command = "fullscreen"; }
                        { criteria = { app_id = "mpv"; }; command = "fullscreen"; }
+                        { criteria = { app_id = "org.speedcrunch."; }; command = "floating enable"; }
                    ];
                };

@@ -183,14 +231,14 @@ in
                };

                bars = [
-                    { command = "\${pkgs.waybar}/bin/waybar"; }
+                    { command = "${pkgs.waybar}/bin/waybar"; }
                ];
+
            };


            extraConfig = ''

-            bindsym ${modifier}+space exec kickoff-dot-desktop | kickoff --from-stdin --stdout | xargs -d '\n' swaymsg exec

            set $bg-color            #58536d
            set $inactive-bg-color   #2f343f
@@ -207,11 +255,22 @@ in

            smart_gaps inverse_outer

-            bar {
-                swaybar_command waybar
-            }
-
            '';
+
+            extraSessionCommands = 
+              (if gui.secrets 
+              then ''
+                eval $(gnome-keyring-daemon --start --components=pkcs11,secrets,ssh);
+                export SSH_AUTH_SOCK;
+              ''
+              else "") + ''
+                # https://www.reddit.com/r/swaywm/comments/i6qlos/how_do_i_use_an_ime_with_sway/g1lk4xh?utm_source=share&utm_medium=web2x&context=3
+                export INPUT_METHOD=fcitx
+                export QT_IM_MODULE=fcitx
+                export GTK_IM_MODULE=fcitx
+                export XMODIFIERS=@im=fcitx
+                export XIM_SERVERS=fcitx
+              '';
        };
    };
 }
--- a/modules/home/term.nix
+++ b/modules/home/term.nix
@@ -0,0 +1,27 @@
+{ lib
+, pkgs
+, config
+, ...
+}:
+
+with lib; let
+    cfg = config.simmer.term;
+in
+{
+
+  config = {
+    programs.kitty = mkIf (cfg.terminal == "kitty") {
+      enable = true;
+      settings = {
+        confirm_os_window_close = 0;
+      };
+      font.name = mkIf (cfg.font == "codelia") "Codelia";
+    };
+
+
+    programs.alacritty = mkIf (cfg.terminal == "alacritty") {
+      enable = true;
+    };
+  };
+
+}
--- a/modules/nix/audio.nix
+++ b/modules/nix/audio.nix
@@ -9,46 +9,10 @@ with lib; let
 in
 {

-    options.simmer.audio = {
-        pipewire = {
-            enable = mkOption {
-                description = "Enable pipewire";
-                type = types.bool;
-                default = false;
-            };
-        };
-
-        music = {
-            enable = mkOption {
-                description = "Install music player";
-                type = types.bool;
-                default = false;
-            };
-        };
-
-        tools = {
-            helvum = mkOption {
-                description = "Install helvum";
-                type = types.bool; 
-                default = false;
-            };
-            easyeffects = mkOption {
-                description = "Install easyeffects";
-                type = types.bool; 
-                default = false;
-            };
-            pavucontrol = mkOption {
-                description = "Install pavucontrol";
-                type = types.bool; 
-                default = cfg.pipewire.enable;
-            };
-        };
-    };
-
    config = {
        environment.systemPackages = with pkgs; []
            ++ optional cfg.pipewire.enable pulseaudio
-            ++ optional cfg.music.enable feishin
+            ++ optional cfg.music.enable supersonic
            ++ optional cfg.tools.helvum helvum
            ++ optional cfg.tools.easyeffects easyeffects
            ++ optional cfg.tools.pavucontrol pavucontrol;
--- a/modules/nix/backup.nix
+++ b/modules/nix/backup.nix
@@ -8,52 +8,6 @@ with lib; let
    cfg = config.simmer.backup;
 in
 {
-    options.simmer.backup = {
-        enable = mkOption {
-            description = "Whether backups should be enabled";
-            type = types.bool;
-            default = false;
-        };
-
-        repo = mkOption {
-            description = "Which repository to backup to";
-            type = types.str;
-        };
-
-        paths = mkOption {
-            description = "Which paths to backup";
-            type = types.listOf types.str;
-        };
-
-        user = mkOption {
-            description = "Which user to run backup commands with";
-            type = types.str;
-            default = "root";
-        };
-
-        excludes = mkOption {
-            description = "Which directories to exclude";
-            type = types.listOf types.str;
-            default = [];
-        };
-
-        passphrase = mkOption {
-            description = "Path to file containing passphrase";
-            type = types.path;
-        };
-
-        key = mkOption {
-            description = "Path to file containing SSH Key";
-            type = types.path;
-        };
-
-        repeat = mkOption {
-            description = "How often to run the backup (hourly, daily, weekly)";
-            type = types.enum [ "hourly" "daily" "weekly" ];
-        };
-
-    };
-
    config = mkIf cfg.enable {
        services.borgbackup.jobs = {
            backup = {
--- a/modules/nix/common.nix
+++ b/modules/nix/common.nix
@@ -9,41 +9,22 @@ with lib; let
    cfg = config.simmer.common;
 in
 {
-
-    options.simmer.common = {
-        neovim.enable = mkOption {
-            description = "Whether to install neovim and set as default editor";
-            type = types.bool;
-            default = true;
-        };
-        
-        nil.enable = mkOption {
-            description = "Whether to install nil";
-            type = types.bool;
-            default = true;
-        };
-
-        shell = mkOption {
-            description = "Default shell to use (fish)";
-            type = types.enum [ "fish" ];
-            default = "fish";
-        };
-    };
-
-
    config = {

        environment.systemPackages = with pkgs; [
            curl
            wget
            git
+            jujutsu
            killall
            vim
            eza
            ripgrep
            fzf
+            yazi
            ncdu
            btop
+            pciutils
        ]
        ++ optional cfg.nil.enable nil;

@@ -52,7 +33,27 @@ in
            defaultEditor = true;
        };

-        programs.fish.enable = mkIf (cfg.shell == "fish") true;
+        services.keyd = mkIf (cfg.caps != "caps") {
+            enable = true;
+            keyboards.default = {
+                ids = [ "*" ];
+                settings = {
+                    main = mkMerge [
+                        (mkIf (cfg.caps == "ctrl-esc") { capslock = "overload(control, esc)"; })
+                        (mkIf (cfg.caps == "esc") { capslock = "esc"; })
+                        { rightcontrol = "rightcontrol"; }
+                        { rightshift = "rightshift"; }
+                    ];
+                    altgr = mkMerge [
+                        { "-" = "macro(C-S-u 2 0 1 4 space)"; }
+                    ];
+                };
+            };
+        };
+
+        programs.fish = mkIf (cfg.shell == "fish") {
+            enable = true;
+        };
    };

 }
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -13,6 +13,7 @@
        ./common.nix
        ./networking.nix
        ./games.nix
-        ./system.nix
+        ./laptop.nix
+        ./school
    ];
 }
--- a/modules/nix/games.nix
+++ b/modules/nix/games.nix
@@ -8,53 +8,19 @@ with lib; let
    cfg = config.simmer.games;
 in
 {
-    options.simmer.games = {
-        enable = mkOption {
-            description = "Whether to enable games";
-            type = types.bool;
-            default = false;
-        };
-
-        protonup.enable = mkOption {
-            description = "Whether to install protonup";
-            type = types.bool;
-            default = true;
-        };
-
-        lutris.enable = mkOption {
-            description = "Whether to install lutris";
-            type = types.bool;
-            default = false;
-        };
-
-        steam.enable = mkOption {
-            description = "Whether to install steam";
-            type = types.bool;
-            default = true;
-        };
-
-        gamescope.enable = mkOption {
-            description = "Whether to install gamescope";
-            type = types.bool;
-            default = cfg.steam.enable;
-        };
-
-        discord.enable = mkOption {
-            description = "Whether to install discord";
-            type = types.bool;
-            default = true;
-        };
-    };
-
    config = mkIf cfg.enable {
-        environment.systemPackages = with pkgs; with localPackages.x86_64-linux; []
+        environment.systemPackages = with pkgs; []
            ++ optional cfg.protonup.enable protonup-qt
-            ++ optional cfg.gamescope.enable gamescope-old
+            ++ optional cfg.gamescope.enable gamescope
            ++ optional cfg.discord.enable vesktop
+            ++ optional cfg.minecraft.enable prismlauncher
+            ++ optional cfg.vintagestory.enable vintagestory
+            ++ optional cfg.ps4.enable localPackages.x86_64-linux.shadps4
            ++ optionals cfg.lutris.enable [ lutris wine ];

        programs.steam = mkIf cfg.steam.enable {
            enable = true;
+            extraCompatPackages = with pkgs; [ proton-ge-bin ];
        };
    };
 }
--- a/modules/nix/gui.nix
+++ b/modules/nix/gui.nix
@@ -9,70 +9,7 @@ with lib; let
    cfg = config.simmer.gui;
 in
 {
-
-    options.simmer.gui = {
-        enable = mkOption {
-            description = "Enable gui";
-            type = types.bool; 
-            default = false;
-        };
-
-        sway = {
-            enable = mkOption {
-                description = "Install and configure sway window manager";
-                type = types.bool;
-                default = true;
-            };
-
-            desktop = mkOption {
-                description= "Use desktop configuration";
-                type = types.bool;
-                default = false;
-            };
-
-        };
-
-        terminal = mkOption {
-            description = "Which terminal to install (alacritty)";
-            type = types.enum [ pkgs.alacritty ];
-            default = pkgs.alacritty;
-        };
-
-        gtk = mkOption {
-            description = "Whether to configure gtk";
-            type = types.bool;
-            default = cfg.gui.enable;
-        };
-
-        protonmail = mkOption {
-            description = "Whether to install protonmail bridge and mail application";
-            type = types.bool;
-            default = false;
-        };
-
-        secrets = mkOption {
-            description = "Whether to enable secrets handling with gnomke-keyring";
-            type = types.bool;
-            default = cfg.protonmail;
-        };
-
-        matrix = mkOption {
-            description = "Whether to install a matrix client";
-            type = types.bool;
-            default = false;
-        };
-
-        monitors = mkOption {
-            description = "Attribute set of system monitors";
-            type = types.attrs;
-            default = {};
-        };
-            
-    };
-
-
    config = mkIf cfg.enable {
-
        environment.systemPackages = with pkgs; with localPackages.x86_64-linux; []
        ++ optionals cfg.sway.enable [
            wl-clipboard
@@ -87,31 +24,50 @@ in
            mpv
            feh
        ]
-        ++ [ cfg.terminal ]
        ++ optional cfg.matrix cinny-desktop
        ++ optional cfg.secrets libsecret
        ++ optionals cfg.protonmail [ thunderbird protonmail-bridge ];

        programs.dconf.enable = mkIf cfg.secrets true;
        services.gnome.gnome-keyring.enable = mkIf cfg.secrets true;
-        services.dbus.packages = mkIf cfg.secrets [ pkgs.gnome.seahorse ];
+        services.dbus.packages = mkIf cfg.secrets [ pkgs.seahorse ];
+
+        # Remove when nixpkgs issue 143365 is fixed
+        security.pam.services.swaylock = mkIf (!cfg.sway.desktop) {};

        xdg.portal.config.common = [ "wlr" "gtk" ];
        programs.thunar.enable = true;

+        hardware.opengl.enable = true;
+
+        i18n.inputMethod = {
+          enabled = "fcitx5";
+          fcitx5.addons = with pkgs; [
+            fcitx5-mozc
+            fcitx5-gtk
+          ];
+        };
+
        fonts = {
            packages = with pkgs; [
                liberation_ttf
-                ubuntu_font_family
+                noto-fonts
+                noto-fonts-cjk-sans
+                ubuntu-classic
                vazir-fonts
                font-awesome
+                corefonts
+                carlito
+                roboto
+                source-sans
+                source-sans-pro
            ];
             fontconfig = {

                defaultFonts = {
-                    serif = [  "Liberation Serif" "Vazirmatn" ];
-                    sansSerif = [ "Ubuntu" "Vazirmatn" ];
-                    monospace = [ "Ubuntu Mono" ];
+                    serif = [ "Noto Serif" "Noto Serif CJK JP" ];
+                    sansSerif = [ "Noto Sans" "Noto Sans CJK JP" ];
+                    monospace = [ "Ubuntu Mono" "Noto Sans Mono CJK JP" ];
                };
            };
        };
--- a/modules/nix/laptop.nix
+++ b/modules/nix/laptop.nix
@@ -0,0 +1,28 @@
+{ lib
+, pkgs
+, config
+, ...
+}: 
+
+with lib; let
+    cfg = config.simmer.laptop;
+in
+{
+
+    config.programs.light.enable = mkIf cfg.backlight.enable true;
+
+    config.powerManagement.powertop.enable = mkIf cfg.powersave.enable true;
+    config.services.auto-cpufreq = mkIf cfg.powersave.enable {
+        enable = true;
+        settings = {
+            battery = {
+                governor = "powersave";
+                turbo = "never";
+            };
+            charger = {
+                governor = "performance";
+                turbo = "auto";
+            };
+        };
+    };
+}
--- a/modules/nix/networking.nix
+++ b/modules/nix/networking.nix
@@ -10,55 +10,10 @@ with lib; let
 in
 {

-    options.simmer.networking = {
-        firewall = {
-            enable = mkOption {
-                description = "Whether to enable firewall";
-                type = types.bool;
-                default = true;
-            };
-
-            allowedTCPPorts = mkOption {
-                description = "Which tcp ports to allow through firewall";
-                type = types.listOf types.int;
-                default = []
-                    ++ optional openssh.enable openssh.port;
-            };
-
-            allowedUDPPorts = mkOption {
-                description = "Which udp ports to allow through firewall";
-                type = types.listOf types.int;
-                default = [];
-            };
-
-        };
-
-        wireguard = {
-            enable = mkOption {
-                description = "Whether to install wireguard";
-                type = types.bool;
-                default = false;
-            };
-        };
-
-        networkmanager = {
-            enable = mkOption {
-                description = "Whether to enable network manager";
-                type = types.bool;
-                default = true;
-            };
-        };
-
-        nameservers = mkOption {
-            description = "Which nameservers to use";
-            type = types.listOf types.str;
-            default = [ "1.1.1.1" ];
-        };
-    };
-
    config = {
        environment.systemPackages = with pkgs; [
            ldns
+            mtr
        ]
        ++ optional cfg.wireguard.enable wireguard-tools;

@@ -66,7 +21,9 @@ in
        networking.nameservers = cfg.nameservers;
        networking.firewall = {
            enable = cfg.firewall.enable;
-            allowedTCPPorts = cfg.firewall.allowedTCPPorts;
+            allowedTCPPorts = cfg.firewall.allowedTCPPorts
+                ++ optional openssh.enable openssh.port;
+
            allowedUDPPorts = cfg.firewall.allowedUDPPorts;
        };
    };
--- a/modules/nix/openssh.nix
+++ b/modules/nix/openssh.nix
@@ -8,33 +8,13 @@ with lib; let
    cfg = config.simmer.openssh;
 in
 {
-    options.simmer.openssh = {
-        enable = mkOption {
-            description = "Whether to enable openssh server";
-            type = types.bool;
-            default = false;
-        };
-
-        port = mkOption {
-            description = "What port the server should run on";
-            type = types.int;
-            default = 22;
-        };
-
-        allow-password = mkOption {
-            description = "Whether the server should allow password authenitication" ;
-            type = types.bool;
-            default = false;
-        };
-    };
-
    config = mkIf cfg.enable {
        services.openssh = {
            enable = true;
            ports = [ cfg.port ];
            settings = {
                PermitRootLogin = "no";
-                PasswordAuthentication = false;
+                PasswordAuthentication = cfg.allow-password;
            };
        };
    };
--- a/modules/nix/school/default.nix
+++ b/modules/nix/school/default.nix
@@ -0,0 +1,24 @@
+{ lib
+, pkgs
+, config
+, localPackages
+, pkgs_stable_tmp
+, ...
+}:
+
+with lib; let
+    cfg = config.simmer.school;
+    extraCerts = [ ./incommon-rsa-ca2.pem ];
+    citrix = pkgs_stable_tmp.citrix_workspace_23_09_0.override { inherit extraCerts; };
+in
+{
+    config = mkIf cfg.enable {
+        environment.systemPackages = with pkgs; [
+            xournalpp
+            libreoffice
+        ] 
+        ++ optional cfg.citrix citrix
+        ++ optional cfg.kicad kicad
+        ++ optional cfg.logisim logisim-evolution;
+    };
+}
--- a/modules/nix/school/incommon-rsa-ca2.pem
+++ b/modules/nix/school/incommon-rsa-ca2.pem
@@ -0,0 +1,36 @@
+-----BEGIN CERTIFICATE-----
+MIIGSjCCBDKgAwIBAgIRAINbdhUgbS1uCX4LbkCf78AwDQYJKoZIhvcNAQEMBQAw
+gYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5MRQwEgYDVQQHEwtK
+ZXJzZXkgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMS4wLAYD
+VQQDEyVVU0VSVHJ1c3QgUlNBIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTIy
+MTExNjAwMDAwMFoXDTMyMTExNTIzNTk1OVowRDELMAkGA1UEBhMCVVMxEjAQBgNV
+BAoTCUludGVybmV0MjEhMB8GA1UEAxMYSW5Db21tb24gUlNBIFNlcnZlciBDQSAy
+MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAifBcxDi60DRXr5dVoPQi
+Q/w+GBE62216UiEGMdbUt7eSiIaFj/iZ/xiFop0rWuH4BCFJ3kSvQF+aIhEsOnuX
+R6mViSpUx53HM5ApIzFIVbd4GqY6tgwaPzu/XRI/4Dmz+hoLW/i/zD19iXvS95qf
+NU8qP7/3/USf2/VNSUNmuMKlaRgwkouue0usidYK7V8W3ze+rTFvWR2JtWKNTInc
+NyWD3GhVy/7G09PwTAu7h0qqRyTkETLf+z7FWtc8c12f+SfvmKHKFVqKpNPtgMkr
+wqwaOgOOD4Q00AihVT+UzJ6MmhNPGg+/Xf0BavmXKCGDTv5uzQeOdD35o/Zw16V4
+C4J4toj1WLY7hkVhrzKG+UWJiSn8Hv3dUTj4dkneJBNQrUfcIfTHV3gCtKwXn1eX
+mrxhH+tWu9RVwsDegRG0s28OMdVeOwljZvYrUjRomutNO5GzynveVxJVCn3Cbn7a
+c4L+5vwPNgs04DdOAGzNYdG5t6ryyYPosSLH2B8qDNzxAgMBAAGjggFwMIIBbDAf
+BgNVHSMEGDAWgBRTeb9aqitKz1SA4dibwJ3ysgNmyzAdBgNVHQ4EFgQU70wAkqb7
+di5eleLJX4cbGdVN4tkwDgYDVR0PAQH/BAQDAgGGMBIGA1UdEwEB/wQIMAYBAf8C
+AQAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYL
+KwYBBAGyMQECAmcwCAYGZ4EMAQICMFAGA1UdHwRJMEcwRaBDoEGGP2h0dHA6Ly9j
+cmwudXNlcnRydXN0LmNvbS9VU0VSVHJ1c3RSU0FDZXJ0aWZpY2F0aW9uQXV0aG9y
+aXR5LmNybDBxBggrBgEFBQcBAQRlMGMwOgYIKwYBBQUHMAKGLmh0dHA6Ly9jcnQu
+dXNlcnRydXN0LmNvbS9VU0VSVHJ1c3RSU0FBQUFDQS5jcnQwJQYIKwYBBQUHMAGG
+GWh0dHA6Ly9vY3NwLnVzZXJ0cnVzdC5jb20wDQYJKoZIhvcNAQEMBQADggIBACaA
+DTTkHq4ivq8+puKE+ca3JbH32y+odcJqgqzDts5bgsapBswRYypjmXLel11Q2U6w
+rySldlIjBRDZ8Ah8NOs85A6MKJQLaU9qHzRyG6w2UQTzRwx2seY30Mks3ZdIe9rj
+s5rEYliIOh9Dwy8wUTJxXzmYf/A1Gkp4JJp0xIhCVR1gCSOX5JW6185kwid242bs
+Lm0vCQBAA/rQgxvLpItZhC9US/r33lgtX/cYFzB4jGOd+Xs2sEAUlGyu8grLohYh
+kgWN6hqyoFdOpmrl8yu7CSGV7gmVQf9viwVBDIKm+2zLDo/nhRkk8xA0Bb1BqPzy
+bPESSVh4y5rZ5bzB4Lo2YN061HV9+HDnnIDBffNIicACdv4JGyGfpbS6xsi3UCN1
+5ypaG43PJqQ0UnBQDuR60io1ApeSNkYhkaHQ9Tk/0C4A+EM3MW/KFuU53eHLVlX9
+ss1iG2AJfVktaZ2l/SbY7py8JUYMkL/jqZBRjNkD6srsmpJ6utUMmAlt7m1+cTX8
+6/VEBc5Dp9VfuD6hNbNKDSg7YxyEVaBqBEtN5dppj4xSiCrs6LxLHnNo3rG8VJRf
+NVQdgFbMb7dOIBokklzfmU69lS0kgyz2mZMJmW2G/hhEdddJWHh3FcLi2MaeYiOV
+RFrLHtJvXEdf2aEaZ0LOb2Xo3zO6BJvjXldv2woN
+-----END CERTIFICATE-----
--- a/modules/options/audio.nix
+++ b/modules/options/audio.nix
@@ -0,0 +1,47 @@
+{ lib
+, pkgs
+, config
+, ...
+}:
+
+with lib; let
+    cfg = config.simmer.audio;
+in
+{
+
+    options.simmer.audio = {
+        pipewire = {
+            enable = mkOption {
+                description = "Enable pipewire";
+                type = types.bool;
+                default = false;
+            };
+        };
+
+        music = {
+            enable = mkOption {
+                description = "Install music player";
+                type = types.bool;
+                default = false;
+            };
+        };
+
+        tools = {
+            helvum = mkOption {
+                description = "Install helvum";
+                type = types.bool; 
+                default = false;
+            };
+            easyeffects = mkOption {
+                description = "Install easyeffects";
+                type = types.bool; 
+                default = false;
+            };
+            pavucontrol = mkOption {
+                description = "Install pavucontrol";
+                type = types.bool; 
+                default = cfg.pipewire.enable;
+            };
+        };
+    };
+}
--- a/modules/options/backup.nix
+++ b/modules/options/backup.nix
@@ -0,0 +1,55 @@
+
+{ pkgs
+, lib
+, config
+, ...
+}:
+
+with lib;
+{
+    options.simmer.backup = {
+        enable = mkOption {
+            description = "Whether backups should be enabled";
+            type = types.bool;
+            default = false;
+        };
+
+        repo = mkOption {
+            description = "Which repository to backup to";
+            type = types.str;
+        };
+
+        paths = mkOption {
+            description = "Which paths to backup";
+            type = types.listOf types.str;
+        };
+
+        user = mkOption {
+            description = "Which user to run backup commands with";
+            type = types.str;
+            default = "root";
+        };
+
+        excludes = mkOption {
+            description = "Which directories to exclude";
+            type = types.listOf types.str;
+            default = [];
+        };
+
+        passphrase = mkOption {
+            description = "Path to file containing passphrase";
+            type = types.path;
+        };
+
+        key = mkOption {
+            description = "Path to file containing SSH Key";
+            type = types.path;
+        };
+
+        repeat = mkOption {
+            description = "How often to run the backup (hourly, daily, weekly)";
+            type = types.enum [ "hourly" "daily" "weekly" ];
+        };
+
+    };
+}
--- a/modules/options/common.nix
+++ b/modules/options/common.nix
@@ -0,0 +1,41 @@
+
+{ lib
+, pkgs
+, localPackages
+, config
+, ...
+}: 
+
+with lib;
+{
+    options.simmer.common = {
+        neovim.enable = mkOption {
+            description = "Whether to install neovim and set as default editor";
+            type = types.bool;
+            default = true;
+        };
+        
+        nil.enable = mkOption {
+            description = "Whether to install nil";
+            type = types.bool;
+            default = true;
+        };
+
+        shell = mkOption {
+            description = "Default shell to use (fish)";
+            type = types.enum [ "fish" ];
+            default = "fish";
+        };
+
+        caps = mkOption {
+            description = "What key to bind caps lock to";
+            type = types.enum [ "ctrl-esc" "esc" "caps" ];
+            default = "ctrl-esc";
+        };
+
+        nixpkgs = mkOption {
+            description = "Which nixpkgs version to use";
+            type = types.any;
+        };
+    };
+}
--- a/modules/options/default.nix
+++ b/modules/options/default.nix
@@ -0,0 +1,21 @@
+{ lib
+, pkgs
+, config
+, ...
+}:
+
+{
+    imports = [
+        ./audio.nix
+        ./backup.nix
+        ./common.nix
+        ./games.nix
+        ./gui.nix
+        ./networking.nix
+        ./openssh.nix
+        ./system.nix
+        ./laptop.nix
+        ./school.nix
+        ./term.nix
+    ];
+}
--- a/modules/options/games.nix
+++ b/modules/options/games.nix
@@ -0,0 +1,67 @@
+{ lib
+, pkgs
+, config
+, localPackages
+, ... 
+}: 
+with lib;
+let
+    cfg = config.simmer.games;
+in
+{
+    options.simmer.games = {
+        enable = mkOption {
+            description = "Whether to enable games";
+            type = types.bool;
+            default = false;
+        };
+
+        protonup.enable = mkOption {
+            description = "Whether to install protonup";
+            type = types.bool;
+            default = true;
+        };
+
+        lutris.enable = mkOption {
+            description = "Whether to install lutris";
+            type = types.bool;
+            default = false;
+        };
+
+        steam.enable = mkOption {
+            description = "Whether to install steam";
+            type = types.bool;
+            default = true;
+        };
+
+        vintagestory.enable = mkOption {
+            description = "Whether to install Vintage Story";
+            type = types.bool;
+            default = false;
+        };
+
+        minecraft.enable = mkOption {
+            description = "Whether to install minecraft launcher";
+            type = types.bool;
+            default = false;
+        };
+
+        ps4.enable = mkOption {
+          description = "Whether to install ps4 emulator";
+          type = types.bool;
+          default = false;
+        };
+
+        gamescope.enable = mkOption {
+            description = "Whether to install gamescope";
+            type = types.bool;
+            default = cfg.steam.enable;
+        };
+
+        discord.enable = mkOption {
+            description = "Whether to install discord";
+            type = types.bool;
+            default = true;
+        };
+    };
+}
--- a/modules/options/gui.nix
+++ b/modules/options/gui.nix
@@ -0,0 +1,67 @@
+{ lib
+, pkgs
+, config
+, localPackages
+, ... 
+}: 
+
+with lib;
+let
+    cfg = config.simmer.gui;
+in
+{
+
+    options.simmer.gui = {
+        enable = mkOption {
+            description = "Enable gui";
+            type = types.bool; 
+            default = false;
+        };
+
+        sway = {
+            enable = mkOption {
+                description = "Install and configure sway window manager";
+                type = types.bool;
+                default = true;
+            };
+
+            desktop = mkOption {
+                description= "Use desktop configuration";
+                type = types.bool;
+                default = false;
+            };
+
+        };
+
+        gtk = mkOption {
+            description = "Whether to configure gtk";
+            type = types.bool;
+            default = cfg.gui.enable;
+        };
+
+        protonmail = mkOption {
+            description = "Whether to install protonmail bridge and mail application";
+            type = types.bool;
+            default = false;
+        };
+
+        secrets = mkOption {
+            description = "Whether to enable secrets handling with gnomke-keyring";
+            type = types.bool;
+            default = cfg.protonmail;
+        };
+
+        matrix = mkOption {
+            description = "Whether to install a matrix client";
+            type = types.bool;
+            default = false;
+        };
+
+        monitors = mkOption {
+            description = "Attribute set of system monitors";
+            type = types.attrs;
+            default = {};
+        };
+            
+    };
+}
--- a/modules/options/laptop.nix
+++ b/modules/options/laptop.nix
@@ -0,0 +1,24 @@
+{ lib
+, pkgs
+, config
+, ...
+}:
+
+with lib; let
+    cfg = config.simmer.gui;
+in
+{
+    options.simmer.laptop = {
+        backlight.enable = mkOption {
+            description = "Whether to enable backlight control";
+            type = types.bool;
+            default = false;
+        };
+
+        powersave.enable = mkOption {
+            description = "Whether to enable powersaving programs";
+            type = types.bool;
+            default = false;
+        };
+    };
+}
--- a/modules/options/networking.nix
+++ b/modules/options/networking.nix
@@ -0,0 +1,57 @@
+
+{ lib
+, pkgs
+, localPackages
+, config
+, ...
+}:
+with lib; let
+    cfg = config.simmer.networking;
+in
+{
+
+    options.simmer.networking = {
+        firewall = {
+            enable = mkOption {
+                description = "Whether to enable firewall";
+                type = types.bool;
+                default = true;
+            };
+
+            allowedTCPPorts = mkOption {
+                description = "Which tcp ports to allow through firewall";
+                type = types.listOf types.int;
+                default = [];
+            };
+
+            allowedUDPPorts = mkOption {
+                description = "Which udp ports to allow through firewall";
+                type = types.listOf types.int;
+                default = [];
+            };
+
+        };
+
+        wireguard = {
+            enable = mkOption {
+                description = "Whether to install wireguard";
+                type = types.bool;
+                default = false;
+            };
+        };
+
+        networkmanager = {
+            enable = mkOption {
+                description = "Whether to enable network manager";
+                type = types.bool;
+                default = true;
+            };
+        };
+
+        nameservers = mkOption {
+            description = "Which nameservers to use";
+            type = types.listOf types.str;
+            default = [ "1.1.1.1" ];
+        };
+    };
+}
--- a/modules/options/openssh.nix
+++ b/modules/options/openssh.nix
@@ -0,0 +1,31 @@
+
+{ lib
+, pkgs
+, config
+, ...
+}:
+
+with lib; let
+    cfg = config.simmer.openssh;
+in
+{
+    options.simmer.openssh = {
+        enable = mkOption {
+            description = "Whether to enable openssh server";
+            type = types.bool;
+            default = false;
+        };
+
+        port = mkOption {
+            description = "What port the server should run on";
+            type = types.int;
+            default = 22;
+        };
+
+        allow-password = mkOption {
+            description = "Whether the server should allow password authenitication" ;
+            type = types.bool;
+            default = false;
+        };
+    };
+}
--- a/modules/options/school.nix
+++ b/modules/options/school.nix
@@ -0,0 +1,34 @@
+{ lib
+, pkgs
+, config
+, ...
+}:
+
+with lib;
+let
+    cfg = config.simmer.school;
+in
+{
+    options.simmer.school = {
+        enable = mkOption {
+            description = "Whether to install default software for school";
+            type = types.bool;
+            default = false;
+        };
+        citrix = mkOption {
+            description = "Whether to install and setup citrix";
+            type = types.bool;
+            default = false;
+        };
+        kicad = mkOption {
+            description = "Whether to install kicad";
+            type = types.bool;
+            default = cfg.enable;
+        };
+        logisim = mkOption {
+            description = "Whether to install logisim"; 
+            type = types.bool;
+            default = cfg.enable;
+        };
+    };
+}
--- a/modules/options/system.nix
+++ b/modules/options/system.nix
@@ -1,3 +1,4 @@
+
 { lib
 , pkgs
 , config
--- a/modules/options/term.nix
+++ b/modules/options/term.nix
@@ -0,0 +1,32 @@
+{ lib
+, pkgs
+, config
+, ...
+}:
+
+with lib; let
+    cfg = config.simmer.term;
+    gui = config.simmer.gui;
+in
+{
+    options.simmer.term = {
+        enable = mkOption {
+            description = "Whether to install and configure a terminal";
+            type = types.bool;
+            default = gui.enable;
+        };
+
+        terminal = mkOption {
+            description = "Which terminal to install (alcritty, kitty)";
+            type = types.enum [ "alacritty" "kitty" ];
+            default = "alacritty";
+          };
+
+        font = mkOption {
+            description = "Which font to use in terminal";
+            type = types.enum [ "default" "codelia" ];
+            default = "codelia";
+        };
+    };
+
+}
--- a/overlays/citrix.nix
+++ b/overlays/citrix.nix
@@ -0,0 +1,12 @@
+final: prev: {
+  # https://github.com/NixOS/nixpkgs/issues/348868
+  citrix_workspace_23_09_0 = prev.citrix_workspace_23_09_0.override {
+    libvorbis = final.libvorbis.override {
+      libogg = final.libogg.overrideAttrs (prevAttrs: {
+        cmakeFlags = (if prevAttrs ? cmakeFlags then prevAttrs.cmakeFlags else []) ++ [
+          (final.lib.cmakeBool "BUILD_SHARED_LIBS" true)
+        ];
+      });
+    };
+  };
+}
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -0,0 +1,8 @@
+{ inputs, ...}:
+{
+    nose = import ./nose.nix;
+    llama-cpp = import ./llama-cpp.nix { inherit inputs; };
+    printrun = import ./printrun.nix { inherit inputs; };
+    citrix = import ./citrix.nix;
+    shadps4 = import ./shadps4.nix;
+}
--- a/overlays/llama-cpp.nix
+++ b/overlays/llama-cpp.nix
@@ -0,0 +1,4 @@
+{ inputs, ... }:
+final: prev: {
+    llama-cpp = prev.llama-cpp.override { rocmSupport = true; };
+}
--- a/overlays/nose.nix
+++ b/overlays/nose.nix
@@ -0,0 +1,3 @@
+_: prev: {
+        python312 = prev.python312.override { packageOverrides = _: pysuper: { nose = pysuper.pynose; }; };
+}
--- a/overlays/printrun.nix
+++ b/overlays/printrun.nix
@@ -0,0 +1,10 @@
+{ inputs, ... }:
+let
+    system = "x86_64-linux";
+    pkgs = inputs.nixpkgs-unstable.legacyPackages.${system};
+in
+final: prev: {
+    printrun = prev.printrun.overrideAttrs ( finalAttrs: previousAttrs: {
+        propagatedBuildInputs = previousAttrs.propagatedBuildInputs ++ [ pkgs.python312Packages.platformdirs ];
+    });
+}
--- a/overlays/shadps4.nix
+++ b/overlays/shadps4.nix
@@ -0,0 +1,15 @@
+final: prev: {
+  shadps4 = prev.shadps4.overrideAttrs (old: {
+    version = "0.6.0";
+    
+    src = prev.fetchFromGitHub {
+      owner = "shadps4-emu";
+      repo = "shadps4";
+      rev = "15d10e47ea272b1b4c8bf97f2b3bbb406d34b213";
+      fetchSubmodules = true;
+      hash = "sha256-ksIKmijWcRMhCDEi/dodZHiEoIO3CB0BkGn698J7jxI=";
+    };
+
+    patches = [];
+  });
+}
--- a/pkgs/gazou.nix
+++ b/pkgs/gazou.nix
@@ -0,0 +1,36 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+, tesseract4
+, leptonica
+, libsForQt5
+}: 
+stdenv.mkDerivation {
+  name = "gazou";
+  version = "0.3.3";
+
+  src = fetchFromGitHub {
+    owner = "kamui-fin";
+    repo = "gazou";
+    rev = "7dd023fc78566f2911250f4b8550b0a33a943bb3";
+    hash = "sha256-6auc5i6b7r4knzen4TCq2mTdbiv+qCD0mWE3LNyh2J4=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [
+    pkg-config
+    tesseract4
+    leptonica
+    libsForQt5.qt5.qtbase
+    libsForQt5.qt5.qtdeclarative
+  ];
+
+  cmakeFlags = [
+    "-DGUI=OFF"
+  ];
+
+  dontWrapQtApps = true;
+
+}
--- a/pkgs/jhelioviewer.nix
+++ b/pkgs/jhelioviewer.nix
@@ -0,0 +1,76 @@
+{ lib
+, stdenv
+, jdk
+, jre
+, ant
+, jogl
+, libGL
+, fetchFromGitHub
+, makeDesktopItem
+, copyDesktopItems
+, stripJavaArchivesHook
+, makeWrapper
+, ...
+}:
+stdenv.mkDerivation {
+    name = "JHelioviewer";
+
+    src = fetchFromGitHub {
+        owner = "Helioviewer-Project";
+        repo = "JHelioviewer-SWHV";
+        rev = "c1affb8a820fb2785d7598a59dad3691bf42298c";
+        hash = "sha256-CGpWPKsGQsX+3aaqws351hy2xCST/x+Md+dRBov1vog=";
+    };
+
+    nativeBuildInputs = [ 
+        jdk
+        ant
+        stripJavaArchivesHook
+        makeWrapper
+        copyDesktopItems
+    ];
+
+    buildPhase = ''
+        runHook preBuild
+        ant
+        runHook postBuild
+    '';
+
+    desktopItems = [
+        (makeDesktopItem {
+            name = "jhelioviewer";
+            desktopName = "JHelioviewer";
+            exec = "jhelioviewer";
+            comment = "A visualization tool for solar physics data based on the JPEG 2000 image compression standard, and part of the open source ESA/NASA Helioviewer Project";
+            icon = "hvLogo";
+        })
+    ];
+
+    installPhase = ''
+        runHook preInstall
+
+        mkdir -p $out/share/java/
+        mkdir -p $out/share/java/lib
+
+        install -Dm644 JHelioviewer.jar $out/share/java/
+
+        cp -rv lib/* $out/share/java/lib/
+
+        rm $out/share/java/lib/jogl/*.jar
+        cp -v ${jogl}/share/java/jogl*.jar ${jogl}/share/java/glue*.jar $out/share/java/lib/jogl
+
+        mkdir $out/bin
+        makeWrapper ${jre}/bin/java $out/bin/jhelioviewer \
+            --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]} \
+            --add-flags "-cp $out/share/java/JHelioviewer.jar" \
+            --add-flags "--add-exports java.desktop/sun.awt=ALL-UNNAMED" \
+            --add-flags "--add-exports java.desktop/sun.swing=ALL-UNNAMED" \
+            --add-flags "org.helioviewer.jhv.JHelioviewer" 
+
+        mkdir -p $out/share/icons
+
+        cp -v docs/hvLogo.png $out/share/icons/
+
+        runHook postInstall
+    '';
+}
--- a/pkgs/kickoff-dot-desktop.nix
+++ b/pkgs/kickoff-dot-desktop.nix
@@ -11,7 +11,8 @@ rustPlatform.buildRustPackage {
            hash = "sha256-exMmqOkDKuyAEdda8gG/uF3+tnQzhJnOJK+sEtZbsZc=";
    };

-    cargoHash = "sha256-z3apcltBKNovwo+yOHxvzn53PPefr2lEzkGst25fGsM=";
+    useFetchCargoVendor = true;
+    cargoHash = "sha256-4x9kEBnYPhhYej0mNmV7jibw6sH8SxVau9tIkIVTen8=";

    meta = with lib; {
            description = "Smol program to read in relevant desktop files and print them in a kickoff compatible format";
--- a/pkgs/shadps4.nix
+++ b/pkgs/shadps4.nix
@@ -0,0 +1,109 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, llvmPackages_18
+, cmake
+, pkg-config
+, git
+, qt6
+, alsa-lib
+, libpulseaudio
+, openal
+, openssl
+, zlib
+, libedit
+, udev
+, libevdev
+, SDL2
+, jack2
+, sndio
+, vulkan-headers
+, vulkan-utility-libraries
+, vulkan-tools
+, ffmpeg
+, fmt
+, glslang
+, libxkbcommon
+, wayland
+, xorg
+, sdl3
+, stb
+, wayland-protocols
+, libpng
+}: 
+stdenv.mkDerivation {
+  pname = "shadps4";
+  version = "0.6.0";
+
+  src = fetchFromGitHub {
+    owner = "shadps4-emu"; 
+    repo = "shadPS4";
+    rev = "9061028ce588037fa6f467cd2c0740d10ed725ed";
+    hash = "sha256-XhfJx1sDFz+RwhwcBA8W6WV6y1rDDvpyQe3v3NaSu2I=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+      llvmPackages_18.clang
+      cmake
+      pkg-config
+      git
+      qt6.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+      alsa-lib
+      libpulseaudio
+      openal
+      openssl
+      zlib
+      libedit
+      udev
+      libevdev
+      SDL2
+      jack2
+      sndio
+      qt6.qtbase
+      qt6.qttools
+      qt6.qtmultimedia
+
+      vulkan-headers
+      vulkan-utility-libraries
+      vulkan-tools
+
+      ffmpeg
+      fmt
+      glslang
+      libxkbcommon
+      wayland
+      xorg.libxcb
+      xorg.xcbutil
+      xorg.xcbutilkeysyms
+      xorg.xcbutilwm
+      sdl3
+      stb
+      qt6.qtwayland
+      wayland-protocols
+      libpng
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "ENABLE_QT_GUI" true)
+    (lib.cmakeBool "ENABLE_UPDATER" false)
+  ];
+
+  cmakeBuildType = "RelWithDebugInfo";
+  dontStrip = true;
+
+  installPhase = ''
+  runHook preInstall
+
+  install -D -t $out/bin shadps4
+  install -Dm644 $src/.github/shadps4.png $out/share/icons/hicolor/512x512/apps/net.shadps4.shadPS4.png
+  install -Dm644 -t $out/share/applications $src/dist/net.shadps4.shadPS4.desktop
+  install -Dm644 -t $out/share/metainfo $src/dist/net.shadps4.shadPS4.metainfo.xml
+
+  runHook postInstall
+  '';
+
+}
--- a/secrets/alpheratz/secrets.yaml
+++ b/secrets/alpheratz/secrets.yaml
@@ -0,0 +1,34 @@
+wireguard:
+    private: ENC[AES256_GCM,data:Vii9We3fJBFCQNfek+fKqzy4jor2mhHz7KZhoWS9fuBbccz/DHPOnpzRhJQ=,iv:eDorsjazLZjIYsL+AP7YHoBY03ByywtmuRAG0KFonu0=,tag:z7b8NiGOgz0CrhFNalK4Qw==,type:str]
+    preshared: ENC[AES256_GCM,data:BK3CwQ9tZ0gqErPfOt896yH3K+7xDx6Vr+Xd0JMB+RYdugsGYluhldNM3aM=,iv:o9RhmlSCVwHPUi+JRNQF9bTACOwFaKmshfiD25C5QW8=,tag:DO9a2D2zY5rFQWHIR0PsfA==,type:str]
+borgbase:
+    nix-alpheratz: ENC[AES256_GCM,data:anxC2Oyp4nungjxylaNqtEW7CcA=,iv:Gw6XvUWy9EAivZkELhSkx9YPgPDTY2kjZZhk9mF0iCM=,tag:/2ud63VKIABzLxjQsrpPnA==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age1gdtjn3jgvvvspa86q3lnklflnvyf3s75y2rw23l7nk7hwcsfpg7qkq7msr
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuQzBUM0pXdkZUT1R4ekQv
+            YXlJZXA0OGV4SmwxOGxmY3Z3SjRSSE1UK2w4CnpGVkZ5anYvR0NHNEpBbDM3aURN
+            NVA2WmxmZUI3eWR4Tkd6MkxLOTJ5NDgKLS0tIGYrVTZMbUJia0F4ZWMwMXlhTkJz
+            MHdCcVpZaGtLbkpScDhLaGxZY2l3dEkKy1qr0l1eqqIQvsJm56ABIsh0XfFE5O5O
+            H0kLLggfl5AozBWrSjjiOnCf22tue5SzAxS70OO6Dz3y5sYCEF04Ag==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1cla0k3yffcelphkrmgz5upc0chgtdef25ne833jeqtapceux59rqkmhxf7
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAxRCtPaUc4RVZRYW5tM0Ex
+            SGRRZ2kvKzNSdUxFRGtGRXUzWDJZVW9aNkZBCmtpOVIyMnBIaFVjV0xxdGxnNGtj
+            aVNpQzdDMHozL25sZ09Hc09BMVBUdEUKLS0tIE9PWm95RzZndnRwYXNoWExQVXVs
+            R3F6M3dsdXVxSk4va3ptS1JNQ1JSZ2sK7WtQj148lDKG36T6oIL2ASrUY9Q9QwL4
+            FiVkiNAvZPddFRYFSg9UhM92mTWLKay3ak+8IzojfsJmy7Aw9aavSA==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-11-20T18:20:08Z"
+    mac: ENC[AES256_GCM,data:bq1HJC/yvekeqQEjvHZHynlcwwwYY9xRIK6Wp/BGPG3gcN4BaFG8iEgGjQjLIcgi7szsnUnozLYBKe/Na+YmNFS4mLgfn9PxDrMjr3NymO764j2QzXKg4hDnt3qA1HpwZJLZY0l7Mfe6FSovl4X/7x6MWLMDLb1EYys0aBaLnlc=,iv:y5NecMaRVyCWjn3URpJG4EnRkcV2dpitJpzJqEyQbAM=,tag:HVeS/v703EYcro/2cMtb8A==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.9.1
--- a/secrets/diphda/porkbun.keytab
+++ b/secrets/diphda/porkbun.keytab
@@ -0,0 +1,28 @@
+{
+	"data": "ENC[AES256_GCM,data:tB3+8lTzhNTpgd22u8pbE/0LYGIQfWWQiCXovz3RH7vXNcuOEHNAYeKB3IbEUmARXKf3aAAcnrTztqaaKyd9uBdxSOHzFyy0egk0+kR9Af3StG2uAgCuGqGjlOor+W2vS6wRXoWB+vwYizMxBs2rB8CwqFLe+yC++o5XkE45iyhhCXKZSLFBP51p47topL9iRMqaXnRiTrHh/ZsWKGz1Tu2yg+Kq4xNnpGrggW16JiAR,iv:to55g3FssWEKE9oOTOvKbtUdqHhrLkmhuqqi3aM5Zt4=,tag:MnyiNyRoG9hesasW3OHMhQ==,type:str]",
+	"sops": {
+		"kms": null,
+		"gcp_kms": null,
+		"azure_kv": null,
+		"hc_vault": null,
+		"age": [
+			{
+				"recipient": "age1079fszreaakwf6xnwu9kra8xcsp4e8q8ed3y99yrhjnz9n3t9pnsj05m97",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIZjN3WmJvNDhoT0RIVDJr\nWDlpMFZLdEZ0RG44UXRiazIrV0ZZTE1GdnlNCjhqdko5TFI2NlI0SVAvR25vS3h3\nSHZDZUxVeU5VOGJvRGhFWUtIVzNnTkkKLS0tIFI3NGp1c2s4b3NrZ0dRbGlwd0Ro\ndlE3WGZaTHdoWVRjNDMxVGJpRE1vUTgK/Q4f3VS0IkapmsFXgt1YV+fY3eCezDte\nM3XS/hQndEIRmy5ziKQMMR/uADh0Deqs3tYZ/k3FJr+FAT7DWSVOxA==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1gdtjn3jgvvvspa86q3lnklflnvyf3s75y2rw23l7nk7hwcsfpg7qkq7msr",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBJUDVWTUtsVTh4dEUyTlJ6\nVDVuSXBFZW9PNmxUWkFhZnBqRzhvbERBWVJnCmo4OFpGWi9RQTdibVc2blQ0aEN0\nR2cwQUlva1RxdS94T0ZnL25BK2FBbncKLS0tIE90MTJ1QXBkUjlyQUJWRXdSNGly\nYmw4dTBYS3ZtOS94K1dtd29HRjZyTncK8dQqSDBTjKGLQH7FLXBzAMUz4yK5mHgB\n/NoftP1+mjQH0aE32rx+iykSy64wSiORIJ+9ZChgCm5dobBuakR6Gg==\n-----END AGE ENCRYPTED FILE-----\n"
+			},
+			{
+				"recipient": "age1rxqyz6watg05r3rzlme7grpgfgezhlt535gdl7psqys2ec8eegmqchfk4d",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsMkhrK0ptRjFNMDZaV0RR\nd1MzNzJhbTczb1RaQm4wdW5VNGZrTTVMOVJVCmdzdEcxVytRY1h5ek9GOFA0VUNn\nMUk5UHZEQWZKaVhkN3ZGeDJkbnRCbm8KLS0tIHJXSllWRVVIakNhSmFTMzA3cXk4\nUUFFNWp5Q1FyaFBFUnpDR0JKSHZQVVkKkaQrBjAYubsHVx2g9C+87sgY06ioXdb2\nwh4pyAwOT/0hKHR4sRnRFiW7yuTIZ8R9cWXlVUB53+LMeio93kj15g==\n-----END AGE ENCRYPTED FILE-----\n"
+			}
+		],
+		"lastmodified": "2024-08-02T17:52:14Z",
+		"mac": "ENC[AES256_GCM,data:aBhijdYLGnHlXzeT3J77RkhPgqBEYCDN4nINtnq7EA/AJIamdcbM1bW/PZBkeJ/1yft/lIzPgOsSnAk+vrc8FniOL6vmPaRr6aaPlgzZVHJw0ZPgRNANzwjEXZbtNdZn7tFPjEAu06B1oQFzfIXUYvj6Q3sPLzZ29lPl4g3BY6o=,iv:aL/TFzqw1/ArH88GGj68fTIPrUOXdOxF1XbcDDMFvKo=,tag:bjtutqs7QyqNdCI5/s9sUQ==,type:str]",
+		"pgp": null,
+		"unencrypted_suffix": "_unencrypted",
+		"version": "3.9.0"
+	}
+}
--- a/secrets/diphda/secrets.yaml
+++ b/secrets/diphda/secrets.yaml
@@ -0,0 +1,50 @@
+mc-arcadia:
+    repo_password: ENC[AES256_GCM,data:SPP/RmwxAeeyERrMjO7vEqMd/SY=,iv:/U4sbPogBeqJ4vli2MmMb4H4BjMPFO+Fe/uRtyltvsM=,tag:i06a7yIDmhYJt3ARfDaE4w==,type:str]
+tandoor:
+    secret_key: ENC[AES256_GCM,data:0zhzBw+99NZmWDhnhe/VNAuiY30QJVaij3+PabzzSvWExyHktvqjfHrEzNAU8i+GmmA=,iv:NwZrE4tFpylnVrQiL1yNTTS8moZuEvcO8HCTP+j7COE=,tag:UegszyE5xRfIRn62kTFR8Q==,type:str]
+    db_password: ENC[AES256_GCM,data:lkYU5lFHDo+4/6uVuV6VZ6/XQHQ=,iv:1Htc76J25m9iW6YCosEtSGT4nfYsfywbYVoAf7XXrDI=,tag:RdymUdMjiQqRPutTsQNGaw==,type:str]
+mc-dh:
+    repo_password: ENC[AES256_GCM,data:iD1isjDUlJixMPaiE+bDhhKgzLM=,iv:pf9q2M8wRh7B0quYaezdZ81B/8JtsN7jFj8/00YXzcQ=,tag:f5/KHzsc+B21sF+dE8I2Nw==,type:str]
+caddy:
+    porkbun_api_key: ENC[AES256_GCM,data:1ILVkhIks0MqMWXsxIol8Nt2OAbNmDQXd49DUhEyIx6jLpzZKe98ha9cZAl0rNmQHcIQjpg4KptXw07l11KXWZf5oZA=,iv:0q/ZLzAGsOsTvJH9Wa7lR+uC/t97HWv6+SdTCRUNNcM=,tag:TzdrBPfV/e0njCSbofR29Q==,type:str]
+    porkbun_secret_key: ENC[AES256_GCM,data:v7vFKRcZ2JqjNA1vQyROmM9LGLGclzraZB9sqUVfK3iaDJfVlLbAyOxv8TW15navjWRTn6WjxH1iwPlB6b4WWHtuUWs=,iv:4d1K8tTZ/9Gs7nOKjCwcQB0M9E68RFppxPkOQRRSwa8=,tag:6J2pxXP3yy5IK3rDiwTFIQ==,type:str]
+backup:
+    repo_password: ENC[AES256_GCM,data:v7WGvvpUonAAfCCGqDs+EKUH6Lk=,iv:jE7lainNWLlG+KZspwxW/I/1PXKFtkUWUPDaTK3Rgj0=,tag:dA2ccAXUNC1up4DX4iF7HQ==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age1079fszreaakwf6xnwu9kra8xcsp4e8q8ed3y99yrhjnz9n3t9pnsj05m97
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiblIrc1pIWVhESHNGZU00
+            aElkZ2ZSOFJGeGM1V2xjSUpyUWZsTDhmNENvCkFtWWh6Wk8xK2Nlb3hsQUE4Y1hQ
+            NVpwNk9yYTZHbVhXV0d3bktYTWxqRVEKLS0tIFFnTzU4L1RGWVFHc09RMkhaN3ky
+            ejlTdlIvRVVtRDYxcjYwZTFUSW4rY0EKIsobfykO/WXNb2zIIIdAKnGwIDVyLU9m
+            q6wF9O9Y8MQFCe237KWDtqSr8K9S4bI+S2GkO6+abMCCPMcTrcZ04Q==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1gdtjn3jgvvvspa86q3lnklflnvyf3s75y2rw23l7nk7hwcsfpg7qkq7msr
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaVUkxWGIzTFdkVmRaWGFw
+            ZzU1TVU4ZUxhVU5wcmdnT0c5UlVaYU15QVF3ClVJc1Q5YmFadFkvS0NIQzF6NXdK
+            M0lhNzFyVkUwa1EyM3dMUXRHQkxGNG8KLS0tIFpUTEZRL1hTaTFZUEdLSE51YTlu
+            Y0N4bDJveTlPQjJhMERtbmlFUVlkMDQKX8JV+0FhyZKYUy2QpkHW9UZqDasLop3f
+            IA0qas8CN/O+VrnFVwKFrRdk4U/nHR2fb3mEsQ8rXmzsXPy2GfMD4A==
+            -----END AGE ENCRYPTED FILE-----
+        - recipient: age1rxqyz6watg05r3rzlme7grpgfgezhlt535gdl7psqys2ec8eegmqchfk4d
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAzcXEwZEhsbytKVk8ybEg3
+            V0pmOFJ3RGxWcHFWYm16N1RzNUpIcjM3azI4CjIvQnlyWkxKNkdsUGFsTVl2elQ0
+            MFBVR2M5eEFVMW5EdGN5YTFjdjYzY1UKLS0tIEtPTFM0Q3ZsdTkzS1FrU0N5WFNL
+            eUxTaTJVRlpNNWZodE8yZXpWTlpCWVkKHtJFmHUSNfy46J1BJdOvIRjegQrTWdfH
+            KSbKbz7ezBOOPlrR7eDEx2FIjP4TVBRksYq+NYockmKVk+VGsc5pBQ==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2025-02-02T03:11:38Z"
+    mac: ENC[AES256_GCM,data:Mr5WWzX4hl3SkljEuMy0cl+jgxA9iL4ONXxEmdfS320ucIBKeMWyrmgoO7LxRAT+iQ4kXKTW24yzzLH1flqYxiVvdGvaKisfao7GSkeuF+9YeM+xFev0aspxOK5p7/EYbvnE5cMM81VVhXm+gX9ywxh8r0eqG68SQK8FIP556TM=,iv:AsYcYrMdwo4zuY5G12P47P1537lydofIt/zuPQo/9Ls=,tag:EKs6kyofkiWuF+uqoQscWA==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.9.3
--- a/secrets/shared/Codelia-Bold
+++ b/secrets/shared/Codelia-Bold
--- a/secrets/shared/Codelia-BoldItalic
+++ b/secrets/shared/Codelia-BoldItalic
--- a/secrets/shared/Codelia-Italic
+++ b/secrets/shared/Codelia-Italic
--- a/secrets/shared/Codelia-Regular
+++ b/secrets/shared/Codelia-Regular
Author	SHA1	Message	Date
Ethan Simmons	c3f1f0bfb1	Update ankaa	2025-12-17 11:57:02 -06:00
Ethan Simmons	9eddcb81db	Add anki and update	2025-10-30 18:47:55 -05:00
Ethan Simmons	f475232dd4	Add Vintage Story to games	2025-10-30 18:47:32 -05:00
Ethan Simmons	a60f8e3412	Add citrix to alpheratz	2025-09-02 11:51:55 -05:00
Ethan Simmons	170fe3a1dc	Update alpheratz	2025-09-02 11:44:22 -05:00
Ethan Simmons	bf25d47f15	Add matlab	2025-09-02 11:44:22 -05:00
Ethan Simmons	f14771fe14	Update alpheratz	2025-09-02 11:44:22 -05:00
Ethan Simmons	ef753f2450	Add temporary workaround for citrix	2025-09-01 19:31:24 -05:00
Ethan Simmons	b4055e9364	Update ankaa	2025-09-01 19:31:13 -05:00
Ethan Simmons	53f8093cdb	Update ankaa	2025-08-17 12:25:47 -05:00
Ethan Simmons	cef4d8654a	Update alpheratz	2025-08-17 12:20:42 -05:00
Ethan Simmons	6fd520839b	Add bluetooth shortcut	2025-07-27 11:43:14 -05:00
Ethan Simmons	11de4c2054	Setup optical drive	2025-07-27 11:43:14 -05:00
Ethan Simmons	b2b8ee0699	Add jp ocr shortcut	2025-07-27 11:43:14 -05:00
Ethan Simmons	748accf147	Add discord for alpheratz	2025-07-27 11:43:14 -05:00
Ethan Simmons	2ee0e60f05	Fix ankaa keyboard	2025-07-08 11:50:37 -05:00
Ethan Simmons	a04a60543d	Update ankaa	2025-07-08 11:04:07 -05:00
Ethan Simmons	1702260451	Update alpheratz	2025-05-29 13:34:12 -05:00
Ethan Simmons	a9b49ffbfb	Update wireguard config	2025-05-29 12:59:12 -05:00
Ethan Simmons	e48c699eeb	Change keybind to switch keyboard layout	2025-05-24 11:50:49 -05:00
Ethan Simmons	76ccbfb451	Add new package and change music player	2025-05-12 11:33:31 -05:00
Ethan Simmons	a9338cb8b5	Add ports and change NFS IP for diphda	2025-05-12 11:29:48 -05:00
Ethan Simmons	746f6b6402	Add new applications for school	2025-04-06 15:09:42 -05:00
Ethan Simmons	cd2f9db375	Switch ankaa terminal to kitty	2025-04-06 13:44:08 -05:00
Ethan Simmons	c0af1940a3	Update ankaa	2025-04-05 19:07:32 -05:00
Ethan Simmons	f4aeaa9f12	Change screenshot command	2025-04-05 18:51:17 -05:00
Ethan Simmons	d61db2ded8	Edit nvim config	2025-04-05 18:51:17 -05:00
Ethan Simmons	dd0df124f9	Add shadps4 package	2025-04-05 18:51:17 -05:00
Ethan Simmons	d68035d1ba	Update alpheratz	2025-04-05 13:20:05 -05:00
Ethan Simmons	cf89db66c5	Add quartus to packages	2025-03-19 16:14:49 -05:00
Ethan Simmons	bdd457512a	Fix backup	2025-03-19 16:14:49 -05:00
Ethan Simmons	01a1c7089a	Remove jp keyboard layout	2025-02-23 11:43:35 -06:00
Ethan Simmons	39031aab84	Update neovim config	2025-02-16 15:10:30 -06:00
Ethan Simmons	62dd32207d	Setup japanese input	2025-02-16 14:58:51 -06:00
Ethan Simmons	807500b2ec	Add fonts	2025-02-13 21:45:22 -06:00
Ethan Simmons	d982906c39	Edit nvim config	2025-02-13 21:45:12 -06:00
Ethan Simmons	cab5cebdad	Add excludes for ankaa backups	2025-02-02 13:39:12 -06:00
Ethan Simmons	1ea4d41852	Add backup for diphda	2025-02-02 11:03:11 -06:00
Ethan Simmons	9c26cd9dc5	Remove unused services from diphda config	2025-02-01 21:12:18 -06:00
Ethan Simmons	8ffd3c0de4	Change key name	2025-02-01 21:11:44 -06:00
Ethan Simmons	37e85d1980	Add backup key for diphda	2025-02-01 21:06:20 -06:00
Ethan Simmons	bea4a38199	Update diphda	2025-02-01 20:46:39 -06:00
Ethan Simmons	59d55a4a57	Update flake.lock	2025-02-01 20:36:06 -06:00
Ethan Simmons	ace4589f0b	Add beets	2025-02-01 20:19:57 -06:00
Ethan Simmons	68dc490280	Fix caddy keys	2025-02-01 20:19:57 -06:00
Ethan Simmons	9aed4fc0f1	Change typst lsp for nvim	2025-01-28 20:21:33 -06:00
Ethan Simmons	36878b901b	Update ankaa	2025-01-27 20:20:25 -06:00
Ethan Simmons	77c7c6b5b8	Remove gamescope overlay	2025-01-22 20:02:51 -06:00
Ethan Simmons	3b0395afc5	Add alpheratz backup settings	2024-12-18 19:07:43 -06:00
Ethan Simmons	dff2f542ce	Add orca and remove udisks	2024-12-01 12:11:32 -06:00
Ethan Simmons	6994a7cd81	Add udisks	2024-12-01 12:11:32 -06:00
Ethan Simmons	5fb099f6fa	Add kitty terminal to alpheratz	2024-11-20 11:44:56 -06:00
Ethan Simmons	04696bfd6d	Update ankaa	2024-11-16 12:18:57 -06:00
Ethan Simmons	069b28a044	Add udev rule for vial	2024-11-16 12:13:37 -06:00
Ethan Simmons	e590d46fb4	Update ankaa	2024-11-16 12:13:37 -06:00
Ethan Simmons	00656207bb	Edit sway config	2024-11-16 12:10:06 -06:00
Ethan Simmons	9ba8a1c12c	Clean up unused files	2024-11-13 12:32:33 -06:00
Ethan Simmons	af0538d0ad	Update alpheratz	2024-11-13 12:31:11 -06:00
Ethan Simmons	b7b7575c9a	Update ankaa	2024-11-01 21:48:41 -05:00
Ethan Simmons	fe2b03f05f	Update ankaa and fix renamed package	2024-10-22 20:15:09 -05:00
Ethan Simmons	bc1e5f662c	Re-add anki	2024-10-22 20:14:48 -05:00
Ethan Simmons	1d20f77641	Move diphda caddy keys	2024-10-22 14:56:35 -05:00
Ethan Simmons	24efea29a8	Add minecraft server backup	2024-10-21 16:47:20 -05:00
Ethan Simmons	40d00c42f7	Update diphda	2024-10-21 16:40:27 -05:00
Ethan Simmons	57946e0735	Add secret for diphda	2024-10-21 16:39:30 -05:00
Ethan Simmons	2ac79a056a	Change alpheratz sops key location	2024-10-21 12:34:51 -05:00
Ethan Simmons	5b9124a80a	Add jujutsu package	2024-10-20 15:29:58 -05:00
Ethan Simmons	dff532246f	Add citrix fixes	2024-10-20 15:14:05 -05:00
Ethan Simmons	7e3cbdf0cb	Update alpheratz and add new key	2024-10-18 12:04:02 -05:00
Ethan Simmons	6361f1666b	Update ankaa	2024-10-16 22:35:53 -05:00
Ethan Simmons	ff27ee7d7a	Update ankaa	2024-10-16 22:33:20 -05:00
Ethan Simmons	120bdea6ca	Update alpheratz	2024-10-08 11:16:47 -05:00
Ethan Simmons	fc29f76a8f	Add fonts and disable cups	2024-10-08 11:15:14 -05:00
Ethan Simmons	f078725db0	Add bottles to alpheratz	2024-09-23 12:20:46 -05:00
Ethan Simmons	ac836bfd4b	Update alpheratz	2024-09-16 12:31:50 -05:00
Ethan Simmons	7bf17aabc1	Change secret owner	2024-09-15 19:34:28 -05:00
Ethan Simmons	cea298006f	Update ankaa config	2024-09-15 19:31:18 -05:00
Ethan Simmons	5e8cc7e3b1	Revert ssh settings	2024-09-08 11:55:12 -05:00
Ethan Simmons	fa51599178	Update ankaa config	2024-09-08 11:53:36 -05:00
Ethan Simmons	a3eeb9c347	Update ankaa config	2024-09-08 11:52:42 -05:00
Ethan Simmons	ce0f62103a	Update flake.lock	2024-09-08 11:52:17 -05:00
Ethan Simmons	bd927c0761	Add school to ankaa config	2024-09-08 11:51:52 -05:00
Ethan Simmons	d77a69af03	Add pciutils	2024-09-08 11:43:23 -05:00
Ethan Simmons	d9c523cd53	Add nvim plugin and update vpn	2024-08-31 13:44:37 -05:00
Ethan Simmons	5128e70e35	Add new secrets to config	2024-08-13 14:33:41 -05:00
Ethan Simmons	cde0f30b68	Update diphda and add port to firewall	2024-08-13 14:33:41 -05:00
Ethan Simmons	bbf3f37bac	More acme setup	2024-08-13 14:33:41 -05:00
Ethan Simmons	3f739e3b32	Finish acme setup	2024-08-13 14:33:41 -05:00
Ethan Simmons	339d4af34c	Update diphda	2024-08-13 14:33:41 -05:00
Ethan Simmons	254b591a80	Update diphda	2024-08-13 14:33:41 -05:00
Ethan Simmons	a07fb93bfe	Update diphda	2024-08-13 14:33:41 -05:00
Ethan Simmons	cd4dfddec5	Add diphda secrets	2024-08-13 14:26:13 -05:00
Ethan Simmons	b6fd3e5a17	Disable wireguard autostart	2024-08-11 20:33:36 -05:00
Ethan Simmons	c94f6e3956	Update laptop config	2024-08-11 20:33:29 -05:00
Ethan Simmons	34902172ee	Remove unused secrets and update ankaa	2024-08-02 13:36:20 -05:00
Ethan Simmons	1b1f769d0d	Edit secrets	2024-08-02 12:53:25 -05:00
Ethan Simmons	55fe8e12b1	Edit secrets	2024-08-02 12:30:08 -05:00
Ethan Simmons	444726af6c	Remove attempt to add display manager	2024-07-22 14:44:18 -05:00
Ethan Simmons	cd9a2df603	Change fish config to use vi key bindings	2024-07-15 12:31:45 -05:00
Ethan Simmons	f03698c117	Remove gamescope overlay and update ankaa	2024-07-15 12:26:09 -05:00
Ethan Simmons	b08d50f4c2	Move fish config to shared	2024-07-15 12:20:30 -05:00
Ethan Simmons	eda64c4482	Revert to deprecated hardware.opengl.enable because new option not available in stable	2024-07-15 12:17:00 -05:00
Ethan Simmons	804f0fde90	Update server config	2024-07-15 12:08:51 -05:00
Ethan Simmons	eca1c0fddb	Update jhelioviewer package	2024-07-10 08:55:54 -05:00
Ethan Simmons	a0c01ff9e6	Remove hostname flake	2024-07-06 16:56:01 -05:00
Ethan Simmons	d8d07896fe	Restructure flake.nix and add JHelioviewer package	2024-07-06 16:50:32 -05:00
Ethan Simmons	4424978387	Add laptop module and remove unused dotfiles	2024-06-25 13:12:17 -05:00
Ethan Simmons	dee11161e8	Add laptop ssh key to server	2024-06-23 20:44:34 -05:00
Ethan Simmons	1febb52eda	Update sops permissions	2024-06-23 20:11:53 -05:00
Ethan Simmons	c2744d9814	Update system	2024-06-23 20:10:24 -05:00
Ethan Simmons	10e08a1fd8	Add secrets for laptop	2024-06-23 20:03:33 -05:00
Ethan Simmons	16fa1884e9	More configuration for docker containers	2024-06-22 20:12:23 -05:00
Ethan Simmons	55a9a835b9	Fix gtk config	2024-06-22 20:11:29 -05:00
Ethan Simmons	1e7cb6da53	Update system	2024-06-22 20:09:49 -05:00
Ethan Simmons	4e6cf6bf92	Add sops-nix	2024-06-17 22:17:55 -05:00
Ethan Simmons	4910af0d2c	Move options to seperate modules so they can be shared between home manager and nixos	2024-06-17 17:43:14 -05:00
Ethan Simmons	8f66309008	Add minecraft to games	2024-06-17 16:53:43 -05:00
Ethan Simmons	3c28cb1d45	Set up new server	2024-06-17 16:52:48 -05:00
Ethan Simmons	610e3f8009	Add new system	2024-06-16 23:12:38 +00:00
Ethan Simmons	c8ccbac32c	Change flake.nix to allow different nixpkgs versions	2024-06-14 20:32:52 -05:00
Ethan Simmons	0a8ded6db3	Move nvim config to shared	2024-06-08 14:14:26 -05:00
Ethan Simmons	4a914da23e	Update sway config and flake.nix	2024-06-07 18:47:10 -05:00
Ethan Simmons	76e3492a30	Spelling error	2024-06-06 19:51:02 -05:00
Ethan Simmons	215dea859c	Provide example hostname flake and	2024-06-06 19:50:20 -05:00
Ethan Simmons	245beea2bd	Merge configs	2024-06-06 19:33:33 -05:00
Ethan Simmons	09099bf87c	Fix laptop config	2024-06-06 19:25:55 -05:00