ref work config to use common module

2 files changed, 8 insertions, 201 deletions

diff --git a/home-manager/.config/home-manager/flake.nix b/home-manager/.config/home-manager/flake.nix
index e827168..6d0a2fb 100644
--- a/home-manager/.config/home-manager/flake.nix
+++ b/home-manager/.config/home-manager/flake.nix
@@ -39,7 +39,12 @@
           {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
-            home-manager.users.kdamani = import ./per-user/kdamani-work/home.nix;
+            home-manager.users.kdamani = {
+              imports = [
+                ./common
+                ./per-user/kdamani-work/home.nix
+              ];
+            };
           }
         ];
       };
diff --git a/home-manager/.config/home-manager/per-user/kdamani-work/home.nix b/home-manager/.config/home-manager/per-user/kdamani-work/home.nix
index 51a38c0..1ce714e 100644
--- a/home-manager/.config/home-manager/per-user/kdamani-work/home.nix
+++ b/home-manager/.config/home-manager/per-user/kdamani-work/home.nix
@@ -1,213 +1,15 @@
-{ config, pkgs, libs, ...}: 
+{ config, pkgs, lib, ...}: 
 {
-  nix.gc.automatic = true;
-  home.username = "kdamani";
-  home.sessionPath = [
-  	"$HOME/.config/home-manager/common/scripts"
-  ];
-  home.sessionVariables = {
-    EDITOR = "hx";
-  };
   home.shellAliases = {
-    l = "ls -l";
-    ll = "ls -al";
-    ".." = "cd ..";
-    v = "$EDITOR $@";
-    r = "yazi $@";
-    gst = "git status";
-    gd = "git diff";
-    chm = "$EDITOR ~/.config/home-manager/per-user/kdamani-work/home.nix";
-    search = "nix search nixpkgs $@";
-    conf = "ranger ~/.config/home-manager/common/";
-    up = "cd ~/.config/home-manager && darwin-rebuild switch --flake .";
-    tmux = "tmux -u $@";
+    up = lib.mkForce "cd ~/.config/home-manager && darwin-rebuild switch --flake .";
     ssh = "INVOKED_VIA_ALIAS=yes ~/.ssh/config.d/managed/scripts/renew.sh";
   };
-
-  programs.home-manager.enable = true;
-  programs.zsh = {
-    enable = true;
-    defaultKeymap = "viins";
-    initExtra = ''
-      source ${config.home.homeDirectory}/.p10k.zsh
-      bindkey '^ ' autosuggest-accept
-    '';
-    zplug = {
-      enable = true;
-      plugins = [
-        { name = "zsh-users/zsh-autosuggestions"; } 
-        { name = "romkatv/powerlevel10k"; tags = [ as:theme depth:1 ]; } 
-      ];
-    };
-  };
-  programs.tmux = { 
-    enable = true;
-    clock24 = true;
-    shell = "${pkgs.zsh}/bin/zsh";
-    prefix = "C-a";
-    terminal = "xterm-256color";
-    keyMode = "vi";
-    plugins = with pkgs; [
-      tmuxPlugins.sensible
-      {
-        plugin = tmuxPlugins.resurrect;
-        extraConfig = "set -g @resurrect-strategy-nvim 'session'";
-      }
-      tmuxPlugins.pain-control
-      tmuxPlugins.yank
-    ];
-    sensibleOnTop = true;
-    extraConfig = "set -g default-command '$SHELL'";
-  };
-  programs.git = {
-    enable = true;
-    userName  = "Kumar Damani";
-    userEmail = "kdamani@kepler.space";
-    aliases = {
-      lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
-    };
-    delta = {
-      enable = true;
-    };
-    lfs = {
-      enable = true;
-    };
-    extraConfig = {
-      push = { autoSetupRemote = true; };
-    };
-  };
-  programs.fzf = {
-    enable = true;
-    tmux.enableShellIntegration = true;
-  };
-  programs.direnv = {
-    enable = true;
-    enableZshIntegration = true; # see note on other shells below
-    nix-direnv.enable = true;
-    config = {
-      global = {
-        load_dotenv = true;
-      };
-    };
-  };
-  programs.helix = {
-    enable = true;
-    settings = {
-      # theme = "jetbrains_dark";
-      theme = "gruvbox_dark_hard";
-      editor = {
-        mouse = false;
-        true-color = true;
-        line-number = "relative";
-        lsp.display-messages = true;
-        rulers = [81];
-        indent-guides = {
-          render = true;
-          character = "╎";
-        };
-        cursor-shape = {
-          normal = "block";
-          insert = "bar";
-          select = "block";
-        };
-        file-picker = {
-          hidden = false;
-        };
-        end-of-line-diagnostics = "hint";
-        inline-diagnostics = {
-          cursor-line = "error";
-        };
-      };
-      keys.normal = {
-        space.space = "file_picker";
-        space.w = ":w";
-        space.q = ":q";
-        G = "goto_file_end";
-        esc = [ "collapse_selection" "keep_primary_selection" ];
-      };
-    };
-    extraPackages = [
-      pkgs.bash-language-server
-      pkgs.marksman
-      pkgs.gopls
-      pkgs.ansible-language-server
-      pkgs.yaml-language-server
-      pkgs.ruff
-      pkgs.pyright
-      pkgs.pylyzer
-      pkgs.nodePackages.prettier
-      pkgs.typescript-language-server
-      pkgs.vscode-langservers-extracted
-    ];
-    languages = {
-      language-server.ruff = {
-        command = "ruff";
-        args = ["server"];
-        config = {
-          settings = {
-            lineLength = 88;
-            lint = {
-              select = ["B" "C4" "I" "N" "PIE" "RUF" "TCH" "TID" "UP" "S" "W" "E" "F"];
-              preview = false;
-            };
-            format = {
-              preview = true;
-            };
-          };
-        };
-      };
-      language-server.pyright = {
-        config.python.analysis = {
-          typeCheckingMode = "basic";
-        };
-      };
-      language-server.pylyzer = {
-        command = "pylyzer";
-        config = {
-          settings = {
-            args = ["--server"];
-          };
-        };
-      };
-      language = [
-        {
-          name = "python";
-          language-servers = ["ruff" "pyright" "pylyzer"];
-          auto-format = true;
-        }
-        {
-          name = "javascript";
-          language-servers = ["typescript-language-server"];
-          formatter = {
-            command = "prettier";
-            args = [ "--parser" "typescript" ];
-          };
-          auto-format = true;
-        }
-      ];
-    };
-  };
-  home.stateVersion = "23.05";
   home.packages = with pkgs; [
-    coreutils
     colima
     docker
-    dig
-    fd
-    htop
-    imagemagick
-    jq
     kubectl
     k9s
-    nmap
-    poppler
-    python311
-    ripgrep
-    smartcat
     step-cli
-    tldr
-    yazi
-    sshpass
     teleport
   ];
 }