users/fish/cattop/configuration.nix

@@ -81,7 +81,6 @@
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.fish = {
     isNormalUser = true;
-    shell = pkgs.fish;
     extraGroups = [
       "wheel" # Enable ‘sudo’ for the user.
       "dialout" # Enable serial access for the user.
@@ -94,18 +93,9 @@
       fish
     ];
   };
-  programs.git = {
-    enable = true;
-    # extraConfig = {
-    #   push = {
-    #     autoSetupRemote = true;
-    #   };
-    # };
-  };
 
   programs.firefox.enable = true;
-  programs.neovim.enable = true;
+  programs.neovim.defaultEditor.enable = true;
-  #programs.neovim.defaultEditor.enable = true;
 
   # List packages installed in system profile.
   # You can use https://search.nixos.org/ to find more packages (and options).
@@ -116,7 +106,6 @@
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
-  programs.fish.enable = true;
   programs.mtr.enable = true;
   programs.gnupg.agent = {
     enable = true;

users/fish/cattop/home.nix

@@ -1,4 +1,13 @@
-{ pkgs, ... }:
+{
+  inputs,
+  config,
+  pkgs,
+  lib,
+  userSettings,
+  systemSettings,
+  ...
+}:
+
 {
   home = {
     stateVersion = "23.05"; # Don't change this unless upgrading Home Manager versions
@@ -45,7 +54,6 @@
 
   programs = {
     btop.enable = true;
-    fish.enable = true;
     hyfetch.enable = true;
 
     gh = {
@@ -53,17 +61,6 @@
       gitCredentialHelper.enable = true;
     };
 
-    ghostty = {
-      enable = true;
-      shader = "cursor-smear-black.glsl";
-      settings = {
-        theme = "citruszest";
-        adjust-cursor-thickness = 1;
-        background-opacity = 0.9;
-        background-blur = true;
-      };
-    };
-
     # Uncomment if you want to use MangoHud system-wide
     # mangohud.enable = true;
   };

users/fish/vim.nix

@@ -1,4 +1,3 @@
 { ... }:
 {
-  vim.languages.svelte.enable = true;
 }