Merge branch 'main' of https://forge.room409.xyz/miloignis/nix_config

condoserver_activate_flake.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env sh
 
-nixos-rebuild switch --fast --flake .#condoserver --target-host root@192.168.86.21 --build-host root@192.168.86.21
+nixos-rebuild switch --fast --flake .#condoserver --target-host root@condoserver.room409.wg.test --build-host root@condoserver.room409.wg.test

flake.lock

@@ -1,38 +1,139 @@
 {
   "nodes": {
-    "flake-utils": {
+    "base16": {
       "inputs": {
-        "systems": "systems"
+        "fromYaml": "fromYaml"
       },
       "locked": {
-        "lastModified": 1731533236,
+        "lastModified": 1755819240,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
-        "owner": "numtide",
+        "owner": "SenchoPens",
-        "repo": "flake-utils",
+        "repo": "base16.nix",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
+        "owner": "SenchoPens",
-        "repo": "flake-utils",
+        "repo": "base16.nix",
         "type": "github"
       }
     },
-    "flake-utils_2": {
+    "base16-fish": {
-      "inputs": {
+      "flake": false,
-        "systems": "systems_2"
-      },
       "locked": {
-        "lastModified": 1731533236,
+        "lastModified": 1622559957,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
-        "owner": "numtide",
+        "owner": "tomyun",
-        "repo": "flake-utils",
+        "repo": "base16-fish",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
+        "owner": "tomyun",
-        "repo": "flake-utils",
+        "repo": "base16-fish",
+        "type": "github"
+      }
+    },
+    "base16-helix": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1752979451,
+        "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=",
+        "owner": "tinted-theming",
+        "repo": "base16-helix",
+        "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-helix",
+        "type": "github"
+      }
+    },
+    "base16-vim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1732806396,
+        "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=",
+        "owner": "tinted-theming",
+        "repo": "base16-vim",
+        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-vim",
+        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
+        "type": "github"
+      }
+    },
+    "firefox-gnome-theme": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1756083905,
+        "narHash": "sha256-UqYGTBgI5ypGh0Kf6zZjom/vABg7HQocB4gmxzl12uo=",
+        "owner": "rafaelmardojai",
+        "repo": "firefox-gnome-theme",
+        "rev": "b655eaf16d4cbec9c3472f62eee285d4b419a808",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rafaelmardojai",
+        "repo": "firefox-gnome-theme",
+        "type": "github"
+      }
+    },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "stylix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1756770412,
+        "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "4524271976b625a4a605beefd893f270620fd751",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "fromYaml": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1731966426,
+        "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
+        "owner": "SenchoPens",
+        "repo": "fromYaml",
+        "rev": "106af9e2f715e2d828df706c386a685698f3223b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "SenchoPens",
+        "repo": "fromYaml",
+        "type": "github"
+      }
+    },
+    "gnome-shell": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1748186689,
+        "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=",
+        "owner": "GNOME",
+        "repo": "gnome-shell",
+        "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "GNOME",
+        "ref": "48.2",
+        "repo": "gnome-shell",
         "type": "github"
       }
     },
@@ -43,11 +144,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739051380,
+        "lastModified": 1758653055,
-        "narHash": "sha256-p1QSLO8DJnANY+ppK7fjD8GqfCrEIDjso1CSRHsXL7Y=",
+        "narHash": "sha256-v2Pue/Xa9cDbKcrsOmhD8fiYR4No65z+ReAUBBvvE7g=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5af1b9a0f193ab6138b89a8e0af8763c21bbf491",
+        "rev": "131f4e22c30c114378dcf6191cb75c97eba673d0",
         "type": "github"
       },
       "original": {
@@ -56,13 +157,87 @@
         "type": "github"
       }
     },
+    "niri": {
+      "inputs": {
+        "niri-stable": "niri-stable",
+        "niri-unstable": "niri-unstable",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable",
+        "xwayland-satellite-stable": "xwayland-satellite-stable",
+        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
+      },
+      "locked": {
+        "lastModified": 1758660031,
+        "narHash": "sha256-/f1k6oL2UqpDxe0MasJyLpXJj80Az/TxBbEf4hinmgI=",
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "rev": "6e26dd2cece5430571b45ffe3d97213431b3e86f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "type": "github"
+      }
+    },
+    "niri-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1756556321,
+        "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "ref": "v25.08",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
+    "niri-unstable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1758631239,
+        "narHash": "sha256-EQecFZ5VZtNjN/yzDA/RV13fK3EdLPblcf9p5wVNACo=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "3850739e445b95a73c2466a718ccaf3a9a406c06",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1757943327,
+        "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1739020877,
+        "lastModified": 1758427187,
-        "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
+        "narHash": "sha256-pHpxZ/IyCwoTQPtFIAG2QaxuSm8jWzrzBGjwQZIttJc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
+        "rev": "554be6495561ff07b6c724047bdd7e0716aa7b46",
         "type": "github"
       },
       "original": {
@@ -71,43 +246,88 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1781877992,
+        "lastModified": 1758589230,
-        "narHash": "sha256-iAqxefR//nOlNCgNwbJ7dZEyec7ABIWu0VK8PbLixDY=",
+        "narHash": "sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bb452854d59d604d25e2a4026e9ac8b8646156f0",
+        "rev": "d1d883129b193f0b495d75c148c2c3a7d95789a0",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_stable": {
+    "nur": {
+      "inputs": {
+        "flake-parts": [
+          "stylix",
+          "flake-parts"
+        ],
+        "nixpkgs": [
+          "stylix",
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1688392541,
+        "lastModified": 1756961635,
-        "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=",
+        "narHash": "sha256-hETvQcILTg5kChjYNns1fD5ELdsYB/VVgVmBtqKQj9A=",
-        "owner": "NixOS",
+        "owner": "nix-community",
-        "repo": "nixpkgs",
+        "repo": "NUR",
-        "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b",
+        "rev": "6ca27b2654ac55e3f6e0ca434c1b4589ae22b370",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
+        "owner": "nix-community",
-        "ref": "nixos-22.11",
+        "repo": "NUR",
-        "type": "indirect"
+        "type": "github"
       }
     },
     "root": {
       "inputs": {
-        "flake-utils": "flake-utils",
         "home-manager": "home-manager",
+        "niri": "niri",
+        "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
-        "nixpkgs_stable": "nixpkgs_stable",
+        "stylix": "stylix"
-        "tachikoma": "tachikoma"
+      }
+    },
+    "stylix": {
+      "inputs": {
+        "base16": "base16",
+        "base16-fish": "base16-fish",
+        "base16-helix": "base16-helix",
+        "base16-vim": "base16-vim",
+        "firefox-gnome-theme": "firefox-gnome-theme",
+        "flake-parts": "flake-parts",
+        "gnome-shell": "gnome-shell",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nur": "nur",
+        "systems": "systems",
+        "tinted-foot": "tinted-foot",
+        "tinted-kitty": "tinted-kitty",
+        "tinted-schemes": "tinted-schemes",
+        "tinted-tmux": "tinted-tmux",
+        "tinted-zed": "tinted-zed"
+      },
+      "locked": {
+        "lastModified": 1758612110,
+        "narHash": "sha256-iwADWo5aARai4TKBylPwBkg73gUTPjfrsLGr9Vrfa8g=",
+        "owner": "danth",
+        "repo": "stylix",
+        "rev": "ef025b8de39802b05ed3f42d2045fd7324174f42",
+        "type": "github"
+      },
+      "original": {
+        "owner": "danth",
+        "repo": "stylix",
+        "type": "github"
       }
     },
     "systems": {
@@ -125,38 +345,118 @@
         "type": "github"
       }
     },
-    "systems_2": {
+    "tinted-foot": {
+      "flake": false,
       "locked": {
-        "lastModified": 1681028828,
+        "lastModified": 1726913040,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
-        "owner": "nix-systems",
+        "owner": "tinted-theming",
-        "repo": "default",
+        "repo": "tinted-foot",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
         "type": "github"
       },
       "original": {
-        "owner": "nix-systems",
+        "owner": "tinted-theming",
-        "repo": "default",
+        "repo": "tinted-foot",
+        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
         "type": "github"
       }
     },
-    "tachikoma": {
+    "tinted-kitty": {
-      "inputs": {
+      "flake": false,
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_2"
-      },
       "locked": {
-        "lastModified": 1781895204,
+        "lastModified": 1735730497,
-        "narHash": "sha256-ABzdazJNFxMLM5bJDsXZnHbpJZ83CUy0TUo/yj/CUJA=",
+        "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
-        "ref": "refs/heads/main",
+        "owner": "tinted-theming",
-        "rev": "6650ee26bbfb684b4a9cab55d2d7ebb9afd2ed8c",
+        "repo": "tinted-kitty",
-        "revCount": 191,
+        "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
-        "type": "git",
+        "type": "github"
-        "url": "https://forge.room409.xyz/miloignis/tachikoma.git"
       },
       "original": {
-        "type": "git",
+        "owner": "tinted-theming",
-        "url": "https://forge.room409.xyz/miloignis/tachikoma.git"
+        "repo": "tinted-kitty",
+        "type": "github"
+      }
+    },
+    "tinted-schemes": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1754779259,
+        "narHash": "sha256-8KG2lXGaXLUE0F/JVwLQe7kOVm21IDfNEo0gfga5P4M=",
+        "owner": "tinted-theming",
+        "repo": "schemes",
+        "rev": "097d751b9e3c8b97ce158e7d141e5a292545b502",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "schemes",
+        "type": "github"
+      }
+    },
+    "tinted-tmux": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1754788770,
+        "narHash": "sha256-LAu5nBr7pM/jD9jwFc6/kyFY4h7Us4bZz7dvVvehuwo=",
+        "owner": "tinted-theming",
+        "repo": "tinted-tmux",
+        "rev": "fb2175accef8935f6955503ec9dd3c973eec385c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "tinted-tmux",
+        "type": "github"
+      }
+    },
+    "tinted-zed": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1755613540,
+        "narHash": "sha256-zBFrrTxHLDMDX/OYxkCwGGbAhPXLi8FrnLhYLsSOKeY=",
+        "owner": "tinted-theming",
+        "repo": "base16-zed",
+        "rev": "937bada16cd3200bdbd3a2f5776fc3b686d5cba0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-zed",
+        "type": "github"
+      }
+    },
+    "xwayland-satellite-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1755491097,
+        "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "388d291e82ffbc73be18169d39470f340707edaa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "ref": "v0.7",
+        "repo": "xwayland-satellite",
+        "type": "github"
+      }
+    },
+    "xwayland-satellite-unstable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1758577423,
+        "narHash": "sha256-sB2GAOjhjoWnjU6A/uHNJiY6O3UeztV5pJAN2g1FkXU=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "03368548ba745e17a85bd631613a59cb2d8469a4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "type": "github"
       }
     }
   },

flake.lock_bac

@@ -0,0 +1,47 @@
+{
+  "nodes": {
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1697662575,
+        "narHash": "sha256-fVtd4Le9edB831xyGWu0aqSfg6YVbkCNMX/IE3SUIdk=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "3433206e51766b4164dad368a81325efbf343fbe",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1697456312,
+        "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ca012a02bf8327be9e488546faecae5e05d7d749",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-unstable",
+        "type": "indirect"
+      }
+    },
+    "root": {
+      "inputs": {
+        "home-manager": "home-manager",
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -3,33 +3,983 @@
 
     inputs = {
         nixpkgs.url = "nixpkgs/nixos-unstable";
-        nixpkgs_stable.url = "nixpkgs/nixos-22.11";
+        stylix = {
+          url = "github:danth/stylix";
+          inputs.nixpkgs.follows =  "nixpkgs";
+        };
+
+        niri = {
+            url = "github:sodiboo/niri-flake";
+            inputs.nixpkgs.follows =  "nixpkgs";
+        };
         home-manager = {
             url = "github:nix-community/home-manager";
             inputs.nixpkgs.follows =  "nixpkgs";
         };
-        tachikoma = {
+        nixos-hardware.url = "github:NixOS/nixos-hardware/master";
-          url = "git+https://forge.room409.xyz/miloignis/tachikoma.git";
-          #inputs.nixpkgs.follows =  "nixpkgs";
-          #don't follow because it can change the cargo hash?
-        };
-
-
-        flake-utils.url = "github:numtide/flake-utils";
     };
 
-    outputs = { self, nixpkgs, nixpkgs_stable, home-manager, tachikoma, flake-utils }@attrs:
+    outputs = { self, nixpkgs, stylix, niri, home-manager, nixos-hardware }@attrs:
         let
           system = "x86_64-linux";
+          make_besley = pkgs:(lib: (pkgs.stdenvNoCC.mkDerivation rec {
+                      pname = "besley";
+                      version = "4.0";
+                      src = pkgs.fetchFromGitHub {
+                          owner = "indestructible-type";
+                          repo = "Besley";
+                          rev = "99d5b97fcb863c4a667571ac8f86f745c345d3ab";
+                          sha256 = "sha256-N6QU3Pd6EnIrdbRtDT3mW5ny683DBWo0odADJBSdA2E=";
+                      };
+                      installPhase = ''
+                        install -D -t $out/share/fonts/opentype/ $(find $src -type f -name '*.otf')
+                        install -D -t $out/share/fonts/truetype/ $(find $src -type f -name '*.ttf')
+                      '';
+                      meta = with lib; {
+                        homepage = "https://indestructibletype.com/Besley.html";
+                        description = "by indestructable-type";
+                        license = licenses.ofl;
+                        maintainers = [ ];
+                        platforms = platforms.all;
+                      };
+                    }));
+          homeManagerSharedModule = {
+              home-manager.useGlobalPkgs = true;
+              home-manager.users.nathan = ((import ./home-manager/home.nix) { username = "nathan"; homeDirectory = "/home/nathan"; });
+          };
+          commonConfigFunc = ({ config, lib, pkgs, modulesPath, ... }: (specificPkgs: {
+                  nixpkgs.config.allowUnfree = true;
+                  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+                  networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
+                  time.timeZone = "America/New_York";
+                  users.extraUsers.nathan = {
+                      name = "nathan";
+                      isNormalUser = true;
+                      group = "users";
+                      extraGroups = [ "wheel" "disk" "audio" "video" "networkmanager" "systemd-journal" "networkmanager" "sway" "plugdev" "adbusers"];
+                      createHome = true;
+                      home = "/home/nathan";
+                      shell = "/run/current-system/sw/bin/bash";
+                  };
+
+                  #fonts.fonts = with pkgs; [ fira-code jetbrains-mono iosevka ];
+
+                  services.pipewire = {
+                    enable = true;
+                    alsa.enable = true;
+                    pulse.enable = true;
+                  };
+                  services.dbus.enable = true;
+                  xdg.portal = {
+                    enable = true;
+                    wlr.enable = true;
+                    extraPortals = [pkgs.xdg-desktop-portal-gtk ];
+                    #gtkUsePortal = true;
+                  };
+
+                  hardware.bluetooth.enable = true;
+                  services.blueman.enable = true;
+
+                  services.printing.enable = true;
+                  services.printing.drivers = [ pkgs.brlaser ];
+
+                  stylix = {
+                    enable = true;
+                    #image = /home/nathan/Wallpapers/walls/green-tea.jpg;
+                    #image = ./cherry_tree.jpg;
+                    #image = ./skyscraper.jpg;
+                    #image = ./village.jpg;
+                    #image = ./stones-water.jpg;
+                    #image = ./moss.jpeg;
+                    #image = ./ruinedmansion.jpg;
+                    #image = ./130_1zhJtUA.jpeg; #the city street
+                    #image = ./GitS_alley_to_water_zoom.png;
+                    image = ./GitS_other_alley_zoom.png;
+                    #image = pkgs.fetchurl {
+                    #  url = "https://raw.githubusercontent.com/kiedtl/walls/refs/heads/master/green-tea.jpg";
+                    #  sha256 = "sha256-+NcZMBnbEWurmkOkzdrxGwBlxzUO3Sitt6Uoq9plc7o=";
+                    #};
+                    polarity = "dark";
+                    #polarity = "light";
+                    fonts = {
+                      # hehe casual as serif
+                      serif     = { package = (make_besley pkgs lib); name = "Besley"; };
+                      #serif = { package = pkgs.recursive; name = "Recursive Sans Linear Static"; };
+                      #sansSerif = { package = pkgs.recursive; name = "Recursive Sans Linear Static"; };
+                      sansSerif = { package = pkgs.inter; name = "Inter"; };
+                      monospace = { package = pkgs.recursive; name = "Recursive Mono Linear Static"; };
+                      emoji     = { package = pkgs.noto-fonts-emoji; name = "Noto Color Emoji"; };
+                    };
+                  };
+                  programs.niri = {
+                    enable = true;
+                    package = pkgs.niri;
+                  };
+                  programs.sway = {
+                    enable = true;
+                    wrapperFeatures.gtk = true;
+                    extraPackages = with pkgs; [
+                      swaylock # lockscreen
+                      swayidle
+                      xwayland # for legacy apps
+                      #waybar # status bar
+                      mako # notification daemon
+                      kanshi # autorandr
+                      bemenu # is this right?
+                      i3status
+                    ];
+                  };
+
+                  environment = {
+                    etc = {
+                      "sway/config".source = ./sway_config;
+                    };
+                  };
+                  # For steam, and Vulkan in general
+                  #hardware.opengl.driSupport = true;
+                  hardware.opengl.driSupport32Bit = true;
+                  hardware.steam-hardware.enable = true;
+                  programs.steam.enable = true;
+
+                  environment.systemPackages = with pkgs; [
+                    tmux vim wget curl git w3m iftop iotop killall file unzip zip p7zip ripgrep imv killall
+                    btop htop python3
+                    waypipe firefox-wayland chromium chawan nautilus
+                    vlc mpv wayfarer libreoffice calibre foliate #transmission-gtk mupdf
+                    gimp
+                    pavucontrol pywal
+                    sway wayland glib dracula-theme adwaita-icon-theme swaylock swayidle wl-clipboard
+                    circumflex
+                    #monado openxr-loader xrgears
+                    #lean4 blas elan vscode
+                    (pkgs.writeTextFile {
+                      name = "dbus-sway-environment";
+                      destination = "/bin/dbus-sway-environment";
+                      executable = true;
+
+                      text = ''
+                        dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
+                        systemctl --user stop pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr
+                        systemctl --user start pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr
+                      '';
+                    })
+                    # currently, there is some friction between sway and gtk:
+                    # https://github.com/swaywm/sway/wiki/GTK-3-settings-on-Wayland
+                    # the suggested way to set gtk settings is with gsettings
+                    # for gsettings to work, we need to tell it where the schemas are
+                    # using the XDG_DATA_DIR environment variable
+                    # run at the end of sway config
+                    (pkgs.writeTextFile {
+                        name = "configure-gtk";
+                        destination = "/bin/configure-gtk";
+                        executable = true;
+                        text = let
+                          schema = pkgs.gsettings-desktop-schemas;
+                          datadir = "${schema}/share/gsettings-schemas/${schema.name}";
+                        in ''
+                          export XDG_DATA_DIRS=${datadir}:$XDG_DATA_DIRS
+                          gnome_schema=org.gnome.desktop.interface
+                          gsettings set $gnome_schema gtk-theme 'Dracula'
+                          '';
+                    })
+                  ] ++ specificPkgs;
+
+                  # kanshi systemd service
+                  systemd.user.services.kanshi = {
+                    description = "kanshi daemon";
+                    serviceConfig = {
+                      Type = "simple";
+                      ExecStart = "${pkgs.kanshi}/bin/kanshi -c kanshi_config_file";
+                    };
+                  };
+                  services.syncthing = {
+                    enable = true;
+                    user = "nathan";
+                    dataDir = "/home/nathan/syncthing_stuff";
+                    configDir = "/home/nathan/syncthing_stuff/.config/syncthing";
+                  };
+
+                  services.openssh.enable = true;
+                  services.tailscale.enable = true;
+                  networking.firewall.enable = false;
+          }));
         in {
-        nixosConfigurations.panam = nixpkgs.lib.nixosSystem {
+        nixosConfigurations.nixos-framework = nixpkgs.lib.nixosSystem {
             inherit system;
             specialArgs = attrs;
             modules = [
+                nixos-hardware.nixosModules.framework-13-7040-amd
+                stylix.nixosModules.stylix
+                niri.nixosModules.niri
                 home-manager.nixosModules.home-manager
-                tachikoma.nixosModules.default
+                homeManagerSharedModule
-                ./home_manager.nix
+                ({ config, lib, pkgs, modulesPath, ... }@innerArgs: (lib.recursiveUpdate (commonConfigFunc innerArgs [ pkgs.light pkgs.gpodder pkgs.evince pkgs.wezterm pkgs.vulkan-tools pkgs.tor-browser ]) {
-                ./panam.nix
+                  # HARDWARE
+                  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+                  
+                  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
+                  boot.initrd.kernelModules = [ "amdgpu" ];
+                  hardware.opengl.extraPackages = with pkgs; [ amdvlk ];
+                  boot.kernelModules = [ "kvm-amd" ];
+                  boot.extraModulePackages = [ ];
+                  
+                  fileSystems."/" =
+                    { device = "/dev/disk/by-uuid/427e2f6d-d42d-4d49-be35-713bf9526dc9";
+                      fsType = "ext4";
+                    };
+                  
+                  fileSystems."/boot" =
+                    { device = "/dev/disk/by-uuid/2A78-5373";
+                      fsType = "vfat";
+                    };
+                  
+                  swapDevices =
+                    [ { device = "/dev/disk/by-uuid/9b0357e8-f721-4a06-aae0-97b6efc19209"; }
+                    ];
+                  
+                  # 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.enp195s0f3u1c2.useDHCP = lib.mkDefault true;
+                  
+                  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+                  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+                  # END HARDWARE
+                  boot.loader.systemd-boot.enable = true;
+                  boot.loader.efi.canTouchEfiVariables = true;
+                  boot.kernelPackages = pkgs.linuxPackages_latest;
+                  #boot.kernelPackages = pkgs.linuxPackages_testing;
+                  #boot.kernelParams = [ "amdgpu.sg_display=0" ];
+                  networking.hostName = "nixos-framework"; # Define your hostname.
+                  system.stateVersion = "22.11"; # Did you read the comment?
+                  programs.fuse.userAllowOther = true;
+                  #services.jellyfin.enable = true;
+                  services.fwupd.enable = true;
+                  #services.xserver = {
+                  #  enable = true;
+                  #  displayManager.gdm.enable = true;
+                  #  desktopManager.gnome.enable = true;
+                  #};
+                }))
+            ];
+        };
+        nixosConfigurations.nixos4800H = nixpkgs.lib.nixosSystem {
+            inherit system;
+            specialArgs = attrs;
+            modules = [
+                niri.nixosModules.niri
+                home-manager.nixosModules.home-manager
+                homeManagerSharedModule
+                ({ config, lib, pkgs, modulesPath, ... }@innerArgs: (lib.recursiveUpdate (commonConfigFunc innerArgs [ pkgs.light pkgs.gpodder pkgs.evince ]) {
+                  # HARDWARE
+                  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+
+                  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ];
+                  boot.initrd.kernelModules = [ "amdgpu" ];
+                  hardware.opengl.extraPackages = with pkgs; [ amdvlk ];
+                  boot.kernelModules = [ "kvm-amd" ];
+                  boot.extraModulePackages = [ ];
+
+                  fileSystems."/" = { device = "/dev/disk/by-uuid/ae8e4a92-53dd-49b5-bf3a-aeb9a109c01e"; fsType = "ext4"; };
+                  fileSystems."/boot" = { device = "/dev/disk/by-uuid/28E9-0409"; fsType = "vfat"; };
+                  fileSystems."/nas_disk1" = { device = "/dev/disk/by-uuid/d7907ed2-2aff-4cfc-bb4d-fa46b3f1af57"; fsType = "ext4"; };
+                  swapDevices = [ ];
+                  # END HARDWARE
+
+                  boot.loader.systemd-boot.enable = true;
+                  boot.loader.efi.canTouchEfiVariables = true;
+                  boot.kernelPackages = pkgs.linuxPackages_latest;
+                  boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
+                  boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1;
+                  networking.hostName = "nixos4800H"; # Define your hostname.
+
+                  programs.fuse.userAllowOther = true;
+                  services.jellyfin.enable = true;
+
+                  # THIS SEEMS CONTRADICTORY
+                  # The global useDHCP flag is deprecated, therefore explicitly set to false here.
+                  # Per-interface useDHCP will be mandatory in the future, so this generated config
+                  # replicates the default behaviour.
+                  networking.useDHCP = false;
+                  networking.interfaces.eno1.useDHCP = true;
+                  networking.interfaces.wlp1s0.useDHCP = true;
+                  system.stateVersion = "20.03";
+                  users.extraUsers.marcus = {
+                      name = "marcus";
+                      isNormalUser = true;
+                      group = "users";
+                      extraGroups = [ "wheel" "disk" "audio" "video" "networkmanager" "systemd-journal" "networkmanager" "sway" "plugdev" "adbusers"];
+                      createHome = true;
+                      home = "/home/marcus";
+                      shell = "/run/current-system/sw/bin/bash";
+                  };
+                  users.extraUsers.pratik = {
+                    name = "pratik";
+                    isNormalUser = true;
+                    group = "users";
+                    extraGroups = [ "wheel" "disk" "audio" "video" "networkmanager" "systemd-journal" "networkmanager" "plugdev"];
+                    createHome = true;
+                    home = "/home/pratik";
+                    shell = "/run/current-system/sw/bin/bash";
+                    openssh.authorizedKeys.keys = [
+                      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKmLFCW0HGGJzTO42/ZuWFmDY80ZpV8e8qEc3CEBclF8 pratik@elmerus.fedora"
+                    ];
+                  };
+                }))
+            ];
+        };
+        nixosConfigurations.nixos-desktop = nixpkgs.lib.nixosSystem {
+            inherit system;
+            specialArgs = attrs;
+            modules = [
+                niri.nixosModules.niri
+                home-manager.nixosModules.home-manager
+                homeManagerSharedModule
+                ({ config, lib, pkgs, modulesPath, ... }@innerArgs: (lib.recursiveUpdate (commonConfigFunc innerArgs []) {
+                  # HARDWARE
+                  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+                  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ];
+                  boot.initrd.kernelModules = [ ];
+                  boot.kernelModules = [ "kvm-amd" ];
+                  boot.extraModulePackages = [ ];
+                  boot.supportedFilesystems = [ "ntfs" ];
+                  fileSystems."/" = { device = "/dev/disk/by-uuid/163c1731-2f66-436b-a74f-20f84ec628dd"; fsType = "ext4"; };
+                  fileSystems."/boot" = { device = "/dev/disk/by-uuid/9C44-5411"; fsType = "vfat"; };
+                  fileSystems."/reborn" = { device = "/dev/disk/by-label/reborn"; fsType = "ext4"; };
+                  #fileSystems."/big_disk" = { device = "/dev/disk/by-uuid/B610D69310D65A47"; fsType = "ntfs3"; options = ["rw" "uid=1000"]; };
+                  #fileSystems."/big_disk" = { device = "/dev/sdb1"; fsType = "ntfs3"; options = ["rw" "uid=1000"]; };
+                  swapDevices = [ ];
+                  networking.useDHCP = lib.mkDefault true;
+                  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+                  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+                  # END HARDWARE
+
+                  boot.loader.systemd-boot.enable = true;
+                  boot.loader.efi.canTouchEfiVariables = true;
+                  networking.hostName = "nixos-desktop"; # Define your hostname.
+                  system.stateVersion = "22.11";
+
+                  #services.jellyfin.enable = true;
+                }))
+            ];
+        };
+        nixosConfigurations.condoserver = nixpkgs.lib.nixosSystem {
+            inherit system;
+            specialArgs = attrs;
+            modules = [
+                niri.nixosModules.niri
+                home-manager.nixosModules.home-manager
+                homeManagerSharedModule
+                ({ config, lib, pkgs, modulesPath, ... }@innerArgs: (lib.recursiveUpdate (commonConfigFunc innerArgs []) {
+                  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+                  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci" ];
+                  boot.initrd.kernelModules = [ ];
+                  boot.kernelModules = [ "kvm-intel" ];
+                  boot.extraModulePackages = [ ];
+                  fileSystems."/" = { device = "/dev/disk/by-uuid/0ef06a3a-080d-4f15-b53e-54c91adb8ec9"; fsType = "ext4"; };
+                  fileSystems."/boot" = { device = "/dev/disk/by-uuid/86F4-9779"; fsType = "vfat"; };
+                  swapDevices = [ { device = "/dev/disk/by-uuid/20cc65f9-f35e-419a-b00f-252cd576b2ce"; } ];
+                  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+                  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+                  boot.loader.systemd-boot.enable = true;
+                  boot.loader.efi.canTouchEfiVariables = true;
+
+                  # don't suspend on lid close
+                  services.logind.lidSwitch = "ignore";
+                  services.glusterfs.enable = true;
+                  networking.hostName = "condoserver"; # Define your hostname.
+
+
+                  system.stateVersion = "22.11"; # Did you read the comment?
+                }))
+            ];
+        };
+        nixosConfigurations.vps = nixpkgs.lib.nixosSystem {
+            inherit system;
+            specialArgs = attrs;
+            modules = [
+              ({config, pkgs, lib, ... }: {
+                  # HARDWARE
+                  boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk" ];
+                  boot.kernelModules = [ ];
+                  boot.extraModulePackages = [ ];
+                  fileSystems."/" =
+                    { device = "/dev/disk/by-uuid/b9470789-6d82-4ad4-9a4a-7e19b8fcc8dc";
+                    fsType = "ext4";
+                  };
+                  # END HARDWARE
+
+                  fileSystems."/var/lib/matrix-synapse/media" = {
+                    device = "nathan@100.64.0.1:/home/nathan/synapse_media/media/";
+                    fsType = "sshfs";
+                    options = [
+                      # Filesystem Options
+                      "allow_other"            # non-root access
+                      "_netdev"                # this is a network fs
+                      "x-systemd.automount"    # mount on demand
+
+                      # SSH options
+                      "reconnect"              # handle connection drops
+                      "ServerAliveInterval=15" # Keep connections alive
+                      "IdentityFile=/var/lib/private/sshfs-key"
+                    ];
+                  };
+
+                  nix.gc.automatic = true;
+                  imports = [ ];
+
+                  nixpkgs.overlays = [ ( self: super: {
+                      mautrix-telegram = super.mautrix-telegram.overrideAttrs (old: {
+                         #src = pkgs.fetchFromGitHub {
+                         #    owner = "tulir";
+                         #    repo = old.pname;
+                         #    #rev = "v${version}";
+                         #    # Literal next commit to fix double-puppeting 2 typing 2 furious
+                         #    rev = "eca1032d1660099216e71a7e0b24d35bb4833d74";
+                         #    sha256 = "1vpdgi1szhlccni1d87bbcsi2p08ifs1s2iinimkc7d8ldqv1p52";
+                         #};
+                          propagatedBuildInputs = old.propagatedBuildInputs ++ (with pkgs.python3.pkgs; [
+                            #asyncpg
+                            python-olm pycryptodome unpaddedbase64
+                          ]);
+                      });
+
+                      #lemmy-server = super.lemmy-server.overrideAttrs (old: {
+                      #  patches = (old.patches or []) ++ [(super.fetchpatch {
+                      #    name = "fix-db-migrations.patch";
+                      #    url = "https://gist.githubusercontent.com/matejc/9be474fa581c1a29592877ede461f1f2/raw/83886917153fcba127b43d9a94a49b3d90e635b3/fix-db-migrations.patch";
+                      #    hash = "sha256-BvoA4K9v84n60lG96j1+91e8/ERn9WlVTGk4Z6Fj4iA=";
+                      #  })];
+                      #});
+
+                  }) ];
+
+                  # Use the GRUB 2 boot loader.
+                  boot.loader.grub.enable = true;
+                  boot.loader.grub.device = "/dev/vda"; # or "nodev" for efi only
+
+                  swapDevices = [{
+                    device = "/var/swapfile";
+                    size = 4096;
+                  }];
+
+                  networking.hostName = "vps"; # Define your hostname.
+                  networking.nameservers = [ "1.1.1.1" "8.8.8.8" ];
+                  # WireGuard
+                  networking.nat.enable = true;
+                  networking.nat.externalInterface = "ens3";
+                  networking.nat.internalInterfaces = ["wg0"];
+                  networking.firewall = {
+                      #allowedTCPPorts = [ 22 80 443 3478 3479 ];
+                      #allowedUDPPorts = [ 22 80 443 5349 5350 51820 ];
+                      allowedTCPPorts = [ 22 80 443 8789 30000 ]; #30000 is minetest
+                      allowedUDPPorts = [ 22 80 443 8789 51820 30000 ];
+                      #extraCommands = ''
+                      #    iptables -A FORWARD -i %i -j ACCEPT; iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE
+                      #'';
+                  };
+                  #networking.wireguard.interfaces = {
+                  #    wg0 = {
+                  #      ips = [ "10.100.0.1/24" ];
+                  #      listenPort = 51820;
+                  #      privateKeyFile = "/home/nathan/wireguard-keys/private";
+                  #      peers = [
+                  #        {
+                  #          publicKey = "FqJShA/dz8Jj73tSyjzcsyASOEv6uAFs6e/vRol8ygc=";
+                  #          allowedIPs = [ "10.100.0.2/32" ];
+                  #        }
+                  #        {
+                  #          publicKey = "aAgay9pn/3Vj1nHC4GFY2vysW12n5VFyuUcB5+0pux8=";
+                  #          allowedIPs = [ "10.100.0.3/32" ];
+                  #        }
+                  #        {
+                  #          publicKey = "u55Jkd4dRdBqnhliIP9lwsxIYow2Tr8BhPPhKFtaVAc=";
+                  #          allowedIPs = [ "10.100.0.4/32" ];
+                  #        }
+                  #        {
+                  #          publicKey = "J/BWU33DYMkoWOKSZWrtAqWciep03YuicaDMD5MCqWg=";
+                  #          allowedIPs = [ "10.100.0.5/32" ];
+                  #        }
+                  #        {
+                  #          publicKey = "y2gAEhg1vwK1+nka2Knu7NyOk8HaaY4w18nD6EMyLSk=";
+                  #          allowedIPs = [ "10.100.0.6/32" ];
+                  #        }
+                  #        {
+                  #          publicKey = "SoaYh1mb6DYd6TuOEFl4lRCZUBTPQfOnWHIOmtkgxxM=";
+                  #          allowedIPs = [ "10.100.0.7/32" ];
+                  #        }
+                  #      ];
+                  #    };
+                  #};
+
+                  services.openssh.enable = true;
+                  services.openssh.settings = {
+                    PasswordAuthentication = false;
+                    KbdInteractiveAuthentication = false;
+                    PermitRootLogin = "prohibit-password";
+                  };
+
+                  #services.mastodon = {
+                  #  enable = true;
+                  #  localDomain = "mastodon.room409.xyz";
+                  #  configureNginx = true;
+                  #  smtp.fromAddress = "notifications@mastodon.room409.xyz";
+                  #};
+
+                  services.mautrix-telegram = {
+                      enable = true;
+                      settings = {
+                          homeserver = {
+                              address = "https://synapse.room409.xyz";
+                              domain = "synapse.room409.xyz";
+                          };
+                          bridge.permissions = {
+                              "synapse.room409.xyz" = "full";
+                              "@miloignis:synapse.room409.xyz" = "admin";
+                          };
+                          bridge.encryption = {
+                              allow = true;
+                              require_verification = false;
+                          };
+                      };
+                      environmentFile = /var/lib/mautrix-telegram/secrets;
+                  };
+
+                  #services.bookbot = {
+                  #  enable = true;
+                  #  port = 8888;
+                  #};
+
+                  # for password resets run (with appropriate paths)
+                  # ./k8ngn95hsi9qrdkvr734slj9fx3j3lbb-matrix-synapse-1.128.0/bin/hash_password -c /nix/store/ql794v5ilmxa619ha83ya61pk12066dh-homeserver.yaml
+                  # and then use `psql -d matrix-synapse -U matrix-synapse -h localhost`
+                  # with the password 'synapse'
+                  # and do
+                  # UPDATE users SET password_hash='$2b$12$ED4NT7N6tI4Mbq/IKZES6.oilx0k2iK4DN3a6wPWIEpXSAsIOWe3e' WHERE name='<MATRIX_USERNAME>';
+                  services.matrix-synapse = {
+                      enable = true;
+
+                      settings = {
+                        server_name = "synapse.room409.xyz";
+                        public_baseurl = "https://synapse.room409.xyz/";
+
+                        enable_registration = false;
+                        #enable_registration_without_verification = true;
+                        #registration_shared_secret = null;
+                        database.name = "psycopg2";
+                        url_preview_enabled = true;
+                        report_stats = true;
+                        max_upload_size = "100M";
+
+                        listeners = [
+                            {
+                                port = 8008;
+                                tls = false;
+                                resources = [
+                                    {
+                                        compress = true;
+                                        names = ["client" "federation"];
+                                    }
+                                ];
+                            }
+                        ];
+                        app_service_config_files = [
+                            #"/var/lib/matrix-synapse/telegram-registration.yaml"
+                            "/var/lib/matrix-synapse/facebook-registration.yaml"
+                        ];
+                      };
+                  };
+
+                  services.gitea = {
+                      enable = true;
+                      settings.service.DISABLE_REGISTRATION = true;
+                      appName = "Room409.xyz Forge";
+                      settings.server = {
+                        DOMAIN = "forge.room409.xyz";
+                        ROOT_URL = "https://forge.room409.xyz/";
+                        HTTP_PORT = 3001;
+                      };
+                  };
+
+                  #systemd.services.lemmy.environment.RUST_BACKTRACE = "full";
+                  #systemd.services.lemmy.environment.LEMMY_DATABASE_URL = pkgs.lib.mkForce "postgres:///lemmy?host=/run/postgresql&user=lemmy";
+                  #services.lemmy = {
+                  #    enable = true;
+                  #    database.createLocally = true;
+                  #    settings = {
+                  #        hostname = "lemmy.room409.xyz";
+                  #    };
+                  #    nginx.enable = true;
+                  #};
+
+                  services.postgresql = {
+                      package = pkgs.postgresql_16;
+                      enable = true;
+                      # postgresql user and db name in the service.matrix-synapse.databse_args setting is default
+                      initialScript = pkgs.writeText "synapse-init.sql" ''
+                          CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse';
+                          CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse"
+                              TEMPLATE template0
+                              LC_COLLATE = "C"
+                              LC_CTYPE = "C";
+                      '';
+                  };
+
+                  services.headscale = {
+                    enable = true;
+                    address = "0.0.0.0";
+                    port = 8789;
+                    settings.serverUrl = "https://headscale.room409.xyz";
+                    settings.dns.base_domain = "wg.test";
+                    settings.dns.nameservers.global = ["8.8.8.8"];
+                    settings.logtail.enabled = false;
+                  };
+
+                  services.ttyd = {
+                    enable = true;
+                    port = 9134;
+                    writeable = true;
+                    username = "miloignis";
+                    passwordFile = /var/lib/ttyd/secrets;
+                    clientOptions.fontFamily="Recursive";
+                  };
+
+                  security.acme = {
+                    acceptTerms = true;
+                    defaults.email = "miloignis@gmail.com";
+                  };
+                  services.nginx = {
+                      enable = true;
+                      recommendedGzipSettings = true;
+                      recommendedOptimisation = true;
+                      recommendedProxySettings = true;
+                      recommendedTlsSettings = true;
+
+                      virtualHosts."headscale.room409.xyz" = {
+                          forceSSL = true;
+                          enableACME = true;
+                          locations."/" = {
+                            proxyPass = "http://localhost:8789";
+                            proxyWebsockets = true;
+                          };
+                      };
+
+                      ## the rest is defined by the lemmy service
+                      #virtualHosts."lemmy.room409.xyz" = {
+                      #    forceSSL = true;
+                      #    enableACME = true;
+                      #};
+
+                      virtualHosts."forge.room409.xyz" = {
+                          forceSSL = true;
+                          enableACME = true;
+                          locations."/".proxyPass = "http://localhost:3001";
+                          locations."/".extraConfig = ''
+                              client_max_body_size 100M;
+                          '';
+                      };
+
+                      virtualHosts."synapse.room409.xyz" = {
+                          forceSSL = true;
+                          enableACME = true;
+                          locations."/.well-known/matrix/server".extraConfig = ''
+                              add_header Content-Type application/json;
+                              return 200 '{ "m.server": "synapse.room409.xyz:443" }';
+                          '';
+                          locations."/.well-known/matrix/client".extraConfig = ''
+                              add_header Content-Type application/json;
+                              add_header Access-Control-Allow-Origin *;
+                              return 200 '{ "m.homeserver": {"base_url": "https://synapse.room409.xyz"}, "org.matrix.msc3575.proxy": { "url": "https://syncv3.room409.xyz" }, "m.identity_server":  { "base_url": "https://vector.im"} }';
+                          '';
+                          locations."/".proxyPass = "http://localhost:8008";
+                          locations."/".extraConfig = ''
+                              client_max_body_size 100M;
+                              proxy_set_header X-Forwarded-For $remote_addr;
+                          '';
+                      };
+
+                      virtualHosts."element-synapse.room409.xyz" = {
+                          forceSSL = true;
+                          enableACME = true;
+                          root = pkgs.element-web.override {
+                              conf = {
+                                  default_server_name = "synapse.room409.xyz";
+                                  default_server_config = "";
+                              };
+                          };
+                      };
+
+                      virtualHosts."kraken-lang.org" = {
+                        forceSSL = true;
+                        enableACME = true;
+                        root = "/var/www/kraken-lang.org";
+                        locations."/k_prime.wasm".extraConfig = ''
+                             default_type application/wasm;
+                        '';
+                      };
+                      virtualHosts."faint.room409.xyz" = {
+                        forceSSL = true;
+                        enableACME = true;
+                        root = "/var/www/faint.room409.xyz";
+                      };
+                      virtualHosts."shell.room409.xyz" = {
+                        forceSSL = true;
+                        enableACME = true;
+                        locations."/" = {
+                          proxyPass = "http://localhost:9134";
+                          proxyWebsockets = true;
+                        };
+                      };
+                      #virtualHosts."drop.room409.xyz" = {
+                        #forceSSL = true;
+                        #enableACME = true;
+                        #locations."/" = {
+                          #proxyPass = "http://localhost:9009";
+                          #proxyWebsockets = true;
+                          #extraConfig = ''
+                              #client_max_body_size 500M;
+                          #'';
+                        #};
+                      #};
+                      #virtualHosts."www.kraken-lang.org" = {
+                      #  forceSSL = true;
+                      #  enableACME = true;
+                      #  root = "/var/www/kraken-lang.org";
+                      #  locations."/k_prime.wasm".extraConfig = ''
+                      #       default_type application/wasm;
+                      #  '';
+                      #};
+                      virtualHosts."room409.xyz" = {
+                        forceSSL = true;
+                        enableACME = true;
+                        locations."/" = {
+                          root = pkgs.writeTextDir "index.html" ''<!DOCTYPE html>
+                          <html lang="en">
+                              <head>
+                                  <meta charset="utf-8">
+                                  <title>room409.xyz</title>
+                                  <style>
+                                      h1, h2 ,h3 { line-height:1.2; }
+                                      body {
+                                          max-width: 45em;
+                                          margin: 1em auto;
+                                          padding: 0 .62em;
+                                          font: 1.2em/1.62 sans-serif;
+                                      }
+                                  </style>
+                              </head>
+                              <body>
+                                  <header><h1>So Mean and Clean</h1></header>
+                                  <i>It's like a hacker wrote it</i>
+                                  <br> <br>
+                                  <b>Keyboard Cowpeople Team:</b> <a href="https://github.com/Limvot/Serif">Serif, a cross platform Matrix client</a>
+                                  <br> <br>
+                                  <b>MiloIgnis:</b> <a href="https://kraken-lang.org/">Kraken Programming Language</a>
+                              </body>
+                          </html>
+                          '';
+                        };
+                        #locations."/bookclub/".proxyPass = "http://localhost:8888/room/!xSMgeFJYbuYTOGAGga:synapse.room409.xyz/";
+                      };
+
+                      virtualHosts."lotusronin.room409.xyz" = {
+                        forceSSL = true;
+                        enableACME = true;
+                        locations."/" = {
+                          root = pkgs.writeTextDir "index.html" ''<!DOCTYPE html>
+                          <html lang="en">
+                              <head>
+                                  <meta charset="utf-8">
+                                  <title>LotusRonin's Website</title>
+                                  <style>
+                                      h1, h2 ,h3 { line-height:1.2; }
+                                      .bodyStuff {
+                                          max-width: 45em;
+                                          margin: 1em auto;
+                                          padding: 0 .62em;
+                                          font: 1.2em/1.62 sans-serif;
+                                      }
+                                      .floatLeft {
+                                        float: left;
+                                          max-width: 55em;
+                                          margin: 1em auto;
+                                          padding: 0 .62em;
+                                          font: 1.2em/1.62 sans-serif;
+                                      }
+                                  </style>
+                              </head>
+                              <body>
+                                  <div class="bodyStuff">
+                                  <header><h1>Main Page</h1></header>
+                                  <br> <br>
+                                  Take control of your tools, break from the system. Less is more.
+                                  </div>
+                                  <div class="floatLeft">
+                                    <ol>
+                                       <li><a href="">📜 Blog</a></li>
+                                       <li><a href="">👨‍💻 Code</a></li>
+                                       <li><a href="">🕹️ Games</a></li>
+                                       <li><a href="">(.)(.) MLKRs.shop signup</a></li>
+                                       <li><a href="">📄 Resume/About Me</a></li>
+                                    </ol>
+                                  </div>
+                              </body>
+                          </html>
+                          '';
+                        };
+                      };
+
+                      virtualHosts."miloignis.room409.xyz" = {
+                        forceSSL = true;
+                        enableACME = true;
+                        locations."/" = {
+                          root = pkgs.writeTextDir "index.html" ''<!DOCTYPE html>
+                          <html lang="en">
+                              <head>
+                                  <meta charset="utf-8">
+                                  <title>MiloIgnis's Website</title>
+                                  <style>
+                                      h1, h2 ,h3 { line-height:1.2; }
+                                      body {
+                                          max-width: 45em;
+                                          margin: 1em auto;
+                                          padding: 0 .62em;
+                                          font: 1.2em/1.62 sans-serif;
+                                      }
+                                  </style>
+                              </head>
+                              <body>
+                                  <header><h1>MiloIgnis's Website</h1></header>
+                                  <br> <br>
+                                  Hello! I'm MiloIgnis, a part-time PhD student studing programming languages and compilers.
+                                  My current project is making a functional language based on Vau-calculus (inspired by John Shutt's work) practial via partial evlauation and some clever compilation techniques.
+                                  That project, Kraken, is <a href="https://kraken-lang.org/">here</a>.
+                                  
+                                  <ol>
+                                      <li>Matrix - <a href="https://matrix.to/#/@miloignis:synapse.room409.xyz">@miloignis:synapse.room409.xyz</a></li>
+                                      <li>Mastodon - <a rel="me" href="https://mastodon.room409.xyz/@miloignis">@miloignis</a></li>
+                                  </ol>
+                                  <br> <br>
+                              </body>
+                          </html>
+                          '';
+                        };
+                      };
+
+                      virtualHosts."internet-list.room409.xyz" = {
+                        forceSSL = true;
+                        enableACME = true;
+                        locations."/" = {
+                          root = pkgs.writeTextDir "index.html" ''<!DOCTYPE html>
+                          <html lang="en">
+                              <head>
+                                  <meta charset="utf-8">
+                                  <title>room409.xyz</title>
+                                  <style>
+                                      h1, h2 ,h3 { line-height:1.2; }
+                                      body {
+                                          max-width: 45em;
+                                          margin: 1em auto;
+                                          padding: 0 .62em;
+                                          font: 1.2em/1.62 sans-serif;
+                                      }
+                                  </style>
+                              </head>
+                              <body>
+                                  <header><h1>A list of colors on the internet</h1></header>
+                                  <ol>
+                                      <li>Blue</li>
+                                      <li>Chilladelphia</li>
+                                      <li>Kenny</li>
+                                  </ol>
+                              </body>
+                          </html>
+                          '';
+                        };
+                      };
+
+                      virtualHosts."batou.room409.xyz" = {
+                        forceSSL = true;
+                        enableACME = true;
+                        locations."/".proxyPass = "http://100.64.0.1:8090";
+                      };
+
+                      #virtualHosts."4800H.room409.xyz" = {
+                      #  forceSSL = true;
+                      #  enableACME = true;
+                      #  locations."/".proxyPass = "http://10.100.0.7:80";
+                      #};
+                      virtualHosts."batou-jf.room409.xyz" = {
+                        forceSSL = true;
+                        enableACME = true;
+                        locations."/".proxyPass = "http://100.64.0.1:8096";
+                      };
+                  };
+
+                  services.journald.extraConfig = "SystemMaxUse=50M";
+
+                  services.tailscale.enable = true;
+                  environment.systemPackages = with pkgs; [
+                      htop tmux git vim wget unzip file
+                      iftop ripgrep
+                      config.services.headscale.package
+                      #wireguard
+                      droopy
+                      sshfs
+
+    #  (let
+    #  # XXX specify the postgresql package you'd like to upgrade to.
+    #  # Do not forget to list the extensions you need.
+    #  newPostgres = pkgs.postgresql_16.withPackages (pp: [
+    #    # pp.plv8
+    #  ]);
+    #in pkgs.writeScriptBin "upgrade-pg-cluster" ''
+    #  set -eux
+    #  # XXX it's perhaps advisable to stop all services that depend on postgresql
+    #  systemctl stop postgresql
+
+    #  export NEWDATA="/var/lib/postgresql/${newPostgres.psqlSchema}"
+
+    #  export NEWBIN="${newPostgres}/bin"
+
+    #  export OLDDATA="${config.services.postgresql.dataDir}"
+    #  export OLDBIN="${config.services.postgresql.package}/bin"
+
+    #  install -d -m 0700 -o postgres -g postgres "$NEWDATA"
+    #  cd "$NEWDATA"
+    #  sudo -u postgres $NEWBIN/initdb -D "$NEWDATA"
+
+    #  sudo -u postgres $NEWBIN/pg_upgrade \
+    #    --old-datadir "$OLDDATA" --new-datadir "$NEWDATA" \
+    #    --old-bindir $OLDBIN --new-bindir $NEWBIN \
+    #    "$@"
+    #'')
+
+
+                  ];
+                  users.extraUsers.nathan = {
+                    name = "nathan";
+                    isNormalUser = true;
+                    group = "users";
+                    extraGroups = [ "wheel" "disk" "audio" "video" "networkmanager" "systemd-journal" "networkmanager" "plugdev"];
+                    createHome = true;
+                    home = "/home/nathan";
+                    shell = "/run/current-system/sw/bin/bash";
+                    openssh.authorizedKeys.keys = [
+                      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDjyWh/SPOgx+yOgrc8g8+7PR0+CWMrWZ4PaWcmgDzfUGAWyj2FHBNG2gLvIKn4+TAwvbEPp+7YXxlmiYltUWNlEXEzryhrhYiqeun9uApT+fgzxF278/VeS+NErX4S2WGwhUdybk6MSs0cpUVp+TNiZFUH+ltTcLai3aLaMaL13Z024DzjpD4jRVG4PErHTe/6dTfdmg6AS7gB0b+LTjFzdYSdeYsHxqcig+d+34vQkNmV2dIvLpNkbpzyfUyE3g1gpYTgRKgY4mZqd6QUKOyIH0SDqPUDrmK6e1LK2yTYe1jP39G2JhAMOrSm8jEFm7RLxHXJ862EqD8gFV2aCQ2HUFlFpx7t02Tgvw80grQRoJKJyYtElO6CAr+oFnhxWnYgUsoYmGLSp5Nv1wV9WHkprWnGyuj/CGM8D3gwFSL672IYQOGTwQElcclRZ/uMlNjtyw6ky4VV22gDZag1hMfZhWf/nmMNql8dCoqY7K36XAAEDXjiS5J9EZe7AexLV68= nathan@nixos_4800H" # laptop
+
+                      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCtmGhDNdwDXulhJ8MGehlfLQZ8Qzxv2K4vXqyvJWSkMj5XzCRcylKME0qdfiA+G0SeozCY2Qhd2xiPsaL3PaZX7HD1fiesO0jofl9Ph+VIbwwP2LT7kYYSoUXSdj3uPBdZD8BhSZsMHIPVQfzj5JkvE1W9AQik+d5o7RPO8srpo8JHRpH0lgJbuiLWkpLX2sD2hjlI5uMhMekGnI0UA3ie3x9Xnh3J019X0K3Efxm8X31k60j9J0bgGLhxYwu42+kiJKabdpk5tFsqLvDRbzPUGSm+5ZiWMX5ILDbr+/Aczzb2ek5rzsEB2s48BmxBtJnXfjnQtBo6URuJYzVSI9V6vEgUnueGPY/DN1oeRZqTcqujIADh3ZMcdKg1cfdvNYoSk2FcFz0rZXTLjkwOAK2HMRZFXK5ijX7tpnb5GXsiDa0uoWhJVByzrnlqZ65LuHdLFPbe+A/N+T3wzykIkG2hNv8mRJi7/pWjNy2O2iKsSSSabN5xjxI7aFzyUQK+23UF2wzLc1+f4qMcB5HoHhktOV1QRM4RKtvYhdkAG0O/C5Wu0BItrjQbAoqSa29QLlBpHCIlY4Vr8S4kNXf8mm8gRrKATHNZBTUAVNMDYFcd9n4hyK8ERGodaXFDP7m/r+yZaHLcpQQ46sYjq2nbkP1yYaCbmVoEEUpKRtP2UDc91w== miloignis@gmail.com" # desktop
+
+                      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDSG8Mi192YYB1PSmRUQGT0WxMuG8f3HKmdC6Y/NTKlRZDMeyV81cxmJpMjpKszc0P5e0j6F4Q1y9R0GybRPVFFgA5I5ETReWcJ1pe8Bs/BxZpxcl/fESUl2YOoEWxGzwha7CAIAlgMFTljj9osYTx+b8j+6MFhlsRnUCaxngRle2JeSmkCFYMlkKjynTHME4OjfRb3xR1VmB489s25tMmRjpzGuD6+5o0x+nX3yk8t711vKcuYx0irwi3sn4w9bKXamPOZH/5sCNz1Q7Qgz9BWOPYXMpnYytDcps7ACAqpKu3etzBvMQo+TZzivr+yZhePhUWovE1HpPVTBqEf3D+ekHZ5ZdQ6Y4W3/16WdDYCq9eCdZvsPOAFi9Sl/lf74LuzEqD1pPHg7avh7+fNJN2r0KoyozuvDSIwW8Kwo1uSav0XCHvdsFmSUmEXjwb4M2Bue6XDWCrVa8FiRpS1F/uvLgdWsZIkBJCX6vy6zPkFMJoKG9IdT4KYCn1KW3ifwTs= nathan@nixos" #condoserver
+
+                    ];
+                  };
+                  
+                  system.stateVersion = "20.03";
+              })
             ];
         };
     };

home-manager/flake.lock

@@ -0,0 +1,156 @@
+{
+  "nodes": {
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1756261190,
+        "narHash": "sha256-eiy0klFK5EVJLNilutR7grsZN/7Itj9DyD75eyOf83k=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "77f348da3176dc68b20a73dab94852a417daf361",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "niri": {
+      "inputs": {
+        "niri-stable": "niri-stable",
+        "niri-unstable": "niri-unstable",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable",
+        "xwayland-satellite-stable": "xwayland-satellite-stable",
+        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
+      },
+      "locked": {
+        "lastModified": 1756284022,
+        "narHash": "sha256-5q5rKE9Cbt1qDXtqgRr9FSeJrhS6apGatP3s9Oyejh8=",
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "rev": "a98afc5eb87093eec2f70c2e53e5faf919875025",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "type": "github"
+      }
+    },
+    "niri-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1748151941,
+        "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "ref": "v25.05.1",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
+    "niri-unstable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1756275478,
+        "narHash": "sha256-BvPxbh+37rb5SHS5zFF6lis63B8BTuKDGRqMjbb9qBU=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "e038b8770a17b67cbf9c9d007a1f3a9ac0b53c60",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1756125398,
+        "narHash": "sha256-XexyKZpf46cMiO5Vbj+dWSAXOnr285GHsMch8FBoHbc=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "3b9f00d7a7bf68acd4c4abb9d43695afb04e03a5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1756217674,
+        "narHash": "sha256-TH1SfSP523QI7kcPiNtMAEuwZR3Jdz0MCDXPs7TS8uo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "4e7667a90c167f7a81d906e5a75cba4ad8bee620",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "home-manager": "home-manager",
+        "niri": "niri",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "xwayland-satellite-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1755491097,
+        "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "388d291e82ffbc73be18169d39470f340707edaa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "ref": "v0.7",
+        "repo": "xwayland-satellite",
+        "type": "github"
+      }
+    },
+    "xwayland-satellite-unstable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1756260173,
+        "narHash": "sha256-wcf04fl5ncbOqAK7OCWIgILERIbMfL/eeM3UThqgErI=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "af33f7eb124b51ff6d9cdf9b428643e2246c8cbb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

home-manager/flake.nix

@@ -0,0 +1,39 @@
+{
+  description = "Home Manager configuration of nbraswell6";
+
+  inputs = {
+    # Specify the source of Home Manager and Nixpkgs.
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    niri = {
+        url = "github:sodiboo/niri-flake";
+        inputs.nixpkgs.follows =  "nixpkgs";
+    };
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
+
+  outputs =
+    { nixpkgs, niri, home-manager, ... }:
+    let
+      system = "x86_64-linux";
+      pkgs = nixpkgs.legacyPackages.${system};
+    in
+    {
+      homeConfigurations."nbraswell6" = home-manager.lib.homeManagerConfiguration {
+        inherit pkgs;
+
+        # Specify your home configuration modules here, for example,
+        # the path to your home.nix.
+        modules = [
+          ((import ./home.nix) { username = "nbraswell6"; homeDirectory = "/home/nbraswell6";})
+          #niri.nixosModules.niri
+          niri.homeModules.niri
+        ];
+
+        # Optionally use extraSpecialArgs
+        # to pass through arguments to home.nix
+      };
+    };
+}

home-manager/home.nix

@@ -0,0 +1,547 @@
+{ username, homeDirectory }: ({ config, pkgs, lib, ... }:{
+                  # This value determines the Home Manager release that your
+                  # configuration is compatible with. This helps avoid breakage
+                  # when a new Home Manager release introduces backwards
+                  # incompatible changes.
+                  #
+                  # You can update Home Manager without changing this value. See
+                  # the Home Manager release notes for a list of state version
+                  # changes in each release.
+                  home.stateVersion = "22.11";
+                  home.username = username;
+                  home.homeDirectory = homeDirectory;
+                  
+                  fonts.fontconfig.enable = true;
+                  home.packages = with pkgs; [
+                    fira-code jetbrains-mono iosevka monoid recursive inter
+                    xwayland-satellite swww
+                    niri
+                  ]; 
+
+                  systemd.user.services.mpris-proxy = {
+                    Unit.Description = "Mpris proxy";
+                    Unit.After = [ "network.target" "sound.target" ];
+                    Service.ExecStart = "${pkgs.bluez}/bin/mpris-proxy";
+                    Install.WantedBy = [ "default.target" ];
+                  };
+
+                  programs.fuzzel.enable = true;
+
+                  programs.waybar = {
+                    enable = true;
+                    settings = {
+                      mainBar = {
+                        layer = "top";
+                        position = "top";
+                        height = 18;
+                        modules-left = [ "memory" "disk" "network" ];
+                        modules-center = [ "clock" ];
+                        modules-right = [ "battery" "power-profiles-daemon" "backlight" "pulseaudio" ];
+                        reload_style_on_change = true;
+                      };
+                    };
+                    style = ''
+                      /*
+                      * {
+                        border: none;
+                        border-radius: 0;
+                        font-family: Recursive;
+                      }
+                      */
+                      window#waybar {
+                        background: transparent;
+                        color: #ffffff;
+                      }
+                      button {
+                        box-shadow: none;
+                        border: none;
+                        border-radius: 0;
+                        transition-property: none;
+                      }
+                      #workspaces button {
+                        padding: 0 5px;
+                        background-color: transparent;
+                        color: #ffffff;
+                      }
+                      #mode {
+                        background-color: #64829D;
+                        border-bottom: 3px solid #ffffff;
+                      }
+                      #memory, #disk, #network, #pulseaudio, #battery, #power-profiles-daemon, #backlight, #clock {
+                        padding: 0 10px;
+                        color: #f0f0ff;
+                        background-color: rgba(30,30,46,0.6);
+                        border-radius: 99px;
+                        margin-left: 4px;
+                      }
+                      #window, #workspaces {
+                        margin: 0 4px;
+                      }
+                      #clock {
+                        font-weight: bold;
+                      }
+                      #battery {
+                        margin-left: 4px;
+                      }
+                      /*
+                      #pulseaudio {
+                        color: #000000;
+                        background-color: #f1c40f;
+                      }
+                      */
+                    '';
+                  };
+
+                  programs.niri.settings = {
+                    prefer-no-csd = true;
+                    input.keyboard.xkb = {
+                      options = "ctrl:nocaps";
+                    };
+                    environment = {
+                      DISPLAY = ":0"; # xwayland-satellite
+                    };
+                    spawn-at-startup = [
+                      { command = [ "swww-daemon" ]; }
+                      { command = [ "swww" "img" "${config.stylix.image}" ]; }
+                      { command = [ "waybar" ]; }
+                      { command = [ "xwayland-satellite" ]; }
+                    ];
+                    window-rules = [
+                      {
+                        draw-border-with-background = false;
+                        geometry-corner-radius = let r = 4.0; in {
+                          top-left = r;
+                          top-right = r;
+                          bottom-left = r;
+                          bottom-right = r;
+                        };
+                        clip-to-geometry = true;
+                        #opacity = 0.95;
+                      }
+                      {
+                        matches = [{is-focused = false;}];
+                        opacity = 0.85;
+                        #opacity = 0.95;
+                      }
+                    ];
+                    layout = {
+                      gaps = 8;
+                      #gaps = 16;
+                      center-focused-column = "never";
+                      preset-column-widths = [
+                        { proportion = 1.0 / 3.0; }
+                        { proportion = 1.0 / 2.0; }
+                        { proportion = 2.0 / 3.0; }
+                      ];
+                      #If you leave the brackets empty, the windows themselves will decide their initial width.
+                      #preset-window-heights = {};
+                      default-column-width = { proportion = 1.0 / 2.0; };
+                      #focus-ring = {
+                      #  enable = false;
+                      #  width = 8;
+                      #  # Color of the ring on the active monitor.
+                      #  active.color = "#7fc8ff";
+                      #  # Color of the ring on inactive monitors.
+                      #  inactive.color = "#505050";
+                      #};
+                      #border = {
+                      #  enable = true;
+                      #  width = 4;
+                      #  active = {
+                      #    gradient = {
+                      #      angle = 130;
+                      #      relative-to = "workspace-view";
+                      #      from = "#90F090";
+                      #      to   = "#909090";
+                      #    };
+                      #  };
+                      #  inactive = {
+                      #    gradient = {
+                      #      angle = 130;
+                      #      relative-to = "workspace-view";
+                      #      from = "#409040";
+                      #      to   = "#404040";
+                      #    };
+                      #  };
+                      #};
+                      #struts = {
+                        #left   = 64;
+                        #right  = 64;
+                        #top    = 64;
+                        #bottom = 64;
+                      #};
+                    };
+                    binds = with config.lib.niri.actions; {
+                      #"Alt+P".action = spawn "bemenu-run";
+                      "Alt+P".action = spawn "fuzzel";
+                      "Alt+Return".action = spawn "ghostty";
+                      "Alt+Shift+Return".action = spawn "foot";
+                      "Alt+Shift+Slash".action = show-hotkey-overlay;
+
+                      "Alt+Shift+C".action = close-window;
+
+                      "Alt+Left"  .action = focus-column-left;
+                      "Alt+Down"  .action = focus-window-down;
+                      "Alt+Up"    .action = focus-window-up;
+                      "Alt+Right" .action = focus-column-right;
+                      "Alt+H"     .action = focus-column-left;
+                      #"Alt+J"     .action = focus-window-down;
+                      #"Alt+K"     .action = focus-window-up;
+                      "Alt+L"     .action = focus-column-right;
+
+                      "Alt+Shift+Left"  .action = move-column-left;
+                      "Alt+Shift+Down"  .action = move-window-down;
+                      "Alt+Shift+Up"    .action = move-window-up;
+                      "Alt+Shift+Right" .action = move-column-right;
+                      "Alt+Shift+H"     .action = move-column-left;
+                      #"Alt+Shift+J"     .action = move-window-down;
+                      #"Alt+Shift+K"     .action = move-window-up;
+                      "Alt+Shift+L"     .action = move-column-right;
+
+                      # Nice alts
+                      "Alt+J"      .action = focus-window-or-workspace-down;
+                      "Alt+K"      .action = focus-window-or-workspace-up;
+                      "Alt+Shift+J".action = move-window-down-or-to-workspace-down;
+                      "Alt+Shift+K".action = move-window-up-or-to-workspace-up;
+
+
+                      "Alt+Ctrl+Left" .action = focus-monitor-left;
+                      "Alt+Ctrl+Down" .action = focus-monitor-down;
+                      "Alt+Ctrl+Up"   .action = focus-monitor-up;
+                      "Alt+Ctrl+Right".action = focus-monitor-right;
+                      "Alt+Ctrl+H"    .action = focus-monitor-left;
+                      "Alt+Ctrl+J"    .action = focus-monitor-down;
+                      "Alt+Ctrl+K"    .action = focus-monitor-up;
+                      "Alt+Ctrl+L"    .action = focus-monitor-right;
+
+                      "Alt+Shift+Ctrl+Left"  .action = move-column-to-monitor-left;
+                      "Alt+Shift+Ctrl+Down"  .action = move-column-to-monitor-down;
+                      "Alt+Shift+Ctrl+Up"    .action = move-column-to-monitor-up;
+                      "Alt+Shift+Ctrl+Right" .action = move-column-to-monitor-right;
+                      "Alt+Shift+Ctrl+H"     .action = move-column-to-monitor-left;
+                      "Alt+Shift+Ctrl+J"     .action = move-column-to-monitor-down;
+                      "Alt+Shift+Ctrl+K"     .action = move-column-to-monitor-up;
+                      "Alt+Shift+Ctrl+L"     .action = move-column-to-monitor-right;
+
+
+                      #...
+                      "Alt+1".action = focus-workspace 1;
+                      "Alt+2".action = focus-workspace 2;
+                      "Alt+3".action = focus-workspace 3;
+                      "Alt+4".action = focus-workspace 4;
+                      "Alt+5".action = focus-workspace 5;
+                      "Alt+6".action = focus-workspace 6;
+                      "Alt+7".action = focus-workspace 7;
+                      "Alt+8".action = focus-workspace 8;
+                      "Alt+9".action = focus-workspace 9;
+                      #"Alt+Shift+1".action = move-column-to-workspace 1;
+                      #"Alt+Shift+2".action = move-column-to-workspace 2;
+                      #"Alt+Shift+3".action = move-column-to-workspace 3;
+                      #"Alt+Shift+4".action = move-column-to-workspace 4;
+                      #"Alt+Shift+5".action = move-column-to-workspace 5;
+                      #"Alt+Shift+6".action = move-column-to-workspace 6;
+                      #"Alt+Shift+7".action = move-column-to-workspace 7;
+                      #"Alt+Shift+8".action = move-column-to-workspace 8;
+                      #"Alt+Shift+9".action = move-column-to-workspace 9;
+
+                      #Consume one window from the right into the focused column.
+                      "Alt+Comma"  .action = consume-window-into-column;
+                      #Expel one window from the focused column to the right.
+                      "Alt+Period" .action = expel-window-from-column;
+
+                      #There are also commands that consume or expel a single window to the side.
+                      "Alt+BracketLeft"  .action = consume-or-expel-window-left;
+                      "Alt+BracketRight" .action = consume-or-expel-window-right;
+
+                      "Alt+R".action = switch-preset-column-width;
+                      "Alt+Shift+R".action = switch-preset-window-height;
+                      "Alt+Ctrl+R".action = reset-window-height;
+                      "Alt+F".action = maximize-column;
+                      "Alt+Shift+F".action = fullscreen-window;
+                      "Alt+C".action = center-column;
+
+                      "Alt+Minus".action = set-column-width "-10%";
+                      "Alt+Equal".action = set-column-width "+10%";
+
+                      "Alt+Shift+Minus".action = set-window-height "-10%";
+                      "Alt+Shift+Equal".action = set-window-height "+10%";
+
+                      "Alt+S".action.screenshot.show-pointer = false;
+                      #"Print".action = screenshot;
+                      #"Ctrl+Print".aciton = screenshot-screen;
+                      #"Alt+Print".action = screenshot-window;
+
+                      "Alt+Shift+E".action = quit;
+                      "Ctrl+Alt+Delete".action = quit;
+
+                      "Alt+Shift+P".action = power-off-monitors;
+                    };
+                  };
+
+                  programs.ghostty = {
+                    enable = true;
+                    settings = {
+                      window-decoration = false;
+                      minimum-contrast = 1.5;
+                      #font-family = "Recursive Mono Linear Static";
+                      #font-size = 11;
+                      #theme = "GruvboxDarkHard";
+                      #theme = "Horizon";
+                      #theme = "IC_Green_PPL";
+                      #theme = "IC_Orange_PPL";
+                      #theme = "iceberg-dark";
+                      #theme = "Kanagawa Dragon";
+                      #theme = "Kanagawa Wave";
+                      #theme = "kanagawabones";
+                      #theme = "kurokula";
+                      #theme = "Later This Evening";
+                      #theme = "MaterialDarker";
+                      #theme = "MaterialOcean";
+                      #theme = "matrix";
+                      #theme = "Medallion";
+                      #theme = "Mellifluous";
+                      #theme = "Molokai";
+                      #theme = "MonaLisa";
+                      #theme = "Monokai Remastered";
+                      #theme = "Monokai Soda";
+
+                      #theme = "NightLion v2";
+
+                      #theme = "niji";
+                      #theme = "Nocturnal Winter";
+                      #theme = "nord";
+                      #theme = "NvimDark";
+                      #theme = "Oceanic-Next";
+                      #theme = "OneHalfDark";
+                      #theme = "Paraiso Dark";
+                      #theme = "PaulMillr";
+                      #theme = "PencilDark";
+                      #theme = "Peppermint";
+                      #theme = "Pnevma";
+                      #theme = "Popping and Locking";
+                      #theme = "Red Planet";
+                      #theme = "rose-pine";
+                      #theme = "Ryuuko";
+                      #theme = "SeaShells";
+                      #theme = "Seti";
+                      #theme = "Shaman";
+                      #theme = "Slate";
+                      #theme = "Smyck";
+                      #theme = "Snazzy";
+                      #theme = "SoftServer";
+                      #theme = "Solarized Dark - Patched";
+                      #theme = "Solarized Dark Higher Contrast";
+                      #theme = "SpaceGray Bright";
+                      #theme = "SpaceGray Eighties";
+                      #theme = "SpaceGray Eighties Dull";
+                      #theme = "terafox";
+                      #theme = "Thayer Bright";
+                      #theme = "Tinacious Design (Dark)";
+                      #theme = "tokyonight";
+                      #theme = "tokyonight-storm";
+                      #theme = "Tomorrow Night Burns";
+                      #theme = "UltraViolent";
+                      #theme = "Violet Dark";
+                      #theme = "Whimsy";
+                      #theme = "WildCherry";
+                      #theme = "wilmersdorf";
+                      #theme = "Wombat";
+                      #theme = "xcodewwdc";
+                      #theme = "zenbones_dark";
+                      #theme = "zenwritten_dark";
+                    };
+                  };
+                  programs.foot = {
+                    enable = true;
+                    settings = {
+                      main = {
+                        #font = "Fira Code:size=8";
+                        #font = "JetBrainsMono:size=8";
+                        #font = "Iosevka:size=18";
+                        #font = "Monoid:size=6";
+                        #font = "Recursive:size=16"; # seems to be Recursive Mono Linear Static in Ghostty
+                        #dpi-aware = "yes";
+                      };
+                      mouse = {
+                        hide-when-typing = "yes";
+                      };
+                    };
+                  };
+                  programs.starship = {
+                    enable = true;
+                    enableBashIntegration = true;
+                    settings = {
+                      add_newline = false;
+                      format = lib.concatStrings [
+                        "$username"
+                        "$hostname"
+                        "$directory"
+                        "$jobs"
+                        "$cmd_duration"
+                        "$character"
+                      ];
+                      directory = {
+                        truncation_length = 10;
+                        truncate_to_repo = false;
+                      };
+                      scan_timeout = 10;
+                      character = {
+                        success_symbol = "➜";
+                        error_symbol = "➜";
+                      };
+                    };
+                  };
+                  programs.bash = {
+                    enable = true;
+                    sessionVariables = {
+                    };
+                    profileExtra = ''
+                      if [ -e /home/nathan/.nix-profile/etc/profile.d/nix.sh ]; then . /home/nathan/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer
+                      . "$HOME/.cargo/env"
+                      export PATH="/run/system-manager/sw/bin/:/home/nbraswell6/.nix-profile/bin:/nix/var/nix/profiles/default/bin:$PATH"
+                    '';
+                    shellAliases = {
+                      ng  ="nmcli c up NETGEAR97";
+                      ng24="nmcli c up NETGEAR97_24_2Ghz";
+                      ng58="nmcli c up NETGEAR97_28_5Ghz";
+                      ng5c="nmcli c up NETGEAR97_2C_5Ghz";
+                    };
+                  };
+                  programs.git = {
+                    enable = true;
+                    lfs.enable = true;
+                    userName = "Nathan Braswell";
+                    userEmail = "nathan@braswell.email";
+                  };
+                  programs.vim = {
+                    enable = true;
+                    plugins = with pkgs.vimPlugins; [
+                      nerdcommenter vim-polyglot #parinfer-rust
+                    ];
+                    settings = {
+                      # Is the need for these obliviated by vim-polyglot using sleuth?
+                      #expandtab = false;
+                      tabstop = 4;
+                      shiftwidth = 4;
+                    };
+                    extraConfig = ''
+                      set number
+                      set hlsearch
+                      nnoremap <leader>m :bn<CR>
+                      nnoremap <leader>t :tabnew<CR>
+                      nnoremap <leader>. :tabn<CR>
+                      nnoremap <leader>, :tabp<CR>
+                      nnoremap <leader>v :vsplit<CR>
+                      nnoremap <leader>h :split<CR>
+                      nnoremap <leader>q :q<CR>
+                      inoremap jk <Esc>
+                      inoremap kj <Esc>
+
+                      " Thanks to https://unix.stackexchange.com/questions/140898/vim-hide-status-line-in-the-bottom
+                      let s:hidden_all = 0
+                      function! ToggleHiddenAll()
+                          if s:hidden_all  == 0
+                              let s:hidden_all = 1
+                              set noshowmode
+                              set noruler
+                              set laststatus=0
+                              set noshowcmd
+                          else
+                              let s:hidden_all = 0
+                              set showmode
+                              set ruler
+                              set laststatus=2
+                              set showcmd
+                          endif
+                      endfunction
+
+                      nnoremap <S-h> :call ToggleHiddenAll()<CR>
+                    '';
+                  };
+                  programs.tmux = {
+                    enable = true;
+                    extraConfig = ''
+                      #$Id: vim-keys.conf,v 1.2 2010-09-18 09:36:15 nicm Exp $
+                      #
+                      # vim-keys.conf, v1.2 2010/09/12
+                      #
+                      # By Daniel Thau.  Public domain.
+                      #
+                      # This configuration file binds many vi- and vim-like bindings to the
+                      # appropriate tmux key bindings.  Note that for many key bindings there is no
+                      # tmux analogue.  This is intended for tmux 1.3, which handles pane selection
+                      # differently from the previous versions
+                  
+                      # split windows like vim
+                      # vim's definition of a horizontal/vertical split is reversed from tmux's
+                      bind s split-window -v
+                      bind v split-window -h
+                  
+                      # move around panes with hjkl, as one would in vim after pressing ctrl-w
+                      bind h select-pane -L
+                      bind j select-pane -D
+                      bind k select-pane -U
+                      bind l select-pane -R
+                  
+                      # resize panes like vim
+                      # feel free to change the "1" to however many lines you want to resize by, only
+                      # one at a time can be slow
+                      bind < resize-pane -L 1
+                      bind > resize-pane -R 1
+                      bind - resize-pane -D 1
+                      bind + resize-pane -U 1
+                  
+                      # bind : to command-prompt like vim
+                      # this is the default in tmux already
+                      bind : command-prompt
+                  
+                      # vi-style controls for copy mode
+                      setw -g mode-keys vi
+                    '';
+                  };
+                  programs.emacs = {
+                    enable = true;
+                    extraConfig = ''
+                      (menu-bar-mode   -1)
+                      (tool-bar-mode    -1)
+                      (scroll-bar-mode  -1)
+
+                      ;; Use spaces, not tabs, for indentation.
+                      (setq-default indent-tabs-mode nil)
+                      ;; Highlight matching pairs of parentheses.
+                      (setq show-paren-delay 0)
+                      (show-paren-mode)
+
+                      ;(require 'smartparens-config)
+
+
+                      (setq evil-want-C-u-scroll t)
+                      (evil-mode 1)
+                      (evil-set-undo-system 'undo-redo)
+                      (setq key-chord-two-keys-delay 0.5)
+                      (key-chord-define evil-insert-state-map "jk" 'evil-normal-state)
+                      (key-chord-mode 1)
+                      (custom-set-variables
+                      ;; custom-set-variables was added by Custom.
+                      ;; If you edit it by hand, you could mess it up, so be careful.
+                      ;; Your init file should contain only one such instance.
+                      ;; If there is more than one, they won't work right.
+                      '(custom-safe-themes
+                      '("3ff4a0ad1a2da59a72536e6030291cf663314c14c8a5a9eb475f3c28436d071d" default)))
+                      (custom-set-faces
+                      ;; custom-set-faces was added by Custom.
+                      ;; If you edit it by hand, you could mess it up, so be careful.
+                      ;; Your init file should contain only one such instance.
+                      ;; If there is more than one, they won't work right.
+                      )
+                      (load-theme 'dracula t)
+                    '';
+                    extraPackages = epkgs: with epkgs; [
+                      evil key-chord magit proof-general
+                      #paredit
+                      #smartparens
+                      #parinfer-rust-mode
+                      rainbow-delimiters dracula-theme
+                    ];
+                  };
+              })

home_manager.nix

@@ -1,131 +0,0 @@
-{
-  home-manager.useGlobalPkgs = true;
-  home-manager.users.marcus = { config, pkgs, lib, ... }:{ 
-    # This value determines the Home Manager release that your
-    # configuration is compatible with. This helps avoid breakage
-    # when a new Home Manager release introduces backwards
-    # incompatible changes.
-    #
-    # You can update Home Manager without changing this value. See
-    # the Home Manager release notes for a list of state version
-    # changes in each release.
-    home.stateVersion = "22.11";
-
-    home.packages = with pkgs; [ ];
-    programs.starship = {
-      enable = true;
-      enableBashIntegration = true;
-      settings = {
-        add_newline = false;
-        format = lib.concatStrings [
-          "$username"
-          "$hostname"
-          "$directory"
-          "$jobs"
-          "$cmd_duration"
-          "$character"
-        ];
-        directory = {
-          truncation_length = 10;
-          truncate_to_repo = false;
-        };
-        scan_timeout = 10;
-        character = {
-          success_symbol = "➜";
-          error_symbol = "➜";
-        };
-      };
-    };
-    programs.git = {
-      enable = true;
-      userName = "Marcus Godwin";
-      userEmail = "godwin3@gatech.edu";
-    };
-    programs.vim = {
-      enable = true;
-      plugins = with pkgs.vimPlugins; [
-        nerdcommenter vim-polyglot #parinfer-rust
-      ];
-      settings = {
-        # Is the need for these obliviated by vim-polyglot using sleuth?
-        #expandtab = false;
-        tabstop = 4;
-        shiftwidth = 4;
-      };
-      extraConfig = ''
-        set number
-        set hlsearch
-        nnoremap <leader>m :bn<CR>
-        nnoremap <leader>t :tabnew<CR>
-        nnoremap <leader>. :tabn<CR>
-        nnoremap <leader>, :tabp<CR>
-        nnoremap <leader>v :vsplit<CR>
-        nnoremap <leader>h :split<CR>
-        nnoremap <leader>q :q<CR>
-        inoremap jk <Esc>
-        inoremap kj <Esc>
-
-        " Thanks to https://unix.stackexchange.com/questions/140898/vim-hide-status-line-in-the-bottom
-        let s:hidden_all = 0
-        function! ToggleHiddenAll()
-            if s:hidden_all  == 0
-                let s:hidden_all = 1
-                set noshowmode
-                set noruler
-                set laststatus=0
-                set noshowcmd
-            else
-                let s:hidden_all = 0
-                set showmode
-                set ruler
-                set laststatus=2
-                set showcmd
-            endif
-        endfunction
-
-        nnoremap <S-h> :call ToggleHiddenAll()<CR>
-      '';
-    };
-    programs.tmux = {
-      enable = true;
-      extraConfig = ''
-        #$Id: vim-keys.conf,v 1.2 2010-09-18 09:36:15 nicm Exp $
-        #
-        # vim-keys.conf, v1.2 2010/09/12
-        #
-        # By Daniel Thau.  Public domain.
-        #
-        # This configuration file binds many vi- and vim-like bindings to the
-        # appropriate tmux key bindings.  Note that for many key bindings there is no
-        # tmux analogue.  This is intended for tmux 1.3, which handles pane selection
-        # differently from the previous versions
-
-        # split windows like vim
-        # vim's definition of a horizontal/vertical split is reversed from tmux's
-        bind s split-window -v
-        bind v split-window -h
-
-        # move around panes with hjkl, as one would in vim after pressing ctrl-w
-        bind h select-pane -L
-        bind j select-pane -D
-        bind k select-pane -U
-        bind l select-pane -R
-
-        # resize panes like vim
-        # feel free to change the "1" to however many lines you want to resize by, only
-        # one at a time can be slow
-        bind < resize-pane -L 1
-        bind > resize-pane -R 1
-        bind - resize-pane -D 1
-        bind + resize-pane -U 1
-
-        # bind : to command-prompt like vim
-        # this is the default in tmux already
-        bind : command-prompt
-
-        # vi-style controls for copy mode
-        setw -g mode-keys vi
-      '';
-    };
-  };
-}

panam.nix

@@ -1,276 +0,0 @@
-({ config, lib, pkgs, modulesPath, ... }:  {
-    imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-    
-    # needed for stable restarts of pi-hole container
-    #boot.cleanTmpDir = true;
-    
-    boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
-    boot.initrd.kernelModules = [ ];
-    boot.kernelModules = [ ];
-    boot.extraModulePackages = [ ];
-    
-    fileSystems."/" = { device = "/dev/disk/by-uuid/b22f705d-8d3d-4d6c-997d-226399f03e18"; fsType = "ext4"; };
-    fileSystems."/boot" = { device = "/dev/disk/by-uuid/BE49-6634"; fsType = "vfat"; };
-    swapDevices = [ { device = "/dev/disk/by-uuid/9b8aa223-f67b-4c1a-9161-a3daec3dfefc"; } ];
-    # Mounted data drives for use by glusterfs
-    #fileSystems."/data/brick1" = { device = "/dev/disk/by-label/gfs_ssd1"; fsType = "xfs"; };
-    fileSystems."/data/brick2" = { device = "/dev/disk/by-label/gfs_hdd1"; fsType = "xfs"; };
-    fileSystems."/data/brick3" = { device = "/dev/disk/by-label/gfs_hdd2"; fsType = "xfs"; };
-    # Glusterfs shared storage
-    #fileSystems."/ghost_in_the_stream" = { device = "panam:/gv0"; fsType = "glusterfs"; };
-    networking.useDHCP = lib.mkDefault true;
-    nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-    powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
-    hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-    # high-resolution display
-    #hardware.video.hidpi.enable = lib.mkDefault true;
-    
-    
-    boot.loader.systemd-boot.enable = true;
-    boot.loader.efi.canTouchEfiVariables = true;
-    
-    networking.hostName = "panam"; # Define your hostname.
-    
-    system.stateVersion = "22.11"; # Did you read the comment?
-    
-    nixpkgs.config.allowUnfree = true;
-    nix.settings.experimental-features = [ "nix-command" "flakes" ];
-    networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
-    time.timeZone = "America/New_York";
-    users.extraUsers.marcus = {
-      name = "marcus";
-      isNormalUser = true;
-      group = "users";
-      extraGroups = [ "wheel" "disk" "audio" "video" "networkmanager" "systemd-journal" "sway" "plugdev" "adbusers" "docker" ];
-      createHome = true;
-      home = "/home/marcus";
-      shell = "/run/current-system/sw/bin/bash";
-    };
-    users.extraUsers.nathan = {
-      name = "nathan";
-      isNormalUser = true;
-      group = "users";
-      extraGroups = [ "wheel" "disk" "audio" "video" "networkmanager" "systemd-journal" "sway" "plugdev" "adbusers" "docker" ];
-      createHome = true;
-      home = "/home/nathan";
-      shell = "/run/current-system/sw/bin/bash";
-    };
-    
-    # Pi Hole + docker setup
-    #virtualisation.oci-containers.backend = "docker";
-    #virtualisation.docker.autoPrune.enable = true;
-    
-    #virtualisation.oci-containers.containers.pihole = {
-      #image = "pihole/pihole:2023.02.2";
-    #  image = "pihole/pihole:latest";
-    #  ports = [
-    #    "5353:53/udp"
-    #    "5353:53/tcp"
-    #    "9091:80/tcp"
-    #  ];
-    #  volumes = [
-    #    "/var/lib/pihole/:/etc/pihole/"
-    #    "/var/lib/dnsmasq.d:/etc/dnsmasq.d"
-    #  ];
-    #  environment = {
-    #    TZ = config.time.timeZone;
-    #    WEB_PORT = "80";
-    #    WEBPASSWORD = "critical";
-    #    PIHOLE_DNS_ = "9.9.9.9;2620:fe::fe";
-    #    REV_SERVER = "true";
-    #    REV_SERVER_DOMAIN = "pihole.local";
-    #    REV_SERVER_TARGET = "192.168.4.1";
-    #    REV_SERVER_CIDR = "192.168.4.0/16";
-    #    DNSMASQ_LISTENING = "local";
-    #    VIRTUAL_HOST = "pi.hole";
-    #  };
-    #  extraOptions = [
-    #    "--add-host=host.docker.internal:host-gateway"
-    #  ];
-    #};
-    #systemd.services."docker-pihole".postStart = ''
-    #  while ! docker ps | grep pihole; do
-    #    sleep 10s
-    #    echo "Waiting on containers"
-    #  done
-    #  sleep 30s
-    
-    #  docker exec pihole pihole -a adlist add "https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt"
-    #  docker exec pihole pihole -a adlist add "https://v.firebog.net/hosts/AdguardDNS.txt"
-    #  docker exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Easylist.txt"
-    #  docker exec pihole pihole -a adlist add "https://v.firebog.net/hosts/Easyprivacy.txt"
-    
-    #  docker exec pihole pihole -g
-    #  '';
-    
-
-    # Adguard Home
-    services.adguardhome = {
-      enable = true;
-      mutableSettings = true;
-      openFirewall = true;
-      settings = {
-        http = {
-          address = "127.0.0.1:3000";
-        };
-        dns = {
-          upstream_dns = [
-            "9.9.9.9#dns.quad9.net"
-            "1.1.1.1"
-          ];
-        };
-        filtering = {
-          protection_enabled = true;
-          filtering_enabled = true;
-          parental_enabled = false;
-          safe_search = {
-            enabled = false;
-          };
-        };
-      };
-    };
-    # Enable flatpak for installing/running steam link software
-    services.flatpak.enable = true;
-    
-    # testing
-    services.jellyfin.enable = true;
-    services.tachikoma = {
-      enable = true;
-      user = "nathan";
-      config = ''
-        id = "panam"
-        database_prefix = "/home/nathan/tachikoma_db"
-        adam_smasher_your_io_bandwidth = false
-        reset_interval = 300
-        port = 8080
-
-        [shares.default]
-        serve = [ "/data/brick1", "/data/brick2", "/data/brick3", "/home/videos" ]
-        avoid = [ "/data/brick2/grey_share", "/data/brick2/staging", "/data/brick2/cache", "data/brick2/Angel Cop - Remastered", "/data/brick2/Gunbuster - The Complete OVA Series", "/data/brick2/Iria - Zeiram the Animation/", "/data/brick2/Record of Lodoss War- Chronicles of the Heroic Knight" ]
-        download_dir = "/data/brick2/cache"
-        mount_point = "/fuse_mount" # this is optional, remove if you don't want to FUSE
-        max_delete = 30
-        [shares.a_darker_shade_of_grey]
-        serve = [ "/data/brick2/grey_share" ]
-        max_delete = 30
-      '';
-    };
-    programs.fuse.userAllowOther = true;
-    security.rtkit.enable = true;
-    services.pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-    };
-    services.dbus.enable = true;
-    xdg.portal = {
-      enable = true;
-      wlr.enable = true;
-      extraPortals = [
-        pkgs.xdg-desktop-portal-gtk 
-        pkgs.xdg-desktop-portal-kde 
-      ];
-      #gtkUsePortal = true;
-    };
-    nixpkgs.overlays = [
-    ];
-    
-    programs.sway = {
-      enable = true;
-      wrapperFeatures.gtk = true;
-      extraPackages = with pkgs; [
-        swaylock # lockscreen
-        swayidle
-        xwayland # for legacy apps
-        #waybar # status bar
-        mako # notification daemon
-        kanshi # autorandr
-        bemenu # is this right?
-        i3status
-        ffmpeg_7-full
-      ];
-    };
-    
-    environment = {
-      etc = {
-        "sway/config".source = ./sway_config;
-      };
-    };
-    # For steam, and Vulkan in general
-    
-    nixpkgs.config.packageOverrides = pkgs: {
-      vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
-    };
-    hardware.graphics = {
-      enable = true;
-      enable32Bit = true;
-      extraPackages = with pkgs; [
-        intel-media-driver
-        intel-vaapi-driver # previously vaapiIntel
-        vaapiVdpau
-        libvdpau-va-gl
-        intel-compute-runtime # OpenCL filter support (hardware tonemapping and subtitle burn-in)
-        vpl-gpu-rt # QSV on 11th gen or newer
-        intel-media-sdk # QSV up to 11th gen
-      ];
-    };
-    programs.bash.shellAliases = {
-      steamlink = "flatpak run com.valvesoftware.SteamLink";
-    };
-    environment.systemPackages = with pkgs; [
-      tmux vim wget curl git w3m iftop iotop killall file unzip zip ripgrep imv killall htop
-      firefox pkgs.nautilus vlc steam 
-      foot pavucontrol pywal
-      sway wayland glib dracula-theme pkgs.adwaita-icon-theme wl-clipboard
-      pkgs.jellyfin
-      pkgs.jellyfin-web
-      pkgs.jellyfin-ffmpeg
-      (pkgs.writeTextFile {
-        name = "dbus-sway-environment";
-        destination = "/bin/dbus-sway-environment";
-        executable = true;
-    
-        text = ''
-          dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
-          systemctl --user stop pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr
-          systemctl --user start pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr
-        '';
-      })
-      # currently, there is some friction between sway and gtk:
-      # https://github.com/swaywm/sway/wiki/GTK-3-settings-on-Wayland
-      # the suggested way to set gtk settings is with gsettings
-      # for gsettings to work, we need to tell it where the schemas are
-      # using the XDG_DATA_DIR environment variable
-      # run at the end of sway config
-      (pkgs.writeTextFile {
-        name = "configure-gtk";
-        destination = "/bin/configure-gtk";
-        executable = true;
-        text = let
-          schema = pkgs.gsettings-desktop-schemas;
-          datadir = "${schema}/share/gsettings-schemas/${schema.name}";
-        in ''
-            export XDG_DATA_DIRS=${datadir}:$XDG_DATA_DIRS
-            gnome_schema=org.gnome.desktop.interface
-            gsettings set $gnome_schema gtk-theme 'Dracula'
-        '';
-      })
-    ];
-    programs.waybar.enable = true;
-    
-    # kanshi systemd service
-    systemd.user.services.kanshi = {
-      description = "kanshi daemon";
-      serviceConfig = {
-        Type = "simple";
-        ExecStart = "${pkgs.kanshi}/bin/kanshi -c kanshi_config_file";
-      };
-    };
-    
-    services.openssh.enable = true;
-    services.tailscale.enable = true;
-    networking.firewall.enable = false;
-    
-})
-

sway_config

@@ -11,20 +11,21 @@ font pango:Ubuntu Sans Mono 10
 
 #exec systemctl --user import-environment XDG_SESSION_TYPE XDG_CURRENT_DESKTOP
 #exec dbus-update-activation-environment WAYLAND_DISPLAY
-exec configure-gtk
 exec dbus-sway-environment
+exec configure-gtk
 # give sway a little time to startup before starting kanshi.
 exec sleep 5; systemctl --user start kanshi.service
 
-xwayland enable
-
 #When everything's wayland, maybe
-#output eDP-1 scale 2
+output eDP-1 scale 1
 
 #Output HDMI-A-1 'Goldstar Company Ltd LG TV SSCR2 0x00000101'
 output HDMI-A-1 mode 1920x1080@60Hz
-#output HDMI-A-1 mode 4096x2160@30Hz
 
+#Output DP-4 'LG Electronics LG TV SSCR2 0x00000101'
+output DP-3 mode 1280x720@60Hz
+#output DP-4 mode 1280x720@60Hz
+#output DP-4 mode 3840x2160@60Hz
 
 # reload the configuration file
 bindsym $mod+Shift+q reload
@@ -53,6 +54,7 @@ floating_modifier $mod
 #bindsym $mod+Return exec st
 #bindsym $mod+Return exec sakura
 bindsym $mod+Return exec foot
+bindsym $mod+Shift+Return exec ghostty
 
 # kill focused window
 bindsym $mod+Shift+c kill
@@ -176,19 +178,17 @@ input 9456:320:Metadot_-_Das_Keyboard_Das_Keyboard {
 
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
-#bar {
+bar {
-#    position top
+    position top
 
     # When the status_command prints a new line to stdout, swaybar updates.
     # The default just shows the current date and time.
     #status_command while date +'%Y-%m-%d %l:%M:%S %p'; do sleep 1; done
-#	status_command i3status
+	status_command i3status
 
-#    colors {
+    colors {
-#        statusline $color7
+        statusline $color7
-#        background $color0
+        background $color0
-#        inactive_workspace #32323200 #32323200 #5c5c5c
+        inactive_workspace #32323200 #32323200 #5c5c5c
-#    }
+    }
-#}
+}
-
-include /etc/sway/config.d/*

system-manager/flake.lock

@@ -0,0 +1,123 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "id": "flake-utils",
+        "type": "indirect"
+      }
+    },
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1756261190,
+        "narHash": "sha256-eiy0klFK5EVJLNilutR7grsZN/7Itj9DyD75eyOf83k=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "77f348da3176dc68b20a73dab94852a417daf361",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "nix-system-graphics": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1737457219,
+        "narHash": "sha256-nX9dxoATDCSQgWw/iv6BngXDJEyHVYYEvHEVQ7Ig3fI=",
+        "owner": "soupglasses",
+        "repo": "nix-system-graphics",
+        "rev": "9c875e0c56cf2eb272b9102a4f3e24e4e31629fd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "soupglasses",
+        "repo": "nix-system-graphics",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1756125398,
+        "narHash": "sha256-XexyKZpf46cMiO5Vbj+dWSAXOnr285GHsMch8FBoHbc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3b9f00d7a7bf68acd4c4abb9d43695afb04e03a5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "home-manager": "home-manager",
+        "nix-system-graphics": "nix-system-graphics",
+        "nixpkgs": "nixpkgs",
+        "system-manager": "system-manager"
+      }
+    },
+    "system-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1756281415,
+        "narHash": "sha256-CjpoVwpJJ+DOZilPrDpZ5S3V+B1Y0calaHxTp2xMvGs=",
+        "owner": "numtide",
+        "repo": "system-manager",
+        "rev": "e271eedac9a24678ca6cfc61677837422bf474e0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "system-manager",
+        "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"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

system-manager/flake.nix

@@ -0,0 +1,34 @@
+{
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+
+    system-manager = {
+      url = "github:numtide/system-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    nix-system-graphics = {
+      url = "github:soupglasses/nix-system-graphics";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows =  "nixpkgs";
+    };
+  };
+
+  outputs = { self, flake-utils, nixpkgs, system-manager, nix-system-graphics, home-manager }: {
+    systemConfigs.default = system-manager.lib.makeSystemConfig {
+      modules = [
+        nix-system-graphics.systemModules.default
+        ({
+          config = {
+            nixpkgs.hostPlatform = "x86_64-linux";
+            system-manager.allowAnyDistro = true;
+            system-graphics.enable = true;
+          };
+        })
+      ];
+    };
+  };
+}

vps_activate_flake.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env sh
 
-nixos-rebuild switch --fast --flake .#vps --target-host root@room409.xyz
+NIXPKGS_ALLOW_INSECURE=1 nixos-rebuild switch --fast --flake .#vps --target-host root@room409.xyz --impure

work_activate_home_manager.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+nix run home-manager/master -- switch --flake  ~/nix_config/home-manager
+#home-manager switch --flake  ~/nix_config/home-manager

work_activate_system_manager.sh

@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+sudo $(which nix) run --extra-experimental-features 'nix-command flakes' 'github:numtide/system-manager' -- switch --flake  /home/nbraswell6/nix_config/system-manager