From 1dcae6282ef51f1472cf756712b1a3d92e6b9679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Sun, 30 Jun 2019 18:58:15 +0100
Subject: [PATCH] Set PATH, move most software to home manager

---
 nixos/common.nix | 13 +------------
 nixos/home.nix   | 36 +++++++++++++++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/nixos/common.nix b/nixos/common.nix
index 62ba5b6f..b998b752 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -36,18 +36,7 @@ in
     isNormalUser = true;
     extraGroups = [ "wheel" "networkmanager" "video" "scanner" "lp" "docker" "vboxusers"];
       packages = with pkgs; [
-        keepass fontconfig nodejs rustup gcc gdb
-        binutils xclip pkgconfig veracrypt gitAndTools.diff-so-fancy
-        gnome3.gnome-shell-extensions chrome-gnome-shell gnomeExtensions.clipboard-indicator
-        gnomeExtensions.caffeine gnomeExtensions.no-title-bar
-        openjdk11 gimp restic glxinfo discord steam
-        zoom-us
-        nodejs-10_x hugo mercurial terraform libreoffice
-        unzip tor-browser-bundle-bin aria vlc
-        jetbrains.goland jetbrains.clion
-        (wine.override { wineBuild = "wineWow"; }) winetricks
-        yubico-piv-tool yubikey-personalization yubikey-personalization-gui yubikey-manager-qt
-        mono calcurse unstable.pypi2nix etesync-dav calibre fbreader unstable.hopper file python37Packages.binwalk-full
+        unstable.pypi2nix etesync-dav unstable.hopper
       ];
     shell = pkgs.zsh;
   };
diff --git a/nixos/home.nix b/nixos/home.nix
index 372f6be1..266db9d8 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -1,6 +1,23 @@
 { config, pkgs, ... }:
 
 {
+  nixpkgs.config = {
+    allowUnfree = true;
+  };
+  home.packages = with pkgs; [
+      keepass fontconfig nodejs rustup gcc gdb
+      binutils xclip pkgconfig veracrypt gitAndTools.diff-so-fancy
+      gnome3.gnome-shell-extensions chrome-gnome-shell gnomeExtensions.clipboard-indicator
+      gnomeExtensions.caffeine gnomeExtensions.no-title-bar
+      openjdk11 gimp restic glxinfo discord steam
+      zoom-us
+      nodejs-10_x hugo mercurial terraform libreoffice
+      unzip tor-browser-bundle-bin aria vlc
+      jetbrains.goland jetbrains.clion
+      (wine.override { wineBuild = "wineWow"; }) winetricks
+      yubico-piv-tool yubikey-personalization yubikey-personalization-gui yubikey-manager-qt
+      mono calcurse calibre fbreader file python37Packages.binwalk-full
+    ];
   programs = {
     home-manager.enable = true;
 
@@ -36,7 +53,24 @@
         SPACESHIP_BATTERY_THRESHOLD=30
         setopt HIST_IGNORE_ALL_DUPS
         '';
-      sessionVariables = { TERM="xterm-256color"; EDITOR="vim"; VISUAL="vim"; PAGER="less"; ZSH_TMUX_AUTOSTART=true; };
+      profileExtra = ''
+        export PATH="$HOME/programs:$PATH";
+        export PATH="$HOME/tools:$PATH";
+        export PATH="$HOME/bin:$PATH";
+        export PATH="$HOME/.local/bin:$PATH";
+        export PATH="$GOPATH/bin:$PATH";
+        export PATH="$HOME/.rvm/bin:$PATH";
+        export PATH="$HOME/.cargo/bin:$PATH";
+        export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH";
+        '';
+      sessionVariables = { 
+        TERM="xterm-256color"; 
+        EDITOR="vim";
+        VISUAL="vim";
+        PAGER="less";
+        ZSH_TMUX_AUTOSTART=true;
+        GOPATH="$HOME/go";
+      };
       shellAliases = { tmate = "tmux detach-client -E 'tmate;tmux'"; cat = "bat"; };
     };