summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--home.nix54
-rw-r--r--xmonad.hs17
2 files changed, 69 insertions, 2 deletions
diff --git a/home.nix b/home.nix
index 03c2d10..1a45c3f 100644
--- a/home.nix
+++ b/home.nix
@@ -15,9 +15,11 @@
pkgs.keepassx
pkgs.keybase
pkgs.keybase-gui
+ pkgs.mononoki
pkgs.mplayer
pkgs.mpv
pkgs.offlineimap
+ pkgs.pass
pkgs.pavucontrol
pkgs.pinentry
pkgs.qtpass
@@ -39,17 +41,65 @@
pkgs.youtube-dl
];
+ fonts.fontconfig.enableProfileFonts = true;
+
xresources = {
+ properties = {
+ "XTerm*font" = "*-fixed-*-*-*-10-*";
+ "XTerm*faceName" = "mononoki";
+ "XTerm*termName" = "xterm-256color";
+ "XTerm*metaSendsEscape" = true;
+ };
extraConfig = builtins.readFile (
pkgs.fetchFromGitHub {
owner = "solarized";
repo = "xresources";
rev = "025ceddbddf55f2eb4ab40b05889148aab9699fc";
sha256 = "0lxv37gmh38y9d3l8nbnsm1mskcv10g3i83j0kac0a2qmypv1k9f";
- } + "/Xresources.dark"
+ } + "/Xresources.light"
);
};
+ services.polybar = {
+ enable = false;
+ script = "polybar bar &";
+ config = {
+ "bar/top" = {
+ monitor = "${env:MONITOR:HDMI1}";
+ width = "100%";
+ height = "3%";
+ radius = 0;
+ modules-center = "date";
+ };
+ "module/date" = {
+ type = "internal/date";
+ internal = 5;
+ date = "%y.%m.%d";
+ time = "%H.%M";
+ label = "%time% %date%";
+ };
+ };
+ };
+
+ services.taffybar = {
+ enable = true;
+ };
+
+ xsession = {
+ enable = true;
+ windowManager.xmonad = {
+ enable = true;
+ extraPackages = hpkgs: [
+ hpkgs.xmonad-contrib
+ hpkgs.xmonad-extras
+ hpkgs.monad-logger
+ hpkgs.taffybar
+ ];
+ enableContribAndExtras = true;
+ config = ./xmonad.hs;
+ };
+ };
+
programs.git = {
enable = true;
userName = "Ben Sima";
@@ -207,7 +257,7 @@ done
set cuc cul " Crosshair
set cc=80 " 80 column lines
set linebreak " Break lines at word (requires Wrap lines)
- set showbreak=+++ " Wrap-broken line prefix
+ set showbreak= " Wrap-broken line prefix
set textwidth=80 " Line wrap (number of cols)
set showmatch " Highlight matching brace
set visualbell " Use visual bell (no beeping)
diff --git a/xmonad.hs b/xmonad.hs
new file mode 100644
index 0000000..142d896
--- /dev/null
+++ b/xmonad.hs
@@ -0,0 +1,17 @@
+import XMonad.Config
+import XMonad
+import XMonad.Hooks.EwmhDesktops (ewmh)
+import XMonad.Hooks.ManageDocks
+--import System.Taffybar.Support.PagerHints (pagerHints)
+
+main =
+ xmonad $
+ ewmh $
+ docks $
+ def
+ { modMask = mod4Mask -- ^ super instead of alt
+ , normalBorderColor = "#002b36" -- ^ solarized dark
+ , focusedBorderColor = "#eee8d5" -- ^ solarized light
+ , manageHook = manageDocks <+> manageHook defaultConfig
+ , layoutHook = avoidStruts $ layoutHook defaultConfig
+ }