cleanup nix setup

files/.config/htop/htoprc

@@ -1 +1 @@
-/nix/store/spsy6k9bx1rvrfqwmd848r2j6pw1w3bi-home-manager-files/.config/htop/htoprc
+/nix/store/v0n44jjhbc1jh715dysni16gyskaf3g4-home-manager-files/.config/htop/htoprc

files/nix-stuff/nixpkgs/config/generalConfig.nix

@@ -0,0 +1,19 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.elkowar.generalConfig;
+  myConf = import ../myConfig.nix;
+in
+{
+  options.elkowar.generalConfig = with lib; {
+    shellAliases = lib.mkOption {
+      type = types.attrsOf types.str;
+      default = {};
+      description = ''
+        A map of aliases that will get applied to zsh and fish configuration.
+      '';
+    };
+  };
+  config = {
+    programs.zsh.shellAliases = cfg.shellAliases;
+  };
+}

files/nix-stuff/nixpkgs/config/tmux.nix

@@ -1,5 +1,15 @@
-{ myConf, pkgs ? import <nixpkgs> }:
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.elkowar.programs.tmux;
+  myConf = import ../myConfig.nix;
+in
 {
+  options.elkowar.programs.tmux = {
+    enable = lib.mkEnableOption "Enable the tmux configuration";
+  };
+
+  config = lib.mkIf cfg.enable {
+    programs.tmux = {
       enable = true;
       clock24 = true;
       historyLimit = 10000;
@@ -39,4 +49,6 @@
         }
 
       ];
+    };
+  };
 }

files/nix-stuff/nixpkgs/config/zsh.nix

@@ -1,5 +1,11 @@
-{ myConf, pkgs ? import <nixpkgs> }:
+{ config, lib, pkgs, ... }:
 let
+  cfg = config.elkowar.programs.zsh;
+  myConf = import ../myConfig.nix;
+
+
+
+
   makeAbbrs = with builtins; abbrs: concatStringsSep "\n"
     (
       attrValues
@@ -96,6 +102,11 @@ let
 
 in
 {
+  options.elkowar.programs.zsh = {
+    enable = lib.mkEnableOption "ZSH configuration";
+  };
+  config = {
+    programs.zsh = {
       enable = true;
 
 
@@ -171,4 +182,6 @@ in
           { name = "zsh-abbr"; src = sources.zsh-abbr; }
           { name = "fast-syntax-highlighting"; src = sources.fast-syntax-highlighting; }
         ];
+    };
+  };
 }

files/nix-stuff/nixpkgs/home.nix

@@ -31,10 +31,6 @@ in
     desktop.enable = true;
   };
 
-  gtk = import ./config/gtk.nix { inherit pkgs; inherit myConf; };
-
-
-
 
   imports = [ ./profiles/base.nix ./profiles/desktop.nix ];
 }

files/nix-stuff/nixpkgs/profiles/base.nix

@@ -10,7 +10,15 @@ in
     #useZsh = lib.mkEnableOption
   };
 
+  imports = [ ../config/tmux.nix ../config/generalConfig.nix ../config/zsh.nix ];
+
   config = lib.mkIf cfg.enable {
+    elkowar.programs.tmux.enable = true;
+    elkowar.programs.zsh.enable = true;
+    elkowar.generalConfig.shellAliases = {
+      gc = "git commit";
+    };
+
     home.packages = with pkgs; [
       direnv
       rnix-lsp
@@ -29,15 +37,13 @@ in
       fd
       jq
 
-      (import (fetchTarball https://github.com/lf-/nix-doc/archive/main.tar.gz) {})
+      #(import (fetchTarball https://github.com/lf-/nix-doc/archive/main.tar.gz) {})
     ];
 
     programs = {
       home-manager.enable = true;
       htop.enable = true;
 
-      zsh = import ../config/zsh.nix { inherit pkgs; inherit myConf; };
-      tmux = import ../config/tmux.nix { inherit pkgs; inherit myConf; };
       fzf = {
         enable = true;
         enableFishIntegration = true;

files/nix-stuff/nixpkgs/profiles/desktop.nix

@@ -11,6 +11,8 @@ in
 
   config = lib.mkIf cfg.enable {
 
+    gtk = import ../config/gtk.nix { inherit pkgs; inherit myConf; };
+
     home.packages = with pkgs; [
       elkowar_local.bashtop
       elkowar_local.liquidctl