Merge branch 'master' of ssh://gitea.deepak.science:2222/deepak/nixconf

home/deepak/home.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, mysd, ...}: {
+{ pkgs, config, mysd, specialArgs, ...}: {
 
   programs.home-manager.enable = true;
   home.packages = [
@@ -6,11 +6,13 @@
     (pkgs.writeScriptBin "nixFlakes" ''
       exec ${pkgs.nixUnstable}/bin/nix --experimental-features "nix-command flakes" "$@"
     '')
-    pkgs.obsidian
-    pkgs.atom
     pkgs.cachix
     pkgs.kubectl
+    pkgs.bat
+    pkgs.eza
+  ] ++ pkgs.lib.optionals specialArgs.withGUI [
     pkgs.discord
+    pkgs.obsidian
     pkgs.nextcloud-client
   ];
 
@@ -24,7 +26,9 @@
   programs.direnv.enable = true;
   programs.direnv.nix-direnv.enable = true;
 
-  services.nextcloud-client.enable = true;
+  services.nextcloud-client = pkgs.lib.mkIf specialArgs.withGUI {
+    enable = true;
+  };
 
   programs.git = {
     enable = true;
@@ -57,6 +61,7 @@
     enable = true;
     shellAliases = {
       doo="./do.sh";
+      wttr="curl wttr.in";
     };
     history = {
       size = 10000;

home/deepak/home_no_gui.nix

@@ -1,100 +0,0 @@
-{ pkgs, config, mysd, ...}: {
-
-  programs.home-manager.enable = true;
-  home.packages = [
-    pkgs.hello
-    (pkgs.writeScriptBin "nixFlakes" ''
-      exec ${pkgs.nixUnstable}/bin/nix --experimental-features "nix-command flakes" "$@"
-    '')
-    # pkgs.obsidian
-    # pkgs.atom
-    pkgs.cachix
-    pkgs.kubectl
-    # pkgs.discord
-    # pkgs.nextcloud-client
-  ];
-
-  home.homeDirectory = "/home/deepak";
-  home.username = "deepak";
-  home.file.mysd.source = "${mysd}";
-
-  # required, was previously default
-  home.stateVersion = "18.09";
-
-  programs.direnv.enable = true;
-  programs.direnv.nix-direnv.enable = true;
-
-  # services.nextcloud-client.enable = true;
-
-  programs.git = {
-    enable = true;
-    userName  = "Deepak Mallubhotla";
-    userEmail = "dmallubhotla+github@gmail.com";
-    signing = {
-      key = "976F3357369149AB";
-      signByDefault = true;
-    };
-    extraConfig = {
-      core = {
-        fileMode = false;
-      };
-    };
-  };
-
-  programs.vim = {
-    enable = true;
-    plugins = with pkgs.vimPlugins; [ vimtex vim-nix ];
-    extraConfig = ''
-      inoremap jj <Esc>
-      inoremap kk <Esc>
-    '';
-  };
-
-  programs.zsh = {
-    enable = true;
-    shellAliases = {
-      doo="./do.sh";
-    };
-    history = {
-      size = 10000;
-      path = "${config.xdg.dataHome}/zsh/history";
-    };
-    oh-my-zsh = {
-        enable = true;
-        plugins = [
-          "git"
-          "poetry"
-          "themes"
-          "emoji-clock"
-          "screen"
-          "ssh-agent"
-        ];
-        theme = "random";
-    };
-    plugins = [
-      {
-        name = "sd";
-        src = pkgs.fetchFromGitHub {
-          owner = "ianthehenry";
-          repo = "sd";
-          rev = "ecd1ab8d3fc3a829d8abfb8bf1e3722c9c99407b";
-          sha256 = "0fm1r8w73vaab5r9dj5jdxsfc7pbddxf4dvvasfq8rry2dxaf7sy";
-        };
-      }
-      {
-        name = "zsh-z";
-        src = pkgs.fetchFromGitHub {
-          owner = "agkozak";
-          repo = "zsh-z";
-          rev = "b5e61d03a42a84e9690de12915a006b6745c2a5f";
-          sha256 = "1gsgmsvl1sl9m3yfapx6bp0y15py8610kywh56bgsjf9wxkrc3nl";
-        };
-      }
-    ];
-    initExtra = ''
-      eval "$(${pkgs.direnv}/bin/direnv hook zsh)"
-    '';
-  };
-
-
-}

hosts/hosts.nix

@@ -10,6 +10,7 @@
 			homeManager.nixosModules.home-manager {
 				home-manager.extraSpecialArgs = {
 					inherit mysd;
+                                        withGUI = true;
 				};
 				home-manager.useGlobalPkgs = true;
 				home-manager.users.deepak = {
@@ -26,10 +27,11 @@
 			homeManager.nixosModules.home-manager {
 				home-manager.extraSpecialArgs = {
 					inherit mysd;
+                                        withGUI = false;
 				};
 				home-manager.useGlobalPkgs = true;
 				home-manager.users.deepak = {
-					imports = [ ../home/deepak/home_no_gui.nix ];
+					imports = [ ../home/deepak/home.nix ];
 				};
 			}
 			NixOS-WSL.nixosModules.wsl