Remove X11Forwarding from ssh config

This reverts commit 4696423d91.

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759499898,
+        "lastModified": 1760101617,
-        "narHash": "sha256-UNzYHLWfkSzLHDep5Ckb5tXc0fdxwPIrT+MY4kpQttM=",
+        "narHash": "sha256-8jf/3ZCi+B7zYpIyV04+3wm72BD7Z801IlOzsOACR7I=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "655e067f96fd44b3f5685e17f566b0e4d535d798",
+        "rev": "1826a9923881320306231b1c2090379ebf9fa4f8",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1760084311,
+        "lastModified": 1760953099,
-        "narHash": "sha256-YpNNtvA8v28Gd3/PHXCABuBWOzR0K8CyQPga13LxBH0=",
+        "narHash": "sha256-sOKx2YcHa+lWEvaEOIGqLN2WWk1Wf5z6KM02tdfhMtw=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "fa3a9d5f80ebfe7f4974bc1939f558690cc56359",
+        "rev": "f5b21876888265d2fee7fb0640d1b66a1c1c6503",
         "type": "github"
       },
       "original": {
@@ -191,11 +191,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760130406,
+        "lastModified": 1761005073,
-        "narHash": "sha256-GKMwBaFRw/C1p1VtjDz4DyhyzjKUWyi1K50bh8lgA2E=",
+        "narHash": "sha256-r6qbieh8iC1q1eCaWv15f4UIp8SeGffwswhNSA1Qk3s=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d305eece827a3fe317a2d70138f53feccaf890a1",
+        "rev": "84e1adb0cdd13f5f29886091c7234365e12b1e7f",
         "type": "github"
       },
       "original": {
@@ -271,11 +271,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759490292,
+        "lastModified": 1760445448,
-        "narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=",
+        "narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "9431db625cd9bb66ac55525479dce694101d6d7a",
+        "rev": "50fb9f069219f338a11cf0bcccb9e58357d67757",
         "type": "github"
       },
       "original": {
@@ -300,11 +300,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1760108751,
+        "lastModified": 1760959370,
-        "narHash": "sha256-GYyykk6SJytykQAz50WjKa2xK4C+sjPsz2wj5QjRktI=",
+        "narHash": "sha256-tqZWNOZg9P1gpWiHNGtZTTb/UK+2E5LFmFpfEIArTqE=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "6a01c399a971a57854fb4a99ce246534139beda4",
+        "rev": "46dab01bcc47b2e29f36cd4d35d04091e4134a67",
         "type": "github"
       },
       "original": {
@@ -325,11 +325,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749046714,
+        "lastModified": 1759610243,
-        "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=",
+        "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330",
+        "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
         "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": 1759831965,
+        "lastModified": 1760524057,
-        "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=",
+        "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c9b6fb798541223bbb396d287d16f43520250518",
+        "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5",
         "type": "github"
       },
       "original": {
@@ -545,11 +565,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1759994382,
+        "lastModified": 1760862643,
-        "narHash": "sha256-wSK+3UkalDZRVHGCRikZ//CyZUJWDJkBDTQX1+G77Ow=",
+        "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5da4a26309e796daa7ffca72df93dbe53b8164c7",
+        "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c",
         "type": "github"
       },
       "original": {
@@ -561,11 +581,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1759381078,
+        "lastModified": 1760878510,
-        "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
+        "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
+        "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
         "type": "github"
       },
       "original": {
@@ -577,11 +597,27 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1760038930,
+        "lastModified": 1748662220,
-        "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=",
+        "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": "0b4defa2584313f3b781240b29d61f6f9f7e0df3",
+        "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
         "type": "github"
       },
       "original": {
@@ -599,11 +635,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760129230,
+        "lastModified": 1761054947,
-        "narHash": "sha256-UyMZgEdINP+Ha1tDKHQsg+nf7FrBX8MaDzclkSkj7ko=",
+        "narHash": "sha256-P+e8PRGke/JL/ibmkXFglLfLKtLSAcVa8OtQhv3MA1A=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "49fa51d44b5671dfd4f31106eee473e2e3ca0491",
+        "rev": "cbea3e4d782ef3abae4600faa9545f07dd738210",
         "type": "github"
       },
       "original": {
@@ -645,11 +681,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758108966,
+        "lastModified": 1760663237,
-        "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=",
+        "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
+        "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": 1759635238,
+        "lastModified": 1760998189,
-        "narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=",
+        "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "6e5a38e08a2c31ae687504196a230ae00ea95133",
+        "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": 1755354946,
+        "lastModified": 1760713634,
-        "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=",
+        "narHash": "sha256-5HXelmz2x/uO26lvW7MudnadbAfoBnve4tRBiDVLtOM=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0",
+        "rev": "753bbbdf6a052994da94062e5b753288cef28dfb",
         "type": "github"
       },
       "original": {

flake.nix

@@ -31,12 +31,14 @@
       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];
+      };
     };
   };
 }

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,6 +59,7 @@
     enable = true;
     enableCompletion = true;
     autosuggestion.enable = true;
+    dotDir = "${config.xdg.configHome}/zsh";
     history = {
       append = true;
       extended = true;
@@ -148,11 +137,11 @@
 
   programs.git = {
     enable = true;
-    userName = "chase";
+    settings = { 
-    userEmail = "chase@cathoderaytube.net";
-    extraConfig = {
       init.defaultBranch = "main";
       pull.rebase = true;
+      user.name = "chase";
+      user.email = "chase@cathoderaytube.net";
     };
     signing = {
       format = "ssh";
@@ -161,8 +150,6 @@
     };
   };
 
-  programs.git-credential-oauth.enable = true;
-
   programs.gpg = {
     enable = true;
     homedir = "${config.xdg.dataHome}/gnupg";
@@ -179,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;

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;
@@ -59,8 +76,8 @@
             search-by-image
             sponsorblock
             tab-session-manager
-            tampermonkey
             ublock-origin
+            violentmonkey
             windscribe
             ytcfilter
           ];
@@ -230,6 +247,30 @@
 
   programs.rofi.enable = true;
 
+  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";
+      };
+    };
+  };
+
   home.packages = with pkgs; [
     anki-bin
     gimp

hosts/anzu/configuration.nix

@@ -12,12 +12,8 @@
   ];
 
   hardware.graphics = {
-    extraPackages = with pkgs; [
+    enable = true;
-      amdvlk
+    enable32Bit = true;
-    ];
-    extraPackages32 = with pkgs; [
-      driversi686Linux.amdvlk
-    ];
   };
 
   services.xserver.videoDrivers = [ "amdgpu" ];

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;
+  };
 }

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";
+}

hosts/nixarr/home.nix

@@ -0,0 +1,11 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  imports = [
+    ../../home/base.nix
+  ];
+
+  home.stateVersion = "25.05";
+}

nixos/base.nix

@@ -64,12 +64,6 @@
   # NetworkManager
   networking.networkmanager.enable = true;
 
-  # Catppuccin
-  catppuccin = {
-    enable = true;
-    flavor = "mocha";
-  };
-
   # Android debug tools
   programs.adb.enable = true;
 
@@ -146,6 +140,11 @@
 
   programs.ssh = {
     enableAskPassword = false;
+    extraConfig = ''
+      Host nixarr
+        Hostname 192.168.1.165
+        ForwardAgent yes
+      '';
   };
 
   sops = {
@@ -225,6 +224,7 @@
   services.openssh = {
     enable = true;
     settings = {
+      AllowAgentForwarding = true;
       PermitRootLogin = "no";
       PasswordAuthentication = false;
       KbdInteractiveAuthentication = false;
@@ -254,9 +254,15 @@
 
   virtualisation = {
     containers.enable = true;
+    docker = {
+      enable = true;
+      rootless = {
+        enable = true;
+        setSocketVariable = true;
+      };
+    };
     podman = {
       enable = true;
-      dockerCompat = true;
       defaultNetwork.settings = {
         dns_enabled = true;
       };

nixos/desktop.nix

@@ -26,6 +26,8 @@
 
   # Catppuccin
   catppuccin = {
+    enable = true;
+    flavor = "mocha";
     sddm = {
       enable = true;
       background = "/home/chase/nix-config/home/wallpaper.jpg";

nixos/nixarr.nix

@@ -0,0 +1,17 @@
+{
+  pkgs,
+  nixarr,
+  ...
+}: {
+  nixarr = {
+    enable = true;
+    jellyfin = {
+      enable = true;
+      openFirewall = true;
+    };
+    sabnzbd = {
+      enable = true;
+      openFirewall = true;
+    };
+  };
+}