Change font

11 files changed, 31 insertions, 11 deletions

diff --git a/README.md b/README.md
index 34e9f0a..1b59f0b 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@
 * `zsh` - My shell
 * `sxiv` - Image viewer
 * `mpv` - Video player
-* `daffm` - File manager
+* `daffm` - Simple file manager ([github](https://github.com/phenax/daffm))
 * `mpd` - Music daemon
 * `ncmpcpp` + `mpc` - Music client
 * `dwmblocks` - Status bar text ([My fork of dwmblocks](https://github.com/phenax/dwmblocks))
diff --git a/config/dunst/dunstrc b/config/dunst/dunstrc
index 36a7a91..a8da50a 100644
--- a/config/dunst/dunstrc
+++ b/config/dunst/dunstrc
@@ -1,5 +1,5 @@
 [global]
-    font = JetBrainsMono Nerd Font, Font Awesome 5 Free Solid, Font Awesome 5 Free Regular, Font Awesome 5 Brands 11
+    font = monospace, Font Awesome 5 Free Solid, Font Awesome 5 Free Regular, Font Awesome 5 Brands 11
 
     # Allow a small subset of html markup:
     #   <b>bold</b>
diff --git a/config/qutebrowser/homepage/index.html b/config/qutebrowser/homepage/index.html
index e703030..6cadc9e 100644
--- a/config/qutebrowser/homepage/index.html
+++ b/config/qutebrowser/homepage/index.html
@@ -15,7 +15,7 @@
         padding: 0;
         background-color: var(--col-primary);
         color: #fff;
-        font-family: JetBrains Mono, sans-serif;
+        font-family: CozetteVector, monospace;
       }
       html, body, body * { box-sizing: border-box }
 
diff --git a/config/qutebrowser/ui.py b/config/qutebrowser/ui.py
index db59e76..6378c2d 100644
--- a/config/qutebrowser/ui.py
+++ b/config/qutebrowser/ui.py
@@ -15,7 +15,7 @@ def read_xresources(prefix):
 
 xresources = read_xresources('*')
 
-c.fonts.default_family = 'JetBrainsMono Nerd Font'
+c.fonts.default_family = 'monospace'
 c.fonts.default_size = '12px'
 c.colors.webpage.preferred_color_scheme = 'dark'
 
diff --git a/configuration.nix b/configuration.nix
index 7f94e62..5ce909c 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -15,6 +15,7 @@
     ./modules/sound
     ./modules/notifications
     ./modules/kakoune
+    ./modules/tmux
     # ./modules/ai
   ];
 
@@ -123,6 +124,9 @@
     enable = true;
     autorun = false;
     displayManager.startx.enable = true;
+    # Keyboard config
+    autoRepeatDelay = 350;
+    autoRepeatInterval = 30;
   };
   services.libinput = {
     enable = true;
@@ -134,6 +138,8 @@
   fonts.packages = with pkgs; [
     # nerd-fonts._3270
     nerd-fonts.jetbrains-mono
+    miracode
+    monocraft
     cozette
     noto-fonts-color-emoji
     inter
@@ -163,7 +169,7 @@
     auto-optimise-store = true;
   };
   nix.gc = {
-    automatic = true;
+    automatic = false;
     dates = "weekly";
   };
   nix.extraOptions = ''
diff --git a/extras/notes b/extras/notes
-Subproject aa0771f0a9f37c26500daa611b5c5d27649ae99
+Subproject 32b42f798889569ba33f9dd6c3b486942835aaa
diff --git a/packages/dmenu/source b/packages/dmenu/source
-Subproject 47dd5a859cddf6116bc73a64684eea2170f44f4
+Subproject e3dd213aac533b1aced509a16e5d9ac4a4561df
diff --git a/packages/dwm/source b/packages/dwm/source
-Subproject aa8b22eac9bd9da0655870c7029dd41c15381d4
+Subproject 6664b3ed1af1eaefa9809dadf83af9f498cc72c
diff --git a/packages/st/source b/packages/st/source
-Subproject 1c8273f519e6666dd949da0d6df778975630c77
+Subproject e9fc15eff149047447fad4e95c1cf7bc9aeac00
diff --git a/packages/xmonad/source b/packages/xmonad/source
-Subproject 934a74b4cfb92d425d757296a53b53f21f1a9bd
+Subproject 0a53f07b09e2624785c49001802349e9e887b1b
diff --git a/scripts/menuitems.sh b/scripts/menuitems.sh
index 7781e57..505b610 100755
--- a/scripts/menuitems.sh
+++ b/scripts/menuitems.sh
@@ -13,12 +13,24 @@ playerctl_icon() {
   esac
 }
 
+
+playerctl_prefix() {
+  local playstate="$(~/scripts/music/player.sh get_play_state)";
+  case "$playstate" in
+    Paused) echo "" ;;
+    Playing) echo "PLAYING: " ;;
+    Stopped) echo "" ;;
+    *) ;;
+  esac
+}
+
 network_state() {
   local status=$((nmcli dev show wlp0s20f3 || echo "") | grep '^GENERAL.STATE:' | sed 's/^GENERAL.STATE:\s*//g');
-  echo "  ${status:0:16}"; 
+  echo "  ${status:0:16}";
 }
 
-volume_icon() { volume_component 4 | sed 's/on//; s/off/🔇/'; }
+# volume_icon() { volume_component 4 | sed 's/on//; s/off/🔇/'; }
+volume_icon() { volume_component 4 | sed 's/on/VOL/; s/off/MUTE/'; }
 mic_icon() { mic_component 4 | sed 's/on//; s/off/✖/'; }
 
 icon() {
@@ -34,17 +46,19 @@ icon() {
 }
 
 date_module() {
-  echo "$(icon date)  $(date +"%A, %e %b - %I:%M %p")";
+  # echo "$(icon date)  $(date +"%A, %e %b - %I:%M %p")";
+  echo "$(date +"%A, %e %b - %I:%M %p")";
 }
 
 battery_module() {
   local capacity=$(cat "/sys/class/power_supply/BAT0/capacity");
-  echo "$(icon battery)  $capacity%";
+  # echo "$(icon battery)  $capacity%";
+  echo "BAT: $capacity%";
 }
 
 music_module() {
   local label=$(~/scripts/music/player.sh get_label);
-  echo "$(icon music)  $label";
+  echo "$(playerctl_prefix)$label";
 }
 
 brightness_module() {
@@ -52,7 +66,7 @@ brightness_module() {
 }
 
 volume_module() {
-  echo "$(icon volume)  $(volume_component 2)";
+  echo "$(icon volume): $(volume_component 2)";
 }
 
 keymode_module() {