More cleanup

modules/profile.nix

@@ -1,24 +0,0 @@
-{ config, pkgs, lib, ... }:
-{
-  programs.bash = {
-    enable = true;
-    profileExtra = ''
-        export EDITOR="vim"
-        alias gst="git status"
-        alias gco="git commit";
-        alias glo="git log";
-        alias gad="git add";
-        alias ls="exa";
-        alias ll="exa -l";
-        alias la="exa -la";
-        alias mv="mv -i";
-        alias cp="cp -i";
-    '';
-  };
-
-  home.packages = [
-    pkgs.exa
-    pkgs.fzf
-  ];
-
-}

modules/profiles/home.nix

@@ -1,6 +1,11 @@
 { config, pkgs, lib, ... }:
 let 
-  userEnv = {
+  unstable = import <nixpkgs-unstable> {};
+in {
+  imports = [
+    (import ../session.nix {
+      inherit config;
+      sessionVars = {
         EDITOR = "vim";
         PAGER = "less";
         MAILDIR = "\$HOME/.var/mail";
@@ -8,10 +13,7 @@ let
         NOTMUCH_CONFIG = "\$HOME/.config/notmuch/config";
         MOZ_ENABLE_WAYLAND= "1";
       };
-  unstable = import <nixpkgs-unstable> {};
+    })
-in {
-
-  imports = [
     ../direnv.nix
     ../vim
     ../tmux.nix
@@ -29,9 +31,6 @@ in {
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 
-  home.sessionVariables = userEnv;
-  systemd.user.sessionVariables = userEnv;
-
   home.packages = with pkgs; [
     anki
     aspell

modules/profiles/work.nix

@@ -1,32 +1,34 @@
 { config, pkgs, lib, ... }:
-let 
-  userEnv = {
-    EDITOR = "vim";
-    PAGER = "less";
-  };
-in
 {
   imports = [
-    ./common.nix
+    (import ../session.nix {
-    #./private/work
+      inherit config;
+      sessionVars = {
+        EDITOR = "vim";
+        PAGER = "less";
+        MOZ_ENABLE_WAYLAND= "1";
+      };
+    })
+    ../vim
+    ../direnv.nix
+    ../git.nix
+    ../gpg.nix
+    ../gtk.nix
+    ../keyring.nix
+    ../kitty.nix
+    ../ssh.nix
+    ../tmux.nix
+    ../zsh.nix
   ];
 
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 
-  home.sessionVariables = userEnv;
-
   home.packages = with pkgs; [
-    firefox-bin
-    chromium
-    android-studio
     file
-    fzf
     gnupg
     libreoffice
-    pinentry
     python3
-    spotify
     sshfs-fuse
     unzip
   ];

modules/session.nix

@@ -0,0 +1,5 @@
+{ config, sessionVars }:
+{
+  home.sessionVariables = sessionVars;
+  systemd.user.sessionVariables = sessionVars;
+}

modules/zsh.nix

@@ -45,6 +45,7 @@
   };
 
   home.packages = [
+    pkgs.fzf
     pkgs.exa
     pkgs.zsh-git-prompt
   ];