From f23fb9463ec15d2709b2be349a430fed73073dca Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Sun, 22 Apr 2018 15:03:02 +0200
Subject: Move urxvt config until module is written, add pcmanfm auto-mounting

---
 conf/urxvt.Xresources |  54 ++++++++++++++++++++++++++
 home.nix              | 105 ++++++++++++++------------------------------------
 2 files changed, 83 insertions(+), 76 deletions(-)
 create mode 100644 conf/urxvt.Xresources

diff --git a/conf/urxvt.Xresources b/conf/urxvt.Xresources
new file mode 100644
index 0000000..5cab29d
--- /dev/null
+++ b/conf/urxvt.Xresources
@@ -0,0 +1,54 @@
+URxvt.saveLines:             10000
+URxvt.scrollBar:             false
+URxvt.font:                  xft:Iosevka:pixelsize=12
+URxvt.letterSpace:           0
+URxvt.transparent:           false
+URxvt.inheritPixmap:         false
+URxvt.fading:                20
+URxvt.dynamicColors:         on
+
+URxvt.perl-ext-common:       default,matcher,clipboard,resize-font
+URxvt.matcher.button:        1
+URxvt.matcher.pattern.1:     \\bwww\\.[\\w-]\\.[\\w./?&@#-]*[\\w/-]
+URxvt.url-launcher:          firefox
+
+URxvt.keysym.Control-Up:     \033[1;5A
+URxvt.keysym.Control-Down:   \033[1;5B
+URxvt.keysym.Control-Left:   \033[1;5D
+URxvt.keysym.Control-Right:  \033[1;5C
+
+URxvt.keysym.M-Down:         \033[1;3B
+URxvt.keysym.M-Up:           \033[1;3A
+URxvt.keysym.M-Left:         \033[1;3D
+URxvt.keysym.M-Right:        \033[1;3C
+
+URxvt.keysym.M-c:            perl:clipboard:copy
+URxvt.keysym.M-v:            perl:clipboard:paste
+
+URxvt.background:            #161616
+URxvt.foreground:            #F2F2F2
+
+! black
+URxvt.color0:                #161616
+URxvt.color8:                #F2F2F2
+! red
+URxvt.color1:                #8C3346
+URxvt.color9:                #ff0000
+! green
+URxvt.color2:                #aadb0f
+URxvt.color10:               #909636
+! yellow
+URxvt.color3:                #E4E093
+URxvt.color11:               #ffff00
+! blue
+URxvt.color4:                #352F6A
+URxvt.color12:               #0000ff
+! magenta
+URxvt.color5:                #ce5c00
+URxvt.color13:               #f57900
+! cyan
+URxvt.color6:                #89b6e2
+URxvt.color14:               #46a4ff
+! white
+URxvt.color7:                #F2F2F2
+URxvt.color15:               #ffffff
diff --git a/home.nix b/home.nix
index 4d39cd7..a45a6d7 100644
--- a/home.nix
+++ b/home.nix
@@ -6,16 +6,34 @@
     path = ''https://github.com/rycee/home-manager/archive/master.tar.gz'';
   };
 
-  home.packages = with pkgs; [
-    rxvt_unicode
-    pcmanfm
-    zathura
-    sxiv
-    mpv
-    iosevka
-    tdesktop
-    veracrypt
-  ];
+  home = {
+    keyboard.layout = "de";
+
+    packages = with pkgs; [
+      rxvt_unicode
+      pcmanfm gvfs lxmenu-data shared_mime_info
+      zathura
+      sxiv
+      mpv
+      iosevka
+      tdesktop
+      veracrypt
+    ];
+
+    # required to enable auto-mounting in pcmanfm
+    sessionVariables = {
+      GIO_EXTRA_MODULES = [ "${pkgs.gvfs}/lib/gio/modules" ];
+    };
+
+    # vim is configured globally for all users but common is the only GUI user
+    file.".gvimrc".text = ''
+      set guifont=Iosevka\ 10
+      set linespace=2
+      set guioptions=agim
+      set guioptions-=m
+      2match SpecialKeyTab /\t/
+    '';
+  };
 
   programs.git = {
     enable = true;
@@ -24,8 +42,6 @@
     extraConfig.core.editor = "vim";
   };
 
-  home.keyboard.layout = "de";
-
   services.gpg-agent = {
     enable = true;
     defaultCacheTtl     = 120;
@@ -48,70 +64,7 @@
     };
   };
 
-  xresources.extraConfig = ''
-    URxvt.saveLines:             10000
-    URxvt.scrollBar:             false
-    URxvt.font:                  xft:Iosevka:pixelsize=12
-    URxvt.letterSpace:           0
-    URxvt.transparent:           false
-    URxvt.inheritPixmap:         false
-    URxvt.fading:                20
-    URxvt.dynamicColors:         on
-
-    URxvt.perl-ext-common:       default,matcher,clipboard,resize-font
-    URxvt.matcher.button:        1
-    URxvt.matcher.pattern.1:     \\bwww\\.[\\w-]\\.[\\w./?&@#-]*[\\w/-]
-    URxvt.url-launcher:          firefox
-
-    URxvt.keysym.Control-Up:     \033[1;5A
-    URxvt.keysym.Control-Down:   \033[1;5B
-    URxvt.keysym.Control-Left:   \033[1;5D
-    URxvt.keysym.Control-Right:  \033[1;5C
-
-    URxvt.keysym.M-Down:         \033[1;3B
-    URxvt.keysym.M-Up:           \033[1;3A
-    URxvt.keysym.M-Left:         \033[1;3D
-    URxvt.keysym.M-Right:        \033[1;3C
-
-    URxvt.keysym.M-c:            perl:clipboard:copy
-    URxvt.keysym.M-v:            perl:clipboard:paste
-
-    URxvt.background:            #161616
-    URxvt.foreground:            #F2F2F2
-
-    ! black
-    URxvt.color0:                #161616
-    URxvt.color8:                #F2F2F2
-    ! red
-    URxvt.color1:                #8C3346
-    URxvt.color9:                #ff0000
-    ! green
-    URxvt.color2:                #aadb0f
-    URxvt.color10:               #909636
-    ! yellow
-    URxvt.color3:                #E4E093
-    URxvt.color11:               #ffff00
-    ! blue
-    URxvt.color4:                #352F6A
-    URxvt.color12:               #0000ff
-    ! magenta
-    URxvt.color5:                #ce5c00
-    URxvt.color13:               #f57900
-    ! cyan
-    URxvt.color6:                #89b6e2
-    URxvt.color14:               #46a4ff
-    ! white
-    URxvt.color7:                #F2F2F2
-    URxvt.color15:               #ffffff
-  '';
-
-  home.file.".gvimrc".text = ''
-    set guifont=Iosevka\ 10
-    set linespace=2
-    set guioptions=agim
-    set guioptions-=m
-    2match SpecialKeyTab /\t/
-  '';
+  xresources.extraConfig = builtins.readFile ./conf/urxvt.Xresources;
 
   programs.rofi = {
     enable = true;
-- 
cgit v1.2.3