From eac37f953505358513e21e4a91da579173a89a1d Mon Sep 17 00:00:00 2001
From: TheGeneralist <180094941+thegeneralist01@users.noreply.github.com>
Date: Fri, 20 Mar 2026 17:58:21 +0100
Subject: [PATCH] fixes

---
 hosts/thegeneralist/configuration.nix | 36 +++++++++++++++++++--------
 modules/common/shell/default.nix      |  4 +--
 modules/linux/shell/default.nix       | 14 +++++------
 modules/linux/xserver.nix             | 24 +++++++++++++-----
 4 files changed, 52 insertions(+), 26 deletions(-)

diff --git a/hosts/thegeneralist/configuration.nix b/hosts/thegeneralist/configuration.nix
index b27c9f8..8064501 100644
--- a/hosts/thegeneralist/configuration.nix
+++ b/hosts/thegeneralist/configuration.nix
@@ -2,7 +2,12 @@
 # your system. Help is available in the configuration.nix(5) man page, on
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
-{ config, pkgs, inputs, ... }:
+{
+  config,
+  pkgs,
+  inputs,
+  ...
+}:
 
 {
   imports = [ ./hardware-configuration.nix ];
@@ -10,12 +15,20 @@
   users.users.thegeneralist = {
     isNormalUser = true;
     description = "thegeneralist";
-    extraGroups = [ "wheel" "audio" "video" "input" "scanner" ];
-    shell = pkgs.nushell;
+    extraGroups = [
+      "wheel"
+      "audio"
+      "video"
+      "input"
+      "scanner"
+    ];
+    shell = pkgs.zsh;
     home = "/home/thegeneralist";
-    openssh.authorizedKeys.keys = let
-      inherit (import ../../keys.nix) thegeneralist;
-    in [ thegeneralist ];
+    openssh.authorizedKeys.keys =
+      let
+        inherit (import ../../keys.nix) thegeneralist;
+      in
+      [ thegeneralist ];
   };
 
   home-manager = {
@@ -29,10 +42,12 @@
   };
 
   age.secrets.hostkey.file = ./hostkey.age;
-  services.openssh.hostKeys = [{
-    type = "ed25519";
-    path = config.age.secrets.hostkey.path;
-  }];
+  services.openssh.hostKeys = [
+    {
+      type = "ed25519";
+      path = config.age.secrets.hostkey.path;
+    }
+  ];
 
   # Some programs
   services.libinput.enable = true;
@@ -52,4 +67,3 @@
 
   system.stateVersion = "24.11";
 }
-
diff --git a/modules/common/shell/default.nix b/modules/common/shell/default.nix
index a6f4a5e..eafb5da 100644
--- a/modules/common/shell/default.nix
+++ b/modules/common/shell/default.nix
@@ -71,12 +71,12 @@ in
           if config.isDarwin then
             ''[ -z "$INTELLIJ_ENVIRONMENT_READER" ] && [ -z "$skip" ]''
           else
-            ''[ -z "$INTELLIJ_ENVIRONMENT_READER" ] && [ -z "$skip" ] && [ -n "$SSH_TTY" ]'';
+            ''[ -z "$INTELLIJ_ENVIRONMENT_READER" ] && [ -z "$skip" ] && [ -z "$SSH_TTY" ]'';
       in
       {
         home.file.".zshrc".text = # zsh
           ''
-            export PATH="$HOME/.local/bin:/run/current-system/sw/bin:/nix/var/nix/profiles/default/bin:/etc/profiles/per-user/$USER/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin''${PATH:+:}''${PATH}"
+            export PATH="$HOME/.local/bin:/run/wrappers/bin:/run/current-system/sw/bin:/nix/var/nix/profiles/default/bin:/etc/profiles/per-user/$USER/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin''${PATH:+:}''${PATH}"
             source ${config'.home.sessionVariablesPackage}/etc/profile.d/hm-session-vars.sh
 
             if ${nuExecCondition}; then
diff --git a/modules/linux/shell/default.nix b/modules/linux/shell/default.nix
index 461c2d5..68a1320 100644
--- a/modules/linux/shell/default.nix
+++ b/modules/linux/shell/default.nix
@@ -1,14 +1,14 @@
 { config, lib, pkgs, ... }: let
   inherit (lib) concatStringsSep const flatten getAttr mapAttrsToList unique;
 in {
-  users.defaultUserShell = pkgs.zsh;
+  # users.defaultUserShell = pkgs.zsh;
 
-  environment.sessionVariables.SHELLS = config.home-manager.users
-  |> mapAttrsToList (const <| getAttr "shellsByPriority")
-  |> flatten
-  |> map (drv: "${drv}${drv.shellPath}")
-  |> unique
-  |> concatStringsSep ":";
+  # environment.sessionVariables.SHELLS = config.home-manager.users
+  # |> mapAttrsToList (const <| getAttr "shellsByPriority")
+  # |> flatten
+  # |> map (drv: "${drv}${drv.shellPath}")
+  # |> unique
+  # |> concatStringsSep ":";
 
   # environment.shellAliases = {
   #   ls = mkForce null;
diff --git a/modules/linux/xserver.nix b/modules/linux/xserver.nix
index 92bf9ca..d56af2b 100644
--- a/modules/linux/xserver.nix
+++ b/modules/linux/xserver.nix
@@ -70,8 +70,25 @@
         enable = true;
         package = pkgs.niri;
         settings = {
+          layout = {
+            focus-ring = {
+              enable = false;
+            };
+            tab-indicator = {
+              enable = false;
+            };
+            border = {
+              enable = false;
+            };
+            # border = "off";
+          };
+          spawn-at-startup = [
+            {
+              command = [ "noctalia-shell" ];
+            }
+          ];
           binds = {
-            # Shortcuts Panel
+            # Shortcuts Pane
             "Mod+Shift+Escape".action.show-hotkey-overlay = { };
 
             # Application Shortcuts
@@ -351,11 +368,6 @@
               "pgrep -x hyprpicker >/dev/null || hyprpicker"
             ];
           };
-          spawn-at-startup = [
-            {
-              command = [ "noctalia-shell" ];
-            }
-          ];
         };
       };
     }