22 changed files with 224 additions and 349 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,12 +1,12 @@
 [submodule "dotfiles/config/taffybar/taffybar"]
 	path = dotfiles/config/taffybar/taffybar
-	url = git@github.com:taffybar/taffybar.git
+	url = ../../taffybar/taffybar.git
 [submodule "dotfiles/xmonad/xmonad"]
 	path = dotfiles/config/xmonad/xmonad
-	url = git@github.com:xmonad/xmonad.git
+	url = ../xmonad.git
 [submodule "dotfiles/xmonad/xmonad-contrib"]
 	path = dotfiles/config/xmonad/xmonad-contrib
-	url = git@github.com:xmonad/xmonad-contrib.git
+	url = ../xmonad-contrib.git
 [submodule "dotfiles/config/alacritty/themes"]
 	path = dotfiles/config/alacritty/themes
 	url = https://github.com/alacritty/alacritty-theme
--- a/dotfiles/gitconfig
+++ b/dotfiles/gitconfig
@ -88,6 +88,12 @@
 [rerere]
 	enabled = false

+[url "ssh://git@github.com/uber/"]
+	insteadOf = https://github.com/uber/
+
+[url "ssh://gitolite@code.uber.internal:2222/"]
+	insteadOf = https://code.uber.internal/
+
 [branch]
 	autosetuprebase = always

--- a/nixos/cache-server.nix
+++ b/nixos/cache-server.nix
@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, makeEnable, lib, ... }:
 with lib;
 let cfg = config.modules.cache-server;
 in
@ -8,7 +8,7 @@ in
      enable = mkEnableOption "nix cache server";
      port = mkOption {
        type = types.int;
-        default = 5050;
+        default = 8080;
      };
      host-string = mkOption {
        type = types.string;
@ -27,7 +27,18 @@ in
    services.nix-serve = {
      enable = true;
      secretKeyFile = config.age.secrets."cache-priv-key.pem".path;
-      port = cfg.port;
+      port = 5050;
+    };
+
+    services.nginx = {
+      enable = true;
+      recommendedProxySettings = true;
+      virtualHosts = {
+        "${cfg.host-string}" = {
+          locations."${cfg.path}".proxyPass = "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}";
+          listen = [ { addr = "0.0.0.0"; port = cfg.port; } ];
+        };
+      };
    };
  };
 }
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@ -3,8 +3,8 @@
  imports = [
    ./android.nix
    ./base.nix
-    ./cache-server.nix
    ./cache.nix
+    ./cache-server.nix
    ./code.nix
    ./desktop.nix
    ./environment.nix
@ -12,10 +12,8 @@
    ./extra.nix
    ./games.nix
    ./git-sync.nix
-    ./gitea-runner.nix
    ./gitea.nix
-    ./gnome.nix
-    ./electron.nix
+    ./gitea-runner.nix
    ./imalison.nix
    ./internet-computer.nix
    ./kat.nix
@ -23,7 +21,6 @@
    ./nix.nix
    ./nixified.ai.nix
    ./options.nix
-    ./plasma.nix
    ./secrets.nix
    ./ssh.nix
    ./syncthing.nix
@ -39,15 +36,12 @@
  config = lib.mkIf config.features.full.enable {
    modules.base.enable = true;
    modules.desktop.enable = true;
-    modules.plasma.enable = true;
-    modules.gnome.enable = false;
    modules.xmonad.enable = true;
    modules.extra.enable = true;
-    modules.electron.enable = true;
    modules.code.enable = true;
    modules.games.enable = true;
    modules.syncthing.enable = true;
    modules.fonts.enable = true;
-    modules.nixified-ai.enable = false;
+    modules.nixified-ai.enable = true;
  };
 }
--- a/nixos/desktop.nix
+++ b/nixos/desktop.nix
@ -1,4 +1,4 @@
-{ config, pkgs, makeEnable, forEachUser, ... }:
+{ config, pkgs, options, inputs, makeEnable, forEachUser, ... }:
 makeEnable config "modules.desktop" true {
  imports = [
    ./fonts.nix
@ -8,7 +8,13 @@ makeEnable config "modules.desktop" true {
    exportConfiguration = true;
    enable = true;
    layout = "us";
+    desktopManager = {
+      plasma5.enable = true;
+    };
    displayManager = {
+      sddm = {
+        enable = true;
+      };
      sessionCommands = ''
        systemctl --user import-environment GDK_PIXBUF_MODULE_FILE DBUS_SESSION_BUS_ADDRESS PATH
      '';
@ -55,6 +61,7 @@ makeEnable config "modules.desktop" true {
    clipit
    dfeet
    dolphin
+    element-desktop

    feh
    firefox
@ -97,12 +104,35 @@ makeEnable config "modules.desktop" true {
    graphviz
    nodePackages.mermaid-cli
  ] ++ (if pkgs.system == "x86_64-linux" then with pkgs; [
+    bitwarden
+    discord
+    etcher
    google-chrome
+    keybase-gui
    pommed_light
    slack
    spicetify-cli
    spotify
    tor-browser-bundle-bin
    vscode
+    zoom-us
  ] else []);
+
+  home-manager.users = forEachUser (if pkgs.system == "x86_64-linux" then {
+    systemd.user.services.bitwarden = {
+      Unit = {
+        Description = "Bitwarden";
+        After = [ "graphical-session-pre.target" "tray.target" ];
+        PartOf = [ "graphical-session.target" ];
+      };
+
+      Install = { WantedBy = [ "graphical-session.target" ]; };
+
+      Service = {
+        ExecStart = "${pkgs.bitwarden}/bin/bitwarden";
+        Restart = "always";
+        RestartSec = 3;
+      };
+    };
+  } else {});
 }
--- a/nixos/electron.nix
+++ b/nixos/electron.nix
@ -1,28 +0,0 @@
-{ pkgs, config, makeEnable, forEachUser, ... }:
-makeEnable config "modules.electron" false {
-  environment.systemPackages = with pkgs; [
-    # element-desktop
-    # bitwarden
-    discord
-    # etcher
-    # keybase-gui
-    zoom-us
-  ];
-  home-manager.users = forEachUser (if pkgs.system == "x86_64-linux" then {
-    # systemd.user.services.bitwarden = {
-    #   Unit = {
-    #     Description = "Bitwarden";
-    #     After = [ "graphical-session-pre.target" "tray.target" ];
-    #     PartOf = [ "graphical-session.target" ];
-    #   };
-
-    #   Install = { WantedBy = [ "graphical-session.target" ]; };
-
-    #   Service = {
-    #     ExecStart = "${pkgs.bitwarden}/bin/bitwarden";
-    #     Restart = "always";
-    #     RestartSec = 3;
-    #   };
-    # };
-  } else {});
-}
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@ -7,11 +7,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1696775529,
+        "lastModified": 1695384796,
        "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=",
        "owner": "ryantm",
        "repo": "agenix",
-        "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4",
+        "rev": "1f677b3e161d3bdbfd08a939e8f25de2568e0ef4",
        "type": "github"
      },
      "original": {
@ -61,11 +61,11 @@
    "flake-compat_2": {
      "flake": false,
      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
        "type": "github"
      },
      "original": {
@ -114,11 +114,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1685662779,
-        "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
+        "lastModified": 1677714448,
+        "narHash": "sha256-Hq8qLs8xFu28aDjytfxjdC96bZ6pds21Yy09mSC156I=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
+        "rev": "dc531e3a9ce757041e1afaff8ee932725ca60002",
        "type": "github"
      },
      "original": {
@ -132,11 +132,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1685662779,
-        "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
+        "lastModified": 1673362319,
+        "narHash": "sha256-Pjp45Vnj7S/b3BRpZEVfdu8sqqA6nvVjvYu59okhOyI=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
+        "rev": "82c16f1682cf50c01cb0280b38a1eed202b3fe9f",
        "type": "github"
      },
      "original": {
@ -154,11 +154,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1685662779,
-        "narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=",
+        "lastModified": 1666885127,
+        "narHash": "sha256-uXA/3lhLhwOTBMn9a5zJODKqaRT+SuL5cpEmOz2ULoo=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3",
+        "rev": "0e101dbae756d35a376a5e1faea532608e4a4b9a",
        "type": "github"
      },
      "original": {
@ -188,6 +188,21 @@
      }
    },
    "flake-utils_2": {
+      "locked": {
+        "lastModified": 1667077288,
+        "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_3": {
      "inputs": {
        "systems": "systems"
      },
@ -205,7 +220,7 @@
        "type": "github"
      }
    },
-    "flake-utils_3": {
+    "flake-utils_4": {
      "inputs": {
        "systems": "systems_2"
      },
@ -223,7 +238,7 @@
        "type": "github"
      }
    },
-    "flake-utils_4": {
+    "flake-utils_5": {
      "inputs": {
        "systems": "systems_4"
      },
@ -396,22 +411,6 @@
        "type": "github"
      }
    },
-    "haskell-flake": {
-      "locked": {
-        "lastModified": 1684780604,
-        "narHash": "sha256-2uMZsewmRn7rRtAnnQNw1lj0uZBMh4m6Cs/7dV5YF08=",
-        "owner": "srid",
-        "repo": "haskell-flake",
-        "rev": "74210fa80a49f1b6f67223debdbf1494596ff9f2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "srid",
-        "ref": "0.3.0",
-        "repo": "haskell-flake",
-        "type": "github"
-      }
-    },
    "haskell-hie-bios": {
      "flake": false,
      "locked": {
@ -481,7 +480,7 @@
    "haskell-language-server": {
      "inputs": {
        "flake-compat": "flake-compat_3",
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_4",
        "fourmolu-011": "fourmolu-011",
        "fourmolu-012": "fourmolu-012",
        "gitignore": "gitignore",
@ -516,7 +515,7 @@
    "haskell-language-server_2": {
      "inputs": {
        "flake-compat": "flake-compat_4",
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_5",
        "fourmolu-011": "fourmolu-011_2",
        "fourmolu-012": "fourmolu-012_2",
        "gitignore": "gitignore_2",
@ -551,15 +550,16 @@
    "hercules-ci-agent": {
      "inputs": {
        "flake-parts": "flake-parts_3",
-        "haskell-flake": "haskell-flake",
-        "nixpkgs": "nixpkgs_3"
+        "nix-darwin": "nix-darwin",
+        "nixpkgs": "nixpkgs_3",
+        "pre-commit-hooks-nix": "pre-commit-hooks-nix"
      },
      "locked": {
-        "lastModified": 1686721748,
-        "narHash": "sha256-ilD6ANYID+b0/+GTFbuZXfmu92bqVqY5ITKXSxqIp5A=",
+        "lastModified": 1673183923,
+        "narHash": "sha256-vb+AEQJAW4Xn4oHsfsx8H12XQU0aK8VYLtWYJm/ol28=",
        "owner": "hercules-ci",
        "repo": "hercules-ci-agent",
-        "rev": "7192b83935ab292a8e894db590dfd44f976e183b",
+        "rev": "b3f8aa8e4a8b22dbbe92cc5a89e6881090b933b3",
        "type": "github"
      },
      "original": {
@ -577,11 +577,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1686830987,
-        "narHash": "sha256-1XLTM0lFr3NV+0rd55SQW/8oQ3ACnqlYcda3FelIwHU=",
+        "lastModified": 1676558019,
+        "narHash": "sha256-obUHCMMWbffb3k0b9YIChsJ2Z281BcDYnTPTbJRP6vs=",
        "owner": "hercules-ci",
        "repo": "hercules-ci-effects",
-        "rev": "04e4ab63b9eed2452edee1bb698827e1cb8265c6",
+        "rev": "fdbc15b55db8d037504934d3af52f788e0593380",
        "type": "github"
      },
      "original": {
@ -700,11 +700,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1700261679,
-        "narHash": "sha256-jpQq/rJnjhkUHXz/KOQxk6fSfF7H0vV9PjFvfgTFHG8=",
+        "lastModified": 1696145345,
+        "narHash": "sha256-3dM7I/d4751SLPJah0to1WBlWiyzIiuCEUwJqwBdmr4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "3feeb7715584fd45ed1389cec8fb15f6930e8dab",
+        "rev": "6f9b5b83ad1f470b3d11b8a9fe1d5ef68c7d0e30",
        "type": "github"
      },
      "original": {
@ -730,7 +730,7 @@
      },
      "locked": {
        "lastModified": 1,
-        "narHash": "sha256-rua03PcdrDhQoRjqAVHqUHfTUazlK0L1Pw8iIMM+YDA=",
+        "narHash": "sha256-ull5epb7JsgkrUEfC+p9j0dPjJKix8Kbn3/J7NSFfY8=",
        "path": "../dotfiles/config/taffybar",
        "type": "path"
      },
@ -742,20 +742,37 @@
    "invokeai-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1697424725,
-        "narHash": "sha256-y3nxZ4PQ/d2wMX1crpJPDMYXf48YBG0sRIBOTgN6XlI=",
+        "lastModified": 1677475057,
+        "narHash": "sha256-REtyVcyRgspn1yYvB4vIHdOrPRZRNSSraepHik9MfgE=",
        "owner": "invoke-ai",
        "repo": "InvokeAI",
-        "rev": "ad786130ffb11f91cbfcc40846114dd1fdcecdf6",
+        "rev": "650f4bb58ceca458bff1410f35cd6d6caad399c6",
        "type": "github"
      },
      "original": {
        "owner": "invoke-ai",
-        "ref": "v3.3.0post3",
+        "ref": "v2.3.1.post2",
        "repo": "InvokeAI",
        "type": "github"
      }
    },
+    "koboldai-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1668957963,
+        "narHash": "sha256-fKQ/6LiMmrfSWczC5kcf6M9cpuF9dDYl2gJ4+6ZLSdY=",
+        "owner": "koboldai",
+        "repo": "koboldai-client",
+        "rev": "f2077b8e58db6bd47a62bf9ed2649bb0711f9678",
+        "type": "github"
+      },
+      "original": {
+        "owner": "koboldai",
+        "ref": "1.19.2",
+        "repo": "koboldai-client",
+        "type": "github"
+      }
+    },
    "lowdown-src": {
      "flake": false,
      "locked": {
@ -866,20 +883,43 @@
        "type": "github"
      }
    },
+    "nix-darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "nixified-ai",
+          "hercules-ci-effects",
+          "hercules-ci-agent",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1667419884,
+        "narHash": "sha256-oLNw87ZI5NxTMlNQBv1wG2N27CUzo9admaFlnmavpiY=",
+        "owner": "LnL7",
+        "repo": "nix-darwin",
+        "rev": "cfc0125eafadc9569d3d6a16ee928375b77e3100",
+        "type": "github"
+      },
+      "original": {
+        "owner": "LnL7",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
    "nixified-ai": {
      "inputs": {
        "flake-parts": "flake-parts",
        "hercules-ci-effects": "hercules-ci-effects",
        "invokeai-src": "invokeai-src",
-        "nixpkgs": "nixpkgs_4",
-        "textgen-src": "textgen-src"
+        "koboldai-src": "koboldai-src",
+        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
-        "lastModified": 1698023400,
-        "narHash": "sha256-2wrm9Y9gsI/OaZEsTqc2wflkfxlrvCRocJHpqkOm/Cc=",
+        "lastModified": 1685671845,
+        "narHash": "sha256-qVA3wIxPb9PIFqa9Wf2a9jRMeMhE4kWw2y3oPSuRHU4=",
        "owner": "nixified-ai",
        "repo": "flake",
-        "rev": "7b9730e0a75bcd6375b0780aef75e406ea20a9a4",
+        "rev": "0c58f8cba3fb42c54f2a7bf9bd45ee4cbc9f2477",
        "type": "github"
      },
      "original": {
@ -890,11 +930,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1699997707,
-        "narHash": "sha256-ugb+1TGoOqqiy3axyEZpfF6T4DQUGjfWZ3Htry1EfvI=",
+        "lastModified": 1696161939,
+        "narHash": "sha256-HI1DxS//s46/qv9dcW06TzXaBjxL2DVTQP8R1QsnHzM=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "5689f3ebf899f644a1aabe8774d4f37eb2f6c2f9",
+        "rev": "0ab3ee718e964fb42dc57ace6170f19cb0b66532",
        "type": "github"
      },
      "original": {
@ -906,15 +946,15 @@
    "nixos-wsl": {
      "inputs": {
        "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
        "nixpkgs": "nixpkgs_5"
      },
      "locked": {
-        "lastModified": 1700096639,
-        "narHash": "sha256-FVOTqjwjLX4El7n3jErrWWQ4gR5NVcL7B8cvGRGFQSo=",
+        "lastModified": 1696053802,
+        "narHash": "sha256-8TTbJbtGDz1MstExrVQe56eXZpovvZv6G6L6q/4NOKg=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "83ce0dbe362b9b866414bbc31a2dc9f1d41be649",
+        "rev": "cadde47d123d1a534c272b04a7582f1d11474c48",
        "type": "github"
      },
      "original": {
@ -942,11 +982,11 @@
    "nixpkgs-lib": {
      "locked": {
        "dir": "lib",
-        "lastModified": 1685564631,
-        "narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=",
+        "lastModified": 1672350804,
+        "narHash": "sha256-jo6zkiCabUBn3ObuKXHGqqORUMH27gYDIFFfLq5P4wg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a",
+        "rev": "677ed08a50931e38382dbef01cba08a8f7eac8f6",
        "type": "github"
      },
      "original": {
@ -975,11 +1015,11 @@
    },
    "nixpkgs-regression_2": {
      "locked": {
-        "lastModified": 1700284104,
-        "narHash": "sha256-oNsJfAyAuBCTkusesiK0LWuO59F6vEGcP4wwa7kc1ZA=",
+        "lastModified": 1696214716,
+        "narHash": "sha256-Buev0E1vvNdjI8MOsJd8GtgSI0/BRPZZTsBtUC0HDbY=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "005617587ee2b7c003388b4539b9120ebcc90e44",
+        "rev": "6f7933059d0a9e8c8a9cb00a59c05e35c53a5be5",
        "type": "github"
      },
      "original": {
@ -1006,11 +1046,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1686501370,
-        "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=",
+        "lastModified": 1672262501,
+        "narHash": "sha256-ZNXqX9lwYo1tOFAqrVtKTLcJ2QMKCr3WuIvpN8emp7I=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519",
+        "rev": "e182da8622a354d44c39b3d7a542dc12cd7baa5f",
        "type": "github"
      },
      "original": {
@ -1022,11 +1062,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1697059129,
-        "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=",
+        "lastModified": 1677932085,
+        "narHash": "sha256-+AB4dYllWig8iO6vAiGGYl0NEgmMgGHpy9gzWJ3322g=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593",
+        "rev": "3c5319ad3aa51551182ac82ea17ab1c6b0f0df89",
        "type": "github"
      },
      "original": {
@ -1038,11 +1078,11 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1697851979,
-        "narHash": "sha256-lJ8k4qkkwdvi+t/Xc6Fn74kUuobpu9ynPGxNZR6OwoA=",
+        "lastModified": 1695825837,
+        "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "5550a85a087c04ddcace7f892b0bdc9d8bb080c8",
+        "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
        "type": "github"
      },
      "original": {
@ -1054,11 +1094,11 @@
    },
    "nixpkgs_6": {
      "locked": {
-        "lastModified": 1699963925,
-        "narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=",
+        "lastModified": 1696019113,
+        "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "bf744fe90419885eefced41b3e5ae442d732712d",
+        "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a",
        "type": "github"
      },
      "original": {
@ -1175,6 +1215,30 @@
        "url": "https://hackage.haskell.org/package/ormolu-0.7.1.0/ormolu-0.7.1.0.tar.gz"
      }
    },
+    "pre-commit-hooks-nix": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixified-ai",
+          "hercules-ci-effects",
+          "hercules-ci-agent",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1667760143,
+        "narHash": "sha256-+X5CyeNEKp41bY/I1AJgW/fn69q5cLJ1bgiaMMCKB3M=",
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "06f48d63d473516ce5b8abe70d15be96a0147fcd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "type": "github"
+      }
+    },
    "root": {
      "inputs": {
        "agenix": "agenix",
@ -1361,43 +1425,23 @@
        ]
      },
      "locked": {
-        "lastModified": 1696612500,
-        "narHash": "sha256-Q19F91yVQviqxgY+FkvEwtX2vcw414eVtK8erim0NrU=",
-        "owner": "taffybar",
-        "repo": "taffybar",
-        "rev": "46eba89c2a4d4ffefe42c3ee4506d1b74c8e61fd",
-        "type": "github"
+        "lastModified": 1,
+        "narHash": "sha256-m73WjXb6o0r4iPhBUUPrRUpToe9giRJZe4Xu3yfWfwQ=",
+        "path": "../dotfiles/config/taffybar/taffybar",
+        "type": "path"
      },
      "original": {
-        "owner": "taffybar",
-        "repo": "taffybar",
-        "type": "github"
-      }
-    },
-    "textgen-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696789008,
-        "narHash": "sha256-+V8XOVnEyImj+a8uCkZXEHXW8bTIBRlnfMcQfcZNgqg=",
-        "owner": "oobabooga",
-        "repo": "text-generation-webui",
-        "rev": "2e471071af48e19867cfa522d2def44c24785c50",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oobabooga",
-        "ref": "v1.7",
-        "repo": "text-generation-webui",
-        "type": "github"
+        "path": "../dotfiles/config/taffybar/taffybar",
+        "type": "path"
      }
    },
    "unstable": {
      "locked": {
-        "lastModified": 1699963925,
-        "narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=",
+        "lastModified": 1696019113,
+        "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "bf744fe90419885eefced41b3e5ae442d732712d",
+        "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a",
        "type": "github"
      },
      "original": {
@ -1421,17 +1465,14 @@
        "unstable": "unstable"
      },
      "locked": {
-        "lastModified": 1699833963,
-        "narHash": "sha256-JNT6nnDJUvi/aPh9nOP7dQJGrfMdjzEabbHc+Qduwic=",
-        "owner": "xmonad",
-        "repo": "xmonad",
-        "rev": "2f585679120747defaa8b49880cbbab943b4c22c",
-        "type": "github"
+        "lastModified": 1,
+        "narHash": "sha256-dOrvPpypuNn/fAWY2XjMacpsAXEiMZ4Dll3Ot81iQL4=",
+        "path": "../dotfiles/config/xmonad/xmonad",
+        "type": "path"
      },
      "original": {
-        "owner": "xmonad",
-        "repo": "xmonad",
-        "type": "github"
+        "path": "../dotfiles/config/xmonad/xmonad",
+        "type": "path"
      }
    },
    "xmonad-contrib": {
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@ -22,7 +22,7 @@
    };

    xmonad = {
-      url = "github:xmonad/xmonad";
+      url = "path:../dotfiles/config/xmonad/xmonad";
      inputs = {
        nixpkgs.follows = "nixpkgs";
        flake-utils.follows = "flake-utils";
@ -31,7 +31,7 @@
    };

    taffybar = {
-      url = "github:taffybar/taffybar";
+      url = "path:../dotfiles/config/taffybar/taffybar";
      inputs = {
        nixpkgs.follows = "nixpkgs";
        flake-utils.follows = "flake-utils";
@ -154,7 +154,7 @@
        inherit inputs machineNames;
        makeEnable = (import ./make-enable.nix) nixpkgs.lib;
        mapValueToKeys = keys: value: builtins.listToAttrs (map (name: { inherit name value; }) keys);
-        realUsers = [ "root" "imalison" "kat" "dean" "alex" "will" ];
+        realUsers = [ "root" "imalison" "kat" "dean" "alex" ];
        forEachUser = mapValueToKeys realUsers;
        keys = (import ./keys.nix);
      } // specialArgs;
--- a/nixos/games.nix
+++ b/nixos/games.nix
@ -2,7 +2,7 @@
 makeEnable config "modules.games" false {
  environment.systemPackages = with pkgs; [
    steam
-    # heroic
+    heroic
  ];
  boot.extraModulePackages = with pkgs; [
    xboxdrv
--- a/nixos/gnome.nix
+++ b/nixos/gnome.nix
@ -1,7 +0,0 @@
-{ config, makeEnable, ... }:
-makeEnable config "modules.gnome" false {
-  services.xserver = {
-    desktopManager.gnome3.enable = true;
-    displayManager.gdm.enable = true;
-  };
-}
--- a/nixos/keys.nix
+++ b/nixos/keys.nix
@ -34,15 +34,10 @@ rec {
  andyKeys = [
    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCqBnDZXcZIMtOTPxg4pJWyMyNp84kpU2uH88aCkrhMBY2TI4dqAXGY4h1DOyOEyQo9nTgyvdlv4M1Hlp5tzfbuapdTWtt36gb+FKpsTUy8dz45fhKJerUszNbVQ+SpZu4ZFN4Nv9eP3AHO+Mzjcvbf666VMDEzZWu2totd7jxyI9PdK78TD5AOi+kGTtbEgqMpJCcZmJlzJ9NJJ2ejhPCRwcfDrShHcfMeEwWL5MmnzT+WstkRwJAM0f9/ks77jWDnB1Eu55rQykU8zVZ1nz1GiXZcxUpm6B0IRhwn8NGH6nVzSLITtO5eJ7LPQR9XNUODpbrsVGNK6jgGql9gZpYp andy@nixos"
  ];
-  willKeys = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILgLjW6R+dTEmlUoPfE4GA8gRn93UlcSJqlJP1xw0KWl willgester@gmail.com"
-  ];
+  willKeys = [];
  loewyKeys = [
    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDROb8zcXAgqR3xNpStjt8kSL2Tnic+aWVlQRkmmLveay0RDPatHVKiWtscBoFYvL19xwpi692nZjyPAGQBLMquVx8rexHUFVbs6UVM41Y/QV0UZLSlVM7xNl3nL/dQoxT8OC2a9WJThNm41EjFzzKAuUaWqjm4+uEsC9felBIzndlA5/bIn6EUkMb2X8qmOOIOod1UeVZeK0fWMoDdKsHtQjiQrrP4nLjOmrTQ+BF2yUHwFbW6SCQiXT1Jzq4zymnI717ZraTK0nXzl8amLrGGrh36TrR7pv9hWLeNIMCARvOtABMdQmrT1dI4FxLK1uKM696uzfoaZDUn58G2VGrd loewy gitlab"
  ];
  agenixKeys = hostKeys ++ kanivanKeys;
  allKeys = loewyKeys ++ mikeKeys ++ kanivanKeys ++ deanKeys ++ alexKeys ++ hostKeys;
-  railbird-sf = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDozY/3Cd9npaYPCgIn/E7MjW9c7Zb5/wTO5Qi7yRU45 root@railbird-sf"
-  ];
 }
--- a/nixos/machines/biskcomp.nix
+++ b/nixos/machines/biskcomp.nix
@ -53,13 +53,6 @@ in
          proxyPass = "http://[::1]:8222";
        };
      };
-      "cache.railbird.ai" = {
-        enableACME = true;
-        forceSSL = true;
-        locations."/" = {
-          proxyPass = "http://192.168.1.26:3090";
-        };
-      };
    };
  };

--- a/nixos/machines/railbird-sf.nix
+++ b/nixos/machines/railbird-sf.nix
@ -1,96 +0,0 @@
-{ config, lib, pkgs, forEachUser, ... }:
-{
-  imports = [
-    ../configuration.nix
-  ];
-
-  networking.hostName = "railbird-sf";
-
-  hardware.enableRedistributableFirmware = true;
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-  boot.loader.systemd-boot.enable = true;
-
-  hardware.opengl.extraPackages = [ pkgs.linuxPackages.nvidia_x11.out ];
-  hardware.opengl.extraPackages32 = [ pkgs.linuxPackages.nvidia_x11.lib32 ];
-  services.xserver = {
-    videoDrivers = [ "nvidia" ];
-  };
-
-  # Enable OpenGL
-  hardware.opengl = {
-    enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
-  };
-
-  hardware.nvidia = {
-
-    # Modesetting is required.
-    modesetting.enable = true;
-
-    # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
-    powerManagement.enable = false;
-    # Fine-grained power management. Turns off GPU when not in use.
-    # Experimental and only works on modern Nvidia GPUs (Turing or newer).
-    powerManagement.finegrained = false;
-
-    # Use the NVidia open source kernel module (not to be confused with the
-    # independent third-party "nouveau" open source driver).
-    # Support is limited to the Turing and later architectures. Full list of
-    # supported GPUs is at:
-    # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
-    # Only available from driver 515.43.04+
-    # Currently alpha-quality/buggy, so false is currently the recommended setting.
-    open = false;
-
-    # Enable the Nvidia settings menu,
-	  # accessible via `nvidia-settings`.
-    nvidiaSettings = true;
-
-    # Optionally, you may need to select the appropriate driver version for your specific GPU.
-    package = config.boot.kernelPackages.nvidiaPackages.stable;
-  };
-
-  features.full.enable = false;
-  modules.base.enable = true;
-  modules.desktop.enable = true;
-  modules.xmonad.enable = false;
-  modules.gnome.enable = true;
-  modules.code.enable = true;
-  modules.syncthing.enable = true;
-  modules.fonts.enable = true;
-  modules.plasma.enable = false;
-  modules.gitea-runner.enable = true;
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/a317d456-6f84-41ee-a149-8e466e414aae";
-    fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/B875-39D4";
-      fsType = "vfat";
-      };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/129345f3-e1e1-4d45-9db9-643160c6d564"; }
-    ];
-
-  environment.systemPackages = with pkgs; [
-    android-studio
-  ];
-
-  networking.useDHCP = lib.mkDefault true;
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  
-  home-manager.users = forEachUser {
-     home.stateVersion = "23.11";
-  };
-
-  system.stateVersion = "23.11";
-}
--- a/nixos/nix.nix
+++ b/nixos/nix.nix
@ -33,13 +33,6 @@
        "nixpkgs=${inputs.nixpkgs.outPath}"
      ];
      settings.nix-path = nixPath;
-      binaryCaches = [
-        "https://cache.nixos.org"
-        "https://cache.railbird.ai"
-      ];
-      binaryCachePublicKeys = [
-        "cache.railbird.ai:KhnvcouxtIU2zxUcjJsm4bUK3o1S3p8xMf9qfZGF7/A="
-      ];
    };

    nixpkgs.overlays = [
--- a/nixos/nixified.ai.nix
+++ b/nixos/nixified.ai.nix
@ -11,6 +11,7 @@ specialArgs.makeEnable config "modules.nixified-ai" false {
  services.invokeai = {
    enable = false;
    host = "0.0.0.0";
+    nsfwChecker = false;
    package = inputs.nixified-ai.packages.${config.nixpkgs.system}.invokeai-nvidia;
  };
 }
--- a/nixos/plasma.nix
+++ b/nixos/plasma.nix
@ -1,7 +0,0 @@
-{ config, makeEnable, ... }:
-makeEnable config "modules.plasma" true {
-  services.xserver = {
-    desktopManager.plasma5.enable = true;
-    displayManager.sddm.enable = true;
-  };
-}
--- a/nixos/railbird.ai
+++ b/nixos/railbird.ai
@ -0,0 +1 @@
+Subproject commit 74ee66bcb6c3a1ba509d1e78435e391255dc0647
--- a/nixos/secrets/cache-priv-key.pem.age
+++ b/nixos/secrets/cache-priv-key.pem.age
--- a/nixos/secrets/cache-pub-key.pem
+++ b/nixos/secrets/cache-pub-key.pem
@ -1 +1 @@
-cache.railbird.ai:KhnvcouxtIU2zxUcjJsm4bUK3o1S3p8xMf9qfZGF7/A=
+1896Folsom.duckdns.org:U2FTjvP95qwAJo0oGpvmUChJCgi5zQoG1YisoI08Qoo=
--- a/nixos/secrets/gitea-runner-token.railbird-sf.age
+++ b/nixos/secrets/gitea-runner-token.railbird-sf.age
@ -1,50 +0,0 @@
-age-encryption.org/v1
-> ssh-ed25519 ZgrTqA l0dMBQ+mzUqOkjhcZb3zfBx5awxBD8TC6Sejvcc4Nh0
-WwJOAzlQ0jMW422f3D4OSTs9ZuFFloBSur16suRi0fY
-> ssh-ed25519 ZaBdSg WThBx9L+OF7gVIY5iz190Kc93HwexYuXt97UCIcdGy4
-vNfDlA8dU8QKK1Rof172EH5PWspxE7dhZwJpKlijGm0
-> ssh-ed25519 MHZylw Y9cialnlgyNxmHJfYZkSxAkk1tLzCwM3bwI22RKrI1o
-5c++eOluYJRDa8qvjyygtzV88mmghm5q3ddS0FsdjF0
-> ssh-ed25519 sIUg6g rZZdwkjc8+3hwRb/3k6CrZuQKekbY2aLtWln1ogXvCE
-ei61DC65urGTLCPXTeuN0x2KgIyeVUZPKAJEArjypq8
-> ssh-ed25519 TnanwQ m3IDl/HTsD+7oAwVlM6092463ZnUlYHZ7ihV9oBcvX8
-tx3iUS1l67Trzkbmo5sbM1qV41bTercjMK/CO3JCBvk
-> ssh-rsa gwJx0Q
-Y1crfgn2QJyaU2zHGVSjygOTT0QIUavS3OaXqcBnQhotG4ofsjvNfwvg0KwGf2YQ
-6WyVEtQV+AgB8A6jOZK9I7BVCLnaYfal+aCO9QH/kxGAbqFNqkb9csVXVz2/LlyK
-IFvoWGMG9wm8pU36ti5k8Fi4lUSNXuOorQa8XRS2g6H/XT4P96y4vDuluQrQKE76
-MfwmxQ5rTjT5hy5mBrN++NURxC0EZvFZwxOuokYpasVyblmEEneZsCxpc1ONfuDz
-Ax+DaKAfgQA4oP55ikCxdN5rB1tJUPGa7GafH43elJPucFrvKReaV3rLjy+RefzP
-Q5FgFW/2vDMcuG3yJGUwaA
-> ssh-ed25519 YFIoHA 3F+FMd5Gj2MQDunB6sSFNNOKb7XaP30ij8vuiz54ayI
-YXwe09UjplCrBIqMV4p+xfp8micbLxBnY/htwtvVhAk
-> ssh-ed25519 KQfiow SiDaVLgOLymOZ4QQOrpDJWocnqqf2areMylDPfsni3Y
-gMPKQ74JLMKl3liWlhyoF9A2rdpKN3oQ19ZK17piGcw
-> ssh-ed25519 kScIxg KpZuFWCy4EIk324AkNhqKKXgJyhJX9/071bxtQdQ5TI
-/FnWALolYT5FjhN6IxQ3IKjP8eLfonCoLAD8QTAmAp8
-> ssh-ed25519 HzX1zw pGJLVel8C/Qg/HTI/ekfBDYD0o0HiEbovqniHieyFVQ
-TzHJaB3goP6m7OPfqJMdlRJeMihbMyz1dhvUFg5Ko7o
-> ssh-ed25519 KQfiow hdTZfjybriu7Jl1P3KSwardvCTem+YwpoogxhAhhf2o
-tUOv9Ub8XuIxf3Xv0T1O0JfIg+QEvbXgsq3cleOiTm8
-> ssh-ed25519 1o2X0w gWE13QqmOzrHPHh7L3UX0JUrJspCqqLrefifjaf8LlM
-DNV+bMcbiaVO3QzLjWEmmJ6e1AfLqnmJMbtuJ/3VipA
-> ssh-ed25519 KQ5iUA IdTClBsn0xfXbCgfXKKsYBouHjMZLF4TrD0uICBSFAw
-xuvTiSUXWKCU6WPQrQQcTHOxSi+YOOQvrcbBkrzcxyc
-> ssh-ed25519 AKGkDw czy6lPmq14fDfnfQxTG/q4StRV9Dbgh9co4CcZ12yV8
-ivMgg4UULwZ8jh4yK7EpsDGSEoIR5xlrnKWL8ZAlsak
-> ssh-ed25519 0eS5+A LnU67iEwQBOMt+oU7ShVfI9EX6jpcArD5E57w/bqfTs
-npKu1OfCD9uEOe1WZ+uTgJSnRBWo9H0rTgir2M/CXwI
-> ssh-ed25519 9/4Prw DnnPJmI+BMsuv/Mavp1kkXMLW9pwBQdMHuGdapOPhB8
-XbSJ/6whMg6FSe9A4bkv/9a/dsyk3X0A8vPUF9HCXo4
-> ssh-ed25519 gAk3+Q fgDvT4ZPXNghio5lSrOmCU8MQmrXj6IpB0BYfZSC2D4
-h8hsQb92PV3+1Ehdp592oEMycEI5FAK2toiTfHLb/o0
-> ssh-ed25519 X6eGtQ K5HPNu6Y0DBwMKKCZkCCpNq8s5s/xN58XkM4x9DaAEg
-Zf4ot5C3rKXyU/yp9DP1b/dqJb/ZCOG9ZsCSClk4HxY
-> ssh-ed25519 0ma8Cw CYn3h6XygyxE67mDJlM4SSibHDPqFyBWKPzQAHlszjU
-ktdOsrypNDlbULxwDOe8voCGrkSWP4TMXSxkUCcEO2U
-> ssh-ed25519 qQi7yA LV1T24o2hw+nsinXfxWwlnFsCu7O0qo0bRJF45gJklY
-g8gRXO+KWgsYT8sMdGD1R06v4C4xiSSOTZDTA9ODq/4
-> T!M=;-grease CA
-Q+IGMGZNHepXZ9eLFTKNdHUatSF9iUvfL4sjdJwNc6ft
--- rnkSxq/yrqGe+Kw6y/sby0uQ5vydFwslx0ksoNRi7J0
-ôI–6òÈ|ŸW‚(T	ë)R³ÛÅ©þúýcj‡rLæ<4C>qµZV»Ìjì7¨fuaÙQTñ.´ãZc¡‰YÉ"Xè‹Ë«éžŒéŠ–¨
--- a/nixos/secrets/secrets.nix
+++ b/nixos/secrets/secrets.nix
@ -9,5 +9,4 @@ in
  "gitea-runner-token.nixquick.age".publicKeys = keys.agenixKeys;
  "gitea-runner-token.jimi-hendnix.age".publicKeys = keys.agenixKeys;
  "gitea-runner-token.adele.age".publicKeys = keys.agenixKeys;
-  "gitea-runner-token.railbird-sf.age".publicKeys = keys.agenixKeys ++ keys.railbird-sf;
 }
--- a/nixos/syncthing.nix
+++ b/nixos/syncthing.nix
@ -12,7 +12,6 @@ let
    jay-lenovo-wsl = { id = "F3HW6DZ-B7BFACJ-SRAUM7Z-56TXQJ5-5WKZT5A-GKXAHVD-YLXFJ4M-G7OJQQC"; };
    jay-lenovo = { id = "AP5ZUKJ-QBVYWCN-DYHR3UB-JJXRWNI-CAORGYM-HWRKHEH-ZJSTRLN-PP5USQX"; };
    jimi-hendnix = { id = "55JWW5K-4NY5DKT-TR4MVPO-UNOMQKM-J7TYCRF-CCCZGPM-FVRKHID-JVFLAAV"; };
-    railbird-sf = { id = "5F4FPJM-KRBFVIH-CTTB2NC-7CPVGAM-CONMH2Q-SQPRODO-CWKRFPF-HVN4AAD"; };
  };
  allDevices = builtins.attrNames devices;
 in
				`@ -0,0 +1 @@`
				`Subproject commit 74ee66bcb6c3a1ba509d1e78435e391255dc0647`