refactor

modules/default.nix

@@ -17,7 +17,6 @@
     ./steam.nix
     ./timezone.nix
     ./user.nix
-    ./systemd.nix
     ./man.nix
   ];
 

modules/env.nix

@@ -10,7 +10,7 @@
   environment.variables = {
     EDITOR = "nvim";
     VISUAL = "nvim";
-    TERM = "xterm-256color";
+    TERM = "ghostty";
     GTK_THEME = "Adwaita:dark";
     CC = "${pkgs.gcc}/bin/gcc";
     PKG_CONFIG_PATH = lib.makeSearchPath "lib/pkgconfig" [

modules/fish.nix

@@ -15,5 +15,4 @@ in
     fd
     ripgrep
   ];
-  users.users.cobray.shell = lib.mkForce fish-rust;
 }

modules/net.nix

@@ -2,7 +2,7 @@
 
 {
   networking.wireless.enable = false;  # Enables wireless support via wpa_supplicant.
-
+  networking.hostName = "nixos";
   # Configure network proxy if necessary
   # networking.proxy.default = "http://user:password@proxy:port/";
   # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";

modules/nixos.nix

@@ -2,21 +2,6 @@
 
 {
   nixpkgs.config.allowUnfree = true;
-
-  # Fix Python package issues
-  nixpkgs.overlays = [
-    (final: prev: {
-      python310Packages = prev.python310Packages.override {
-        overrides = pyFinal: pyPrev: {
-          terminado = pyPrev.terminado.overrideAttrs (old: {
-            doCheck = false;
-            doInstallCheck = false;
-          });
-        };
-      };
-    })
-  ];
-
   programs.nix-index.enable = true;
   programs.command-not-found.enable = false;
   nix.settings = {

modules/systemd.nix

@@ -1,36 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    autossh
-  ];
-
-  systemd.services.autossh-redbot = {
-    description = "Persistent SSH Tunnel to Cloud Server";
-    after = [ "network-online.target" ];
-    wants = [ "network-online.target" ];
-    wantedBy = [ "multi-user.target" ];
-    serviceConfig = {
-      User = "cobray";
-      Group = "cobray";
-      Restart = "always";
-      RestartSec = 30;
-      EnvironmentFile = "/home/cobray/.secrets/autossh-redbot.conf";
-      Environment = [
-        "AUTOSSH_GATETIME=0"
-        "AUTOSSH_POLL=60"
-        "AUTOSSH_FIRST_POLL=30"
-        "AUTOSSH_PORT=0"
-      ];
-      ExecStart = ''
-        ${pkgs.autossh}/bin/autossh -M 0 -N \
-          -o "ServerAliveInterval 60" \
-          -o "ServerAliveCountMax 3" \
-          -o "ExitOnForwardFailure=yes" \
-          -o "ConnectTimeout=10" \
-          -R "0.0.0.0:$REMOTE_PORT:localhost:$LOCAL_PORT" \
-          root@$REMOTE_HOST
-      '';
-    };
-  };
-}