more incomprehensible changes :)

homes/me/default.nix

@@ -13,8 +13,9 @@
   };
 
   imports = [
+    # inputs.nixcord.homeManagerModules.nixcord
     # inputs.spicetify-nix.homeManagerModules.default
-    #./wofi.nix
+    # ./wofi.nix
   ];
 
   /*
@@ -34,6 +35,25 @@
    };
   */
 
+  # ----- STYLIX -----
+  
+  #stylix = {
+  #  enable = true;
+  #
+  #	image = pkgs.fetchurl {
+  #    url = "https://www.pixelstalk.net/wp-content/uploads/2016/05/Epic-Anime-Awesome-Wallpapers.jpg";
+  #    sha256 = "enQo3wqhgf0FEPHj2coOCvo7DuZv+x5rL/WIo4qPI50=";
+  #  };
+  #	
+  #	# Stylix will automatically theme applications
+  #	autoEnable = true;
+  #	targets = {
+  #	  # disable Stylix's themes for ones I will theme manually
+  #	  firefox.enable = false;
+  #	  wofi.enable = false;
+  #	};
+  #};
+
   home = {
     username = "me";
 	homeDirectory = "/home/me";
@@ -42,18 +62,58 @@
   programs = {
     # these are both required for home-manager to work
     home-manager.enable = true;
-	git.enable = true;
     
+	git = {
+	  enable = true;
+	  userName = "emileclarkb";
+	  userEmail = "eclarkboman@gmail.com";
+	};
+
     # like `/bin/cat` but with syntax highlighting
 	# TODO: change the pager (maybe use Github:sachaos/viddy instead)
 	bat = {
 	  enable = true;
       config = {
 	    pager = "less -FR";
-	    theme = "Dracula";
+		# let Stylix control the theme
+	    #theme = "Dracula";
 	  };
 	};
 
+	firefox = {
+	  enable = true;
+      policies = {
+	    #BlockAboutConfig = true;
+	    DefaultDownloadDirectory = "\${home}/downloads";
+	  };
+	};
+
+    # I want to use fish as my login shell but it always
+	# goes terrible cause it isn't POSIX compliant, so
+	# instead Bash is my login and it will just exec fish
+	#bash = {
+	#  interactiveShellInit = ''
+	#    if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
+    #    then
+    #      shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
+    #      exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
+    #    fi 
+	#    '';
+	#};
+
+	fish = {
+	  enable = true;
+	  interactiveShellInit = ''
+        set -g fish_greeting "Welcome weary traveler to my shop"
+	  '';
+	  plugins = [
+	    {
+		  name = "grc";
+		  src = pkgs.fishPlugins.grc.src;
+		}
+	  ];
+	};
+
 	/*
     spicetify = 
 	  let
@@ -88,7 +148,7 @@
 
 		# lines = (accumulated scroll * multiplier / divider)
         scroll = {
-		  multiplier = 1.0;
+		  multiplier = 3.0;
 		  divider = 1.0;
 		};
 
@@ -141,7 +201,8 @@
 		allow_markup = true;
 		width = 250;
 	  };
-	  style = ''
+	  # Force the style to stop Stylix being a bitch and overwriting it
+	  style = lib.mkForce ''
 		@define-color	rosewater  #f2d5cf;
 		@define-color	rosewater-rgb  rgb(242, 213, 207);
 		@define-color	flamingo  #eebebe;
@@ -309,13 +370,19 @@
 		}
         '';
 	};
+
+	rofi = {
+	  enable = true;
+	  package = pkgs.rofi-wayland;
+	  font = "JetBrains Mono Nerd Font 10";
+	  location = "center";
+	  terminal = "${pkgs.rio}/bin/rio";
+	};
+	
   };
 
-  # Nicely reload system units when changing configs
-  systemd.user.startServices = "sd-switch";
-
-  home.stateVersion = "24.05"; # don't change this
 
+  # ----- SERVICES -----
   services = {
     # Change monitor positions
     # TODO: find a way to make this modular (ie put something different for my laptop)
@@ -353,4 +420,10 @@
       ];
     };
   };
+
+
+  # Nicely reload system units when changing configs
+  systemd.user.startServices = "sd-switch";
+
+  home.stateVersion = "24.05"; # don't change this
 }