From 4c0ad5c3f0f916b6425e03991538771c1fc17ddc Mon Sep 17 00:00:00 2001
From: dadada <dadada@dadada.li>
Date: Sat, 17 Oct 2020 15:41:27 +0200
Subject: [PATCH] More cleanup

---
 modules/profile.nix                       | 24 ----------------
 modules/profiles/{gorgon.nix => home.nix} | 23 ++++++++-------
 modules/profiles/work.nix                 | 34 ++++++++++++-----------
 modules/session.nix                       |  5 ++++
 modules/zsh.nix                           |  1 +
 5 files changed, 35 insertions(+), 52 deletions(-)
 delete mode 100644 modules/profile.nix
 rename modules/profiles/{gorgon.nix => home.nix} (85%)
 create mode 100644 modules/session.nix

diff --git a/modules/profile.nix b/modules/profile.nix
deleted file mode 100644
index 6d63e66..0000000
--- a/modules/profile.nix
+++ /dev/null
@@ -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
-  ];
-
-}
diff --git a/modules/profiles/gorgon.nix b/modules/profiles/home.nix
similarity index 85%
rename from modules/profiles/gorgon.nix
rename to modules/profiles/home.nix
index 62f6f84..5b1bf58 100644
--- a/modules/profiles/gorgon.nix
+++ b/modules/profiles/home.nix
@@ -1,17 +1,19 @@
 { config, pkgs, lib, ... }:
 let 
-  userEnv = {
-    EDITOR = "vim";
-    PAGER = "less";
-    MAILDIR = "\$HOME/.var/mail";
-    MBLAZE = "\$HOME/.config/mblaze";
-    NOTMUCH_CONFIG = "\$HOME/.config/notmuch/config";
-    MOZ_ENABLE_WAYLAND= "1";
-  };
   unstable = import <nixpkgs-unstable> {};
 in {
-
   imports = [
+    (import ../session.nix {
+      inherit config;
+      sessionVars = {
+        EDITOR = "vim";
+        PAGER = "less";
+        MAILDIR = "\$HOME/.var/mail";
+        MBLAZE = "\$HOME/.config/mblaze";
+        NOTMUCH_CONFIG = "\$HOME/.config/notmuch/config";
+        MOZ_ENABLE_WAYLAND= "1";
+      };
+    })
     ../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
diff --git a/modules/profiles/work.nix b/modules/profiles/work.nix
index 96a2a57..17fdc3f 100644
--- a/modules/profiles/work.nix
+++ b/modules/profiles/work.nix
@@ -1,32 +1,34 @@
 { config, pkgs, lib, ... }:
-let 
-  userEnv = {
-    EDITOR = "vim";
-    PAGER = "less";
-  };
-in
 {
   imports = [
-    ./common.nix
-    #./private/work
+    (import ../session.nix {
+      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
   ];
diff --git a/modules/session.nix b/modules/session.nix
new file mode 100644
index 0000000..3718ab0
--- /dev/null
+++ b/modules/session.nix
@@ -0,0 +1,5 @@
+{ config, sessionVars }:
+{
+  home.sessionVariables = sessionVars;
+  systemd.user.sessionVariables = sessionVars;
+}
diff --git a/modules/zsh.nix b/modules/zsh.nix
index 319cc0c..92f24c2 100644
--- a/modules/zsh.nix
+++ b/modules/zsh.nix
@@ -45,6 +45,7 @@
   };
 
   home.packages = [
+    pkgs.fzf
     pkgs.exa
     pkgs.zsh-git-prompt
   ];