Updated laptop

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": 1746562888,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
-        "owner": "numtide",
+        "owner": "SenchoPens",
-        "repo": "flake-utils",
+        "repo": "base16.nix",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
         "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": 1748383148,
+        "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=",
+        "owner": "rafaelmardojai",
+        "repo": "firefox-gnome-theme",
+        "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rafaelmardojai",
+        "repo": "firefox-gnome-theme",
+        "type": "github"
+      }
+    },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "stylix",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1751413152,
+        "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
+        "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": 1755625756,
-        "narHash": "sha256-p1QSLO8DJnANY+ppK7fjD8GqfCrEIDjso1CSRHsXL7Y=",
+        "narHash": "sha256-t57ayMEdV9g1aCfHzoQjHj1Fh3LDeyblceADm2hsLHM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5af1b9a0f193ab6138b89a8e0af8763c21bbf491",
+        "rev": "dd026d86420781e84d0732f2fa28e1c051117b59",
         "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": 1755424351,
+        "narHash": "sha256-xcorYLNdtLpb0wH5CPlUcpmYQUxeK95j1X855xQw+DY=",
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "rev": "9aa137af01f05386e5bb5050e983750017007a66",
+        "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": 1755419373,
+        "narHash": "sha256-EFH3zbpyLYjEboNV2Lmkxf9joEuFCmeYX+MMLRPStpg=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "a6febb86aa5af0df7bf2792ca027ef95a503d599",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1755330281,
+        "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1739020877,
+        "lastModified": 1755186698,
-        "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
+        "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
+        "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
         "type": "github"
       },
       "original": {
@@ -71,43 +246,88 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1781877992,
+        "lastModified": 1755274400,
-        "narHash": "sha256-iAqxefR//nOlNCgNwbJ7dZEyec7ABIWu0VK8PbLixDY=",
+        "narHash": "sha256-rTInmnp/xYrfcMZyFMH3kc8oko5zYfxsowaLv1LVobY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bb452854d59d604d25e2a4026e9ac8b8646156f0",
+        "rev": "ad7196ae55c295f53a7d1ec39e4a06d922f3b899",
         "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": 1751906969,
-        "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=",
+        "narHash": "sha256-BSQAOdPnzdpOuCdAGSJmefSDlqmStFNScEnrWzSqKPw=",
-        "owner": "NixOS",
+        "owner": "nix-community",
-        "repo": "nixpkgs",
+        "repo": "NUR",
-        "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b",
+        "rev": "ddb679f4131e819efe3bbc6457ba19d7ad116f25",
         "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": 1755636375,
+        "narHash": "sha256-HQQ7LdyHWCUcRBeGLTwJm+tJ8hmuglSzP/ZLeNBjFkk=",
+        "owner": "danth",
+        "repo": "stylix",
+        "rev": "2567b924669c566d132ce4cafd4bc0a119846b52",
+        "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": 1750770351,
+        "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=",
+        "owner": "tinted-theming",
+        "repo": "schemes",
+        "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "schemes",
+        "type": "github"
+      }
+    },
+    "tinted-tmux": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1751159871,
+        "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=",
+        "owner": "tinted-theming",
+        "repo": "tinted-tmux",
+        "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "tinted-tmux",
+        "type": "github"
+      }
+    },
+    "tinted-zed": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1751158968,
+        "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=",
+        "owner": "tinted-theming",
+        "repo": "base16-zed",
+        "rev": "86a470d94204f7652b906ab0d378e4231a5b3384",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tinted-theming",
+        "repo": "base16-zed",
+        "type": "github"
+      }
+    },
+    "xwayland-satellite-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1748488455,
+        "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "ref": "v0.6",
+        "repo": "xwayland-satellite",
+        "type": "github"
+      }
+    },
+    "xwayland-satellite-unstable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1755219541,
+        "narHash": "sha256-yKV6xHaPbEbh5RPxAJnb9yTs1wypr7do86hFFGQm1w8=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "5a184d435927c3423f0ad189ea2b490578450fb7",
+        "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
+}

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/*

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