aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--home.nix3
-rw-r--r--programs/bash.nix2
-rw-r--r--services/default.nix4
-rw-r--r--x/2bwm.nix2
4 files changed, 6 insertions, 5 deletions
diff --git a/home.nix b/home.nix
index 5392ce8..77484ec 100644
--- a/home.nix
+++ b/home.nix
@@ -58,6 +58,7 @@
58 libnotify 58 libnotify
59 inotify-tools 59 inotify-tools
60 rtorrent 60 rtorrent
61 sxiv
61 62
62 # meta 63 # meta
63 nixpkgs-review 64 nixpkgs-review
@@ -82,7 +83,7 @@
82 enable = true; 83 enable = true;
83 windowManager.command = "2bwm"; 84 windowManager.command = "2bwm";
84 initExtra = '' 85 initExtra = ''
85 ${pkgs.hsetroot}/bin/hsetroot -solid "#000" 86 ${pkgs.hsetroot}/bin/hsetroot -solid "${theme.base00}"
86 xrdb -load $HOME/.Xresources 87 xrdb -load $HOME/.Xresources
87 setxkbmap -option 'caps:swapescape' 88 setxkbmap -option 'caps:swapescape'
88 ''; 89 '';
diff --git a/programs/bash.nix b/programs/bash.nix
index fcde389..82e5c67 100644
--- a/programs/bash.nix
+++ b/programs/bash.nix
@@ -63,7 +63,7 @@
63 GIT_INDEX_MODIFIED_COLOR = "yellow"; 63 GIT_INDEX_MODIFIED_COLOR = "yellow";
64 BRANCH_COLOR = "bright black"; 64 BRANCH_COLOR = "bright black";
65 COMMIT_COLOR = "green"; 65 COMMIT_COLOR = "green";
66 PF_INFO = "ascii title os kernel uptime pkgs shell "; 66 PF_INFO = "ascii title os kernel uptime pkgs shell";
67 PF_SEP = " "; 67 PF_SEP = " ";
68 PF_COL1 = 7; 68 PF_COL1 = 7;
69 PF_COL2 = 7; 69 PF_COL2 = 7;
diff --git a/services/default.nix b/services/default.nix
index 0e85cd9..83955bf 100644
--- a/services/default.nix
+++ b/services/default.nix
@@ -18,8 +18,8 @@
18 lorri.enable = true; 18 lorri.enable = true;
19 gpg-agent = { 19 gpg-agent = {
20 enable = true; 20 enable = true;
21 defaultCacheTtl = 86400; 21 defaultCacheTtl = 60 * 60 * 24 * 7;
22 maxCacheTtl = 86400; 22 maxCacheTtl = 60 * 60 * 24 * 7;
23 pinentryFlavor = "curses"; 23 pinentryFlavor = "curses";
24 }; 24 };
25 }; 25 };
diff --git a/x/2bwm.nix b/x/2bwm.nix
index 09d1a0c..76c2a52 100644
--- a/x/2bwm.nix
+++ b/x/2bwm.nix
@@ -15,6 +15,6 @@ with theme;
15 "twobwm.unkill_color" = base08; 15 "twobwm.unkill_color" = base08;
16 "twobwm.fixed_unkill_color" = base0E; 16 "twobwm.fixed_unkill_color" = base0E;
17 "twobwm.outer_border_color" = base00; 17 "twobwm.outer_border_color" = base00;
18 "twobwm.inverted_colors" = true; 18 "twobwm.inverted_colors" = false;
19 }; 19 };
20} 20}