Remove X11Forwarding from ssh config

Update git config with new home-manager options, replace tampermonkey with violentmonkey
Remove git-credential-oauth
2025-10-21 10:39:22 -04:00 · 2025-10-21 10:29:51 -04:00 · 2025-10-21 10:20:12 -04:00 · 2025-10-21 10:14:31 -04:00 · 2025-10-19 19:51:25 -04:00 · 2025-10-19 19:08:32 -04:00
14 changed files with 410 additions and 141 deletions
--- a/21
+++ b/21
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 chase
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1752743471,
-        "narHash": "sha256-4izhj1j7J4mE8LgljCXSIUDculqOsxxhdoC81VhqizM=",
+        "lastModified": 1760101617,
+        "narHash": "sha256-8jf/3ZCi+B7zYpIyV04+3wm72BD7Z801IlOzsOACR7I=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "e31b575d19e7cf8a8f4398e2f9cffe27a1332506",
+        "rev": "1826a9923881320306231b1c2090379ebf9fa4f8",
        "type": "github"
      },
      "original": {
@@ -38,11 +38,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1753870263,
-        "narHash": "sha256-r+mj2TAN4dcTDzQIaPjbR4xEiVsVSJ3j4qo40EwosMA=",
+        "lastModified": 1760953099,
+        "narHash": "sha256-sOKx2YcHa+lWEvaEOIGqLN2WWk1Wf5z6KM02tdfhMtw=",
        "owner": "catppuccin",
        "repo": "nix",
-        "rev": "2f0b779c531ac922a3f0e3f817ff4e794865873a",
+        "rev": "f5b21876888265d2fee7fb0640d1b66a1c1c6503",
        "type": "github"
      },
      "original": {
@@ -69,11 +69,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
        "type": "github"
      },
      "original": {
@@ -191,11 +191,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1753888434,
-        "narHash": "sha256-xQhSeLJVsxxkwchE4s6v1CnOI6YegCqeA1fgk/ivVI4=",
+        "lastModified": 1761005073,
+        "narHash": "sha256-r6qbieh8iC1q1eCaWv15f4UIp8SeGffwswhNSA1Qk3s=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "0630790b31d4547d79ff247bc3ba1adda3a017d9",
+        "rev": "84e1adb0cdd13f5f29886091c7234365e12b1e7f",
        "type": "github"
      },
      "original": {
@@ -212,11 +212,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1753592768,
-        "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
+        "lastModified": 1758463745,
+        "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "fc3add429f21450359369af74c2375cb34a2d204",
+        "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
        "type": "github"
      },
      "original": {
@@ -242,11 +242,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1749155331,
-        "narHash": "sha256-XR9fsI0zwLiFWfqi/pdS/VD+YNorKb3XIykgTg4l1nA=",
+        "lastModified": 1753964049,
+        "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
        "owner": "hyprwm",
        "repo": "hyprcursor",
-        "rev": "45fcc10b4c282746d93ec406a740c43b48b4ef80",
+        "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
        "type": "github"
      },
      "original": {
@@ -271,11 +271,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1752149140,
-        "narHash": "sha256-gbh1HL98Fdqu0jJIWN4OJQN7Kkth7+rbkFpSZLm/62A=",
+        "lastModified": 1760445448,
+        "narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=",
        "owner": "hyprwm",
        "repo": "hyprgraphics",
-        "rev": "340494a38b5ec453dfc542c6226481f736cc8a9a",
+        "rev": "50fb9f069219f338a11cf0bcccb9e58357d67757",
        "type": "github"
      },
      "original": {
@@ -300,11 +300,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1753907856,
-        "narHash": "sha256-ZPTaHJD7Y/FIicsTtVXfpZt3G5I0jk6jhMFnUoJ+GAc=",
+        "lastModified": 1760959370,
+        "narHash": "sha256-tqZWNOZg9P1gpWiHNGtZTTb/UK+2E5LFmFpfEIArTqE=",
        "owner": "hyprwm",
        "repo": "Hyprland",
-        "rev": "23be1db1e33125bfa4c04abbaf8ea560415ba367",
+        "rev": "46dab01bcc47b2e29f36cd4d35d04091e4134a67",
        "type": "github"
      },
      "original": {
@@ -325,11 +325,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1749046714,
-        "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=",
+        "lastModified": 1759610243,
+        "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
        "owner": "hyprwm",
        "repo": "hyprland-protocols",
-        "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330",
+        "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
        "type": "github"
      },
      "original": {
@@ -393,11 +393,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1750371812,
-        "narHash": "sha256-D868K1dVEACw17elVxRgXC6hOxY+54wIEjURztDWLk8=",
+        "lastModified": 1759080228,
+        "narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=",
        "owner": "hyprwm",
        "repo": "hyprland-qtutils",
-        "rev": "b13c7481e37856f322177010bdf75fccacd1adc8",
+        "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7",
        "type": "github"
      },
      "original": {
@@ -422,11 +422,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1750371198,
-        "narHash": "sha256-/iuJ1paQOBoSLqHflRNNGyroqfF/yvPNurxzcCT0cAE=",
+        "lastModified": 1758927902,
+        "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=",
        "owner": "hyprwm",
        "repo": "hyprlang",
-        "rev": "cee01452bca58d6cadb3224e21e370de8bc20f0b",
+        "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da",
        "type": "github"
      },
      "original": {
@@ -447,11 +447,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1753800567,
-        "narHash": "sha256-W0xgXsaqGa/5/7IBzKNhf0+23MqGPymYYfqT7ECqeTE=",
+        "lastModified": 1759619523,
+        "narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "c65d41d4f4e6ded6fdb9d508a73e2fe90e55cdf7",
+        "rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef",
        "type": "github"
      },
      "original": {
@@ -472,11 +472,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1751897909,
-        "narHash": "sha256-FnhBENxihITZldThvbO7883PdXC/2dzW4eiNvtoV5Ao=",
+        "lastModified": 1755184602,
+        "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=",
        "owner": "hyprwm",
        "repo": "hyprwayland-scanner",
-        "rev": "fcca0c61f988a9d092cbb33e906775014c61579d",
+        "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d",
        "type": "github"
      },
      "original": {
@@ -511,13 +511,33 @@
        "type": "github"
      }
    },
+    "nixarr": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_3",
+        "vpnconfinement": "vpnconfinement",
+        "website-builder": "website-builder"
+      },
+      "locked": {
+        "lastModified": 1755601892,
+        "narHash": "sha256-4FECnCcaUVQHnocuuu/KRldPW2yj7hFpd1F7bfWxTxY=",
+        "owner": "rasmus-kirk",
+        "repo": "nixarr",
+        "rev": "c6cd890fa028ec2a8d735a121cb0a161d265101c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rasmus-kirk",
+        "repo": "nixarr",
+        "type": "github"
+      }
+    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1753250450,
-        "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=",
+        "lastModified": 1760524057,
+        "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf",
+        "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5",
        "type": "github"
      },
      "original": {
@@ -545,11 +565,11 @@
    },
    "nixpkgs-stable_2": {
      "locked": {
-        "lastModified": 1753749649,
-        "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=",
+        "lastModified": 1760862643,
+        "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a",
+        "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c",
        "type": "github"
      },
      "original": {
@@ -561,11 +581,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1752687322,
-        "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=",
+        "lastModified": 1760878510,
+        "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251",
+        "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
        "type": "github"
      },
      "original": {
@@ -577,11 +597,27 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1753694789,
-        "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=",
+        "lastModified": 1748662220,
+        "narHash": "sha256-7gGa49iB9nCnFk4h/g9zwjlQAyjtpgcFkODjcOQS0Es=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "59138c7667b7970d205d6a05a8bfa2d78caa3643",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1760878510,
+        "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727",
+        "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
        "type": "github"
      },
      "original": {
@@ -599,11 +635,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1753903622,
-        "narHash": "sha256-42JkRLlLO28HoqytDNc5TTjlVIouGAw+lXOzAwV/ltQ=",
+        "lastModified": 1761054947,
+        "narHash": "sha256-P+e8PRGke/JL/ibmkXFglLfLKtLSAcVa8OtQhv3MA1A=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "d8313c7ab00d25070aa1e83a2de239a3e27e66c2",
+        "rev": "cbea3e4d782ef3abae4600faa9545f07dd738210",
        "type": "github"
      },
      "original": {
@@ -622,15 +658,15 @@
        ]
      },
      "locked": {
-        "lastModified": 1748196248,
-        "narHash": "sha256-1iHjsH6/5UOerJEoZKE+Gx1BgAoge/YcnUsOA4wQ/BU=",
-        "owner": "nix-community",
+        "lastModified": 1756920164,
+        "narHash": "sha256-28Gc+3HHO9T5kpgOc4Cq3xKVZNKRp7J3qHYPRDEHbgY=",
+        "owner": "c-jordan",
        "repo": "plasma-manager",
-        "rev": "b7697abe89967839b273a863a3805345ea54ab56",
+        "rev": "70e2db34feac3715b3300a06d028f2637da611c7",
        "type": "github"
      },
      "original": {
-        "owner": "nix-community",
+        "owner": "c-jordan",
        "repo": "plasma-manager",
        "type": "github"
      }
@@ -645,11 +681,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1750779888,
-        "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
+        "lastModified": 1760663237,
+        "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
+        "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
        "type": "github"
      },
      "original": {
@@ -692,7 +728,8 @@
        "home-manager-stable": "home-manager-stable",
        "hyprland": "hyprland",
        "lanzaboote": "lanzaboote",
-        "nixpkgs": "nixpkgs_3",
+        "nixarr": "nixarr",
+        "nixpkgs": "nixpkgs_4",
        "nixpkgs-stable": "nixpkgs-stable_2",
        "nur": "nur",
        "plasma-manager": "plasma-manager",
@@ -727,11 +764,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1752544651,
-        "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=",
+        "lastModified": 1760998189,
+        "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "2c8def626f54708a9c38a5861866660395bb3461",
+        "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
        "type": "github"
      },
      "original": {
@@ -755,6 +792,42 @@
        "type": "github"
      }
    },
+    "vpnconfinement": {
+      "locked": {
+        "lastModified": 1743810720,
+        "narHash": "sha256-kbv/W4gizUSa6qH2rUQdgPj9AJaeN9k2XSWUYqj7IMU=",
+        "owner": "Maroka-chan",
+        "repo": "VPN-Confinement",
+        "rev": "74ae51e6d18b972ecc918ab43e8bde60c21a65d8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Maroka-chan",
+        "repo": "VPN-Confinement",
+        "type": "github"
+      }
+    },
+    "website-builder": {
+      "inputs": {
+        "nixpkgs": [
+          "nixarr",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1750317638,
+        "narHash": "sha256-B4RWcXXOLO6gMeYyV+K4olu+kGGsYamKH+JAm0cIXqI=",
+        "owner": "rasmus-kirk",
+        "repo": "website-builder",
+        "rev": "b54192000a00e865947f45bacf3184d56363ee38",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rasmus-kirk",
+        "repo": "website-builder",
+        "type": "github"
+      }
+    },
    "xdph": {
      "inputs": {
        "hyprland-protocols": [
@@ -783,11 +856,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1751300244,
-        "narHash": "sha256-PFuv1TZVYvQhha0ac53E3YgdtmLShrN0t4T6xqHl0jE=",
+        "lastModified": 1760713634,
+        "narHash": "sha256-5HXelmz2x/uO26lvW7MudnadbAfoBnve4tRBiDVLtOM=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "6115f3fdcb2c1a57b4a80a69f3c797e47607b90a",
+        "rev": "753bbbdf6a052994da94062e5b753288cef28dfb",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -27,16 +27,18 @@
    catppuccin.url = "github:catppuccin/nix";
    hyprland.url = "github:hyprwm/Hyprland";
    plasma-manager = {
-      url = "github:nix-community/plasma-manager";
+      url = "github:c-jordan/plasma-manager";
      inputs.nixpkgs.follows = "nixpkgs";
      inputs.home-manager.follows = "home-manager";
    };
+    nixarr.url = "github:rasmus-kirk/nixarr";
  };

  outputs = {
    self,
    catppuccin,
    lanzaboote,
+    nixarr,
    nur,
    plasma-manager,
    sops-nix,
@@ -124,6 +126,12 @@
        home-manager = inputs.home-manager-stable;
        modules = [];
      };
+      nixarr = mkNixOSConfigurations {
+        host = hosts.nixarr;
+        nixpkgs = inputs.nixpkgs;
+        home-manager = inputs.home-manager;
+        modules = [nixarr.nixosModules.default];
+      };
    };
  };
 }
--- a/home/base.nix
+++ b/home/base.nix
@@ -20,15 +20,8 @@
    sessionVariables = {
      # Aspell stuff
      ASPELL_CONF = "per-conf $XDG_CONFIG_HOME/aspell/aspell.conf; personal $XDG_DATA_HOME/aspell/en.pws; repl $XDG_DATA_HOME/aspell/en.prepl";
-      # Bitwarden stuff
-      BITWARDEN_SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/.bitwarden-ssh-agent.sock";
-      SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/.bitwarden-ssh-agent.sock";
-      ELECTRON_OZONE_PLATFORM_HINT = "wayland";
      # Java stuff
      _JAVA_OPTIONS = "-Djava.util.prefs.userRoot='$XDG_CONFIG_HOME'/java";
-      # libx11 stuff
-      XCOMPOSECACHE = "$XDG_CACHE_HOME/X11/xcompose";
-      XCOMPOSEFILE = "$XDG_CONFIG_HOME/X11/xcompose";
    };
    shellAliases = {
      gs = "git status";
@@ -49,11 +42,6 @@
    };
  };

-  catppuccin = {
-    enable = true;
-    flavor = "mocha";
-  };
-
  programs.bash = {
    enable = true;
    enableCompletion = true;
@@ -71,11 +59,13 @@
    enable = true;
    enableCompletion = true;
    autosuggestion.enable = true;
+    dotDir = "${config.xdg.configHome}/zsh";
    history = {
      append = true;
      extended = true;
      ignoreDups = true;
      ignorePatterns = [
+        "ls"
        "ls *"
        "cd *"
        "gs"
@@ -147,11 +137,11 @@

  programs.git = {
    enable = true;
-    userName = "chase";
-    userEmail = "chase@cathoderaytube.net";
-    extraConfig = {
+    settings = { 
      init.defaultBranch = "main";
      pull.rebase = true;
+      user.name = "chase";
+      user.email = "chase@cathoderaytube.net";
    };
    signing = {
      format = "ssh";
@@ -160,8 +150,6 @@
    };
  };

-  programs.git-credential-oauth.enable = true;
-
  programs.gpg = {
    enable = true;
    homedir = "${config.xdg.dataHome}/gnupg";
@@ -178,30 +166,6 @@
    '';
  };

-  programs.starship = {
-    enable = true;
-    enableBashIntegration = true;
-    enableZshIntegration = true;
-    settings = {
-      line_break = {
-        disabled = true;
-      };
-      username = {
-        style_user = "bold blue";
-        format = "[$user]($style)@";
-        show_always = true;
-      };
-      hostname = {
-        style = "bold cyan";
-        format = "[$ssh_symbol$hostname]($style) ";
-        ssh_only = false;
-      };
-      directory = {
-        style = "bold green";
-      };
-    };
-  };
-
  programs.yazi = {
    enable = true;
    enableBashIntegration = true;
--- a/home/desktop.nix
+++ b/home/desktop.nix
@@ -7,6 +7,23 @@
    ./base.nix
  ];

+  home = {
+    sessionVariables = { 
+      # Bitwarden stuff
+      BITWARDEN_SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/.bitwarden-ssh-agent.sock";
+      SSH_AUTH_SOCK = "$XDG_RUNTIME_DIR/.bitwarden-ssh-agent.sock";
+      ELECTRON_OZONE_PLATFORM_HINT = "wayland";
+      # libx11 stuff
+      XCOMPOSECACHE = "$XDG_CACHE_HOME/X11/xcompose";
+      XCOMPOSEFILE = "$XDG_CONFIG_HOME/X11/xcompose";
+    };
+  };
+
+  catppuccin = {
+    enable = true;
+    flavor = "mocha";
+  };
+
  programs.emacs = {
    enable = true;
    package = pkgs.emacs-pgtk;
@@ -20,27 +37,47 @@
        id = 0;
        name = "default";
        isDefault = true;
+        containers = {
+          personal = {
+            color = "purple";
+            icon = "fingerprint";
+            id = 1;
+          };
+          work = {
+            color = "orange";
+            icon = "briefcase";
+            id = 2;
+          };
+          social = {
+            color = "blue";
+            icon = "chill";
+            id = 3;
+          };
+          dev = {
+            color = "green";
+            icon = "circle";
+            id = 4;
+          };
+        };
+        containersForce = true;
        extensions = {
          force = true;
          packages = with pkgs.nur.repos.rycee.firefox-addons; [
            awesome-rss
            betterttv
            bitwarden
-            clearurls
-            enhancer-for-youtube
            facebook-container
            flagfox
            hyperchat
            istilldontcareaboutcookies
            linkwarden
            livetl
-            privacy-badger
            return-youtube-dislikes
            search-by-image
            sponsorblock
            tab-session-manager
-            tampermonkey
            ublock-origin
+            violentmonkey
            windscribe
            ytcfilter
          ];
@@ -83,6 +120,7 @@
          };
        };
        settings = {
+          "apz.gtk.touchpad_pinch.enabled" = false;
          "browser.formfill.enable" = false;
          "browser.ml.chat.enabled" = false;
          "browser.ml.chat.shortcuts" = false;
@@ -99,12 +137,20 @@
          "browser.topsites.contile.enabled" = false;
          "browser.urlbar.trimURLs" = false;
          "browser.urlbar.unitConversion.enabled" = true;
+          "dom.security.https_only_mode" = true;
          "extensions.formautofill.addresses.enabled" = false;
          "extensions.formautofill.creditCards.enabled" = false;
          "extensions.pocket.enabled" = false;
          "general.autoScroll" = true;
-          "widget.use-xdg-desktop-portal.file-picker" = 1;
+          "permissions.default.geo" = 2;
+          "privacy.bounceTrackingProtection.mode" = 1;
+          "privacy.fingerprintingProtection" = true;
+          "privacy.trackingprotection.consentmanager.skip.pbmode.enabled" = false;
+          "privacy.trackingprotection.emailtracking.enabled" = true;
+          "privacy.trackingprotection.enabled" = true;
+          "privacy.trackingprotection.socialtracking.enabled" = true;
          "signon.rememberSignons" = false;
+          "widget.use-xdg-desktop-portal.file-picker" = 1;
        };
        search = {
          force = true;
@@ -138,6 +184,25 @@
              icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
              definedAliases = ["@np"];
            };
+            "Nix Options" = {
+              urls = [
+                {
+                  template = "https://search.nixos.org/options?channel=unstable";
+                  params = [
+                    {
+                      name = "type";
+                      value = "options";
+                    }
+                    {
+                      name = "query";
+                      value = "{searchTerms}";
+                    }
+                  ];
+                }
+              ];
+              icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
+              definedAliases = ["@no"];
+            };
            "SearX" = {
              urls = [{template = "https://searx.traphouse.cathoderaytube.net/?q={searchTerms}";}];
              definedAliases = ["@searx"];
@@ -162,6 +227,10 @@
    };
  };

+  programs.lutris = {
+    enable = true;
+  };
+
  programs.mpv = {
    enable = true;
    config = {
@@ -176,9 +245,30 @@

  programs.obs-studio.enable = true;

-  programs.rofi = {
+  programs.rofi.enable = true;
+
+  programs.starship = {
    enable = true;
-    package = pkgs.rofi-wayland;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+    settings = {
+      line_break = {
+        disabled = true;
+      };
+      username = {
+        style_user = "bold blue";
+        format = "[$user]($style)@";
+        show_always = true;
+      };
+      hostname = {
+        style = "bold cyan";
+        format = "[$ssh_symbol$hostname]($style) ";
+        ssh_only = false;
+      };
+      directory = {
+        style = "bold green";
+      };
+    };
  };

  home.packages = with pkgs; [
@@ -189,18 +279,23 @@
    libnotify
    libreoffice
    logiops
+    openmsx
+    openutau
    picard
    protonmail-bridge
    (pkgs.python3.withPackages (python-pkgs: [
      python-pkgs.python-lsp-server
      python-pkgs.python-lsp-ruff
    ]))
+    qbittorrent
    runelite
    thunderbird
    vcv-rack
+    vkd3d
    waybar
    waybar-mpris
  ];
+
  services.arrpc.enable = true;

  services.emacs = {
@@ -220,9 +315,9 @@
    enable = true;
    extraConfig = ''
      audio_output {
-         type "pipewire"
-      name "Pipewire Output"
-          }
+        type "pipewire"
+        name "Pipewire Output"
+      }
    '';
    musicDirectory = "/mnt/share/media/music";
  };
@@ -243,4 +338,6 @@
    enable = true;
    mpd.useLocal = true;
  };
+
+  services.protonmail-bridge.enable = true;
 }
--- a/home/emacs/init.el
+++ b/home/emacs/init.el
@@ -112,6 +112,10 @@
  :config
  (evil-collection-init))

+(use-package evil-surround
+  :config
+  (global-evil-surround-mode 1))
+
 (use-package vertico
  :custom
  (vertico-cycle t)
@@ -176,6 +180,7 @@
 (column-number-mode)

 ;; line numbers, not quite everywhere
+(setq-default display-line-numbers-type 'relative)
 (add-hook 'prog-mode-hook #'display-line-numbers-mode)
 (add-hook 'text-mode #'display-line-numbers-mode)

@@ -212,6 +217,7 @@
 		 ("Code"     (or
 				      (mode . c-ts-mode)
 				      (mode . c++-ts-mode)
+                      (mode . emacs-lisp-mode)
 				      (mode . js-ts-mode)
                      (mode . makefile-gmake-mode)
 				      (mode . python-ts-mode)
@@ -231,8 +237,16 @@
 			(ibuffer-switch-to-saved-filter-groups "Default")
            (ibuffer-auto-mode 1)))

+;; make dired less messy
+(setf dired-kill-when-opening-new-dired-buffer t)
+
+;; kill buffers
+(substitute-key-definition 'kill-buffer 'kill-buffer-and-window global-map)
+
 ;; git stuff
-(use-package magit)
+(use-package magit
+  :config
+  (setq magit-bury-buffer-function 'kill-buffer))

 (use-package magit-todos
  :after magit)
@@ -286,6 +300,9 @@
  (global-corfu-mode 1)
  (corfu-history-mode 1))

+;; license templates
+(use-package license-templates)
+
 ;; yasnippet config
 (use-package yasnippet
  :defer t
--- a/home/plasma.nix
+++ b/home/plasma.nix
@@ -40,6 +40,7 @@
        desktopSwitching.animation = "slide";
        minimization.animation = "squash";
        shakeCursor.enable = true;
+        zoom.enable = false;
      };
      nightLight = {
        enable = true;
--- a/hosts/anzu/configuration.nix
+++ b/hosts/anzu/configuration.nix
@@ -12,16 +12,19 @@
  ];

  hardware.graphics = {
-    extraPackages = with pkgs; [
-      amdvlk
-    ];
-    extraPackages32 = with pkgs; [
-      driversi686Linux.amdvlk
-    ];
+    enable = true;
+    enable32Bit = true;
  };

  services.xserver.videoDrivers = [ "amdgpu" ];

+  boot.loader.systemd-boot.enable = lib.mkForce false;
+
+  boot.lanzaboote = {
+    enable = true;
+    pkiBundle = "/var/lib/sbctl";
+  };
+
  # Mount SMB share
  fileSystems."/mnt/share" = {
    device = "//haruko/share";
@@ -32,11 +35,10 @@
    in ["${automount_opts},credentials=${credentials},uid=1000,gid=100"];
  };

-  boot.loader.systemd-boot.enable = lib.mkForce false;
-
-  boot.lanzaboote = {
-    enable = true;
-    pkiBundle = "/var/lib/sbctl";
+  networking.wg-quick.interfaces = {
+    wg0 = {
+      configFile = "/home/chase/wg0.conf";
+    };
  };

  system.stateVersion = "24.11";
--- a/hosts/hosts.nix
+++ b/hosts/hosts.nix
@@ -19,4 +19,10 @@ in {
    arch = "x86_64-Linux";
    user = user;
  };
+  nixarr = {
+    hostname = "nixarr";
+    dir = "nixarr";
+    arch = "x86_64-Linux";
+    user = user;
+  };
 }
--- a/hosts/nixarr/configuration.nix
+++ b/hosts/nixarr/configuration.nix
@@ -0,0 +1,19 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+{
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
+    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+    ../../nixos/base.nix
+    ../../nixos/nixarr.nix
+  ];
+
+  networking.hostName = "nixarr";
+
+  system.stateVersion = "25.05";
+}
--- a/hosts/nixarr/home.nix
+++ b/hosts/nixarr/home.nix
@@ -0,0 +1,11 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
+    ../../home/base.nix
+  ];
+
+  home.stateVersion = "25.05";
+}
--- a/nixos/base.nix
+++ b/nixos/base.nix
@@ -61,15 +61,9 @@
  # Allow power management
  powerManagement.enable = true;

-  # Enable networking
+  # NetworkManager
  networking.networkmanager.enable = true;

-  # Catppuccin
-  catppuccin = {
-    enable = true;
-    flavor = "mocha";
-  };
-
  # Android debug tools
  programs.adb.enable = true;

@@ -97,6 +91,7 @@
      "cdrom"
      "dialout"
      "kvm"
+      "lp"
      "networkmanager"
      "tss"
      "video"
@@ -145,6 +140,11 @@

  programs.ssh = {
    enableAskPassword = false;
+    extraConfig = ''
+      Host nixarr
+        Hostname 192.168.1.165
+        ForwardAgent yes
+      '';
  };

  sops = {
@@ -172,18 +172,23 @@
    alejandra
    bitwarden-cli
    cifs-utils
+    dive
    flashrom
    gcc
    nixd
    pam_u2f
    pciutils
+    podman-compose
+    podman-tui
    python3
    qemu
+    quickemu
    rustup
    sbctl
    sops
    usbutils
    wget
+    wireguard-tools
    yubikey-manager
  ];

@@ -219,6 +224,7 @@
  services.openssh = {
    enable = true;
    settings = {
+      AllowAgentForwarding = true;
      PermitRootLogin = "no";
      PasswordAuthentication = false;
      KbdInteractiveAuthentication = false;
@@ -228,7 +234,12 @@
  services.pcscd.enable = true;

  # Enable CUPS to print documents.
-  services.printing.enable = true;
+  services.printing = {
+    enable = true;
+    drivers = [
+      pkgs.ptouch-driver
+    ];
+  };

  services.udev = {
    packages = with pkgs; [
@@ -240,4 +251,21 @@
  };

  services.yubikey-agent.enable = true;
+
+  virtualisation = {
+    containers.enable = true;
+    docker = {
+      enable = true;
+      rootless = {
+        enable = true;
+        setSocketVariable = true;
+      };
+    };
+    podman = {
+      enable = true;
+      defaultNetwork.settings = {
+        dns_enabled = true;
+      };
+    };
+  };
 }
--- a/nixos/desktop.nix
+++ b/nixos/desktop.nix
@@ -26,6 +26,8 @@

  # Catppuccin
  catppuccin = {
+    enable = true;
+    flavor = "mocha";
    sddm = {
      enable = true;
      background = "/home/chase/nix-config/home/wallpaper.jpg";
@@ -100,6 +102,9 @@
  # Install Steam
  programs.steam = {
    enable = true;
+    extraCompatPackages = with pkgs; [
+      proton-ge-bin
+    ];
    remotePlay.openFirewall = true;
    dedicatedServer.openFirewall = true;
    localNetworkGameTransfers.openFirewall = true;
--- a/nixos/nixarr.nix
+++ b/nixos/nixarr.nix
@@ -0,0 +1,17 @@
+{
+  pkgs,
+  nixarr,
+  ...
+}: {
+  nixarr = {
+    enable = true;
+    jellyfin = {
+      enable = true;
+      openFirewall = true;
+    };
+    sabnzbd = {
+      enable = true;
+      openFirewall = true;
+    };
+  };
+}
Author	SHA1	Message	Date
chase	09b0873a7d	Remove X11Forwarding from ssh config	2025-10-21 10:39:22 -04:00
chase	7804b1bbbc	Update git config with new home-manager options, replace tampermonkey with violentmonkey	2025-10-21 10:29:51 -04:00
chase	0abf588a36	Remove git-credential-oauth	2025-10-21 10:20:12 -04:00
chase	533e242e8a	Update flake	2025-10-21 10:14:31 -04:00
chase	97d78bdd75	Revert "Refactor nixarr without extra import" This reverts commit `4696423d91`.	2025-10-19 19:51:25 -04:00
chase	4696423d91	Refactor nixarr without extra import	2025-10-19 19:08:32 -04:00
chase	d8354d333f	Move some stuff from base to desktop	2025-10-19 19:04:06 -04:00
chase	e66815d0a1	Add jellyfin to nixarr config	2025-10-19 18:59:00 -04:00
chase	8e937d248c	ssh agent stuff, add nixarr host	2025-10-19 18:43:44 -04:00
chase	a18c2f4090	Enable ssh agent forwarding	2025-10-19 18:12:00 -04:00
chase	920f04128c	Add nixarr config, move starship to desktop config	2025-10-19 17:47:39 -04:00
chase	de3251d74d	Update flake, change nixarr to unstable	2025-10-19 14:24:00 -04:00
chase	c733de13cf	Move catppuccin config from base to desktop	2025-10-19 13:29:52 -04:00
chase	c306c61284	Docker config changes, add nixarr host	2025-10-19 12:59:21 -04:00
chase	eceaf5d276	Update flake	2025-10-10 19:43:23 -04:00
chase	fe88fd04c2	Fix zsh history bug, add packages for gaming and printing	2025-10-10 19:38:57 -04:00
chase	6b6ec3cb9e	Update flake, replace Docker with Podman, zsh history tweaks	2025-10-02 13:37:52 -04:00
chase	5e40bc1735	Add docker to base config and nix options search in firefox	2025-10-01 22:44:15 -04:00
chase	063eedbf87	Update flake, enable protonmail-bridge	2025-09-26 11:33:09 -04:00
chase	dee050022a	Add qbittorrent	2025-09-24 17:28:56 -04:00
chase	53bc9ae138	Change rofi-wayland to rofi now that they have been merged	2025-09-14 11:53:28 -04:00
chase	6bc66b0c2f	Update flake, plasma-manager experiment	2025-09-14 11:50:43 -04:00
chase	b3d4865101	update flake	2025-09-03 02:06:01 -04:00
chase	bf7fef3181	Add license	2025-09-03 01:53:22 -04:00
chase	fbe6dbf84a	Add blocktube extension, license-templates Emacs package, wireguard VPN	2025-09-02 22:53:15 -04:00
chase	6b71bb213e	NixOS: add wireguard-tools	2025-08-28 19:33:29 -04:00
chase	dc5ea719d7	Emacs: add evil-surround	2025-08-28 19:32:32 -04:00
chase	adbaed8256	Firefox config changes, add openutau	2025-08-28 19:31:26 -04:00
chase	e603322c45	Emacs relative line numbers	2025-08-24 04:39:02 -04:00
chase	4ad87a9d0a	Emacs config tweaks	2025-08-24 04:21:26 -04:00
chase	2b0334fdc0	Update flake	2025-08-24 01:20:59 -04:00
chase	ee5ba9db09	Disable touchpad zoom in Firefox	2025-08-23 22:06:06 -04:00
chase	6228e9e269	Update flake	2025-08-16 12:22:34 -04:00
chase	f643fe7cd5	Remove Enhancer for YouTube, it is unsupported	2025-08-14 01:31:56 -04:00
chase	d0e26059f0	Update flake	2025-08-14 01:18:47 -04:00