diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rwxr-xr-x | mut/bin/sb-battery | 2 | ||||
| -rwxr-xr-x | mut/bin/sb-clock | 2 | ||||
| -rwxr-xr-x | mut/bin/sb-internet | 2 | ||||
| -rwxr-xr-x | mut/bin/sb-mailbox | 2 | ||||
| -rwxr-xr-x | mut/bin/sb-nettraf | 2 | ||||
| -rwxr-xr-x | mut/bin/sb-news | 2 | ||||
| m--------- | mut/dwm | 0 | ||||
| m--------- | mut/dwmblocks | 0 | ||||
| -rw-r--r-- | overlays/suckless.nix | 3 | ||||
| -rw-r--r-- | profiles/core/home.nix | 22 | ||||
| -rw-r--r-- | profiles/email/mailsync.nix | 4 |
12 files changed, 14 insertions, 30 deletions
diff --git a/.gitmodules b/.gitmodules index a252ddb..71ca6ec 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "mut/st"] path = mut/st url = git@github.com:ivi-vink/st.git +[submodule "mut/dwmblocks"] + path = mut/dwmblocks + url = git@github.com:ivi-vink/dwmblocks.git diff --git a/mut/bin/sb-battery b/mut/bin/sb-battery index aeb7413..93cbe08 100755 --- a/mut/bin/sb-battery +++ b/mut/bin/sb-battery @@ -3,7 +3,7 @@ # Prints all batteries, their percentage remaining and an emoji corresponding # to charge status (🔌 for plugged up, 🔋 for discharging on battery, etc.). -case $BUTTON in +case $BLOCK_BUTTON in 3) notify-send "🔋 Battery module" "🔋: discharging 🛑: not charging ♻: stagnant charge diff --git a/mut/bin/sb-clock b/mut/bin/sb-clock index ba9e43d..7649523 100755 --- a/mut/bin/sb-clock +++ b/mut/bin/sb-clock @@ -18,7 +18,7 @@ case "$clock" in "12") icon="🕛" ;; esac -case $BUTTON in +case $BLOCK_BUTTON in 1) notify-send "This Month" "$(cal --color=always | sed "s/..7m/<b><span color=\"cyan\">/;s|..0m|</span></b>|")" && notify-send "Appointments" "$(calcurse -d3)" ;; 2) setsid -f "$TERMINAL" -e calcurse ;; 3) notify-send "📅 Time/date module" "\- Left click to show upcoming appointments for the next three days via \`calcurse -d3\` and show the month via \`cal\` diff --git a/mut/bin/sb-internet b/mut/bin/sb-internet index 225d376..94b7da2 100755 --- a/mut/bin/sb-internet +++ b/mut/bin/sb-internet @@ -4,7 +4,7 @@ # Show 🌐 if connected to ethernet or ❎ if none. # Show 🔒 if a vpn connection is active -case $BUTTON in +case $BLOCK_BUTTON in 1) "$TERMINAL" -e nmtui; pkill -RTMIN+4 dwmblocks ;; 3) notify-send "🌐 Internet module" "\- Click to connect ❌: wifi disabled diff --git a/mut/bin/sb-mailbox b/mut/bin/sb-mailbox index ab1669e..ca77f5c 100755 --- a/mut/bin/sb-mailbox +++ b/mut/bin/sb-mailbox @@ -3,7 +3,7 @@ # Displays number of unread mail and an loading icon if updating. # When clicked, brings up `neomutt`. -case $BUTTON in +case $BLOCK_BUTTON in 1) setsid -f "$TERMINAL" -e neomutt ;; 2) setsid -f mailsync >/dev/null ;; 3) notify-send "📬 Mail module" "\- Shows unread mail diff --git a/mut/bin/sb-nettraf b/mut/bin/sb-nettraf index 06b3c49..178f677 100755 --- a/mut/bin/sb-nettraf +++ b/mut/bin/sb-nettraf @@ -4,7 +4,7 @@ # transmitted (TX) since the previous time this script ran. So if run every # second, gives network traffic per second. -case $BUTTON in +case $BLOCK_BUTTON in 1) setsid -f "$TERMINAL" -e bmon ;; 3) notify-send "🌐 Network traffic module" "🔻: Traffic received 🔺: Traffic transmitted" ;; diff --git a/mut/bin/sb-news b/mut/bin/sb-news index a155c0a..fe701db 100755 --- a/mut/bin/sb-news +++ b/mut/bin/sb-news @@ -3,7 +3,7 @@ # Displays number of unread news items and an loading icon if updating. # When clicked, brings up `newsboat`. -case $BUTTON in +case $BLOCK_BUTTON in 1) setsid "$TERMINAL" -e newsboat ;; 2) setsid -f newsup >/dev/null exit ;; 3) notify-send "📰 News module" "\- Shows unread news items diff --git a/mut/dwm b/mut/dwm -Subproject 8aba66977b5f5234e252ce0df0ebc8f205cad20 +Subproject 6cc3722cfb35e478af34debd12a703b0c71e5bb diff --git a/mut/dwmblocks b/mut/dwmblocks new file mode 160000 +Subproject 36675e3bbb519a0741477d4e969bb521e5c8bfc diff --git a/overlays/suckless.nix b/overlays/suckless.nix index 6f5b110..7ce02b4 100644 --- a/overlays/suckless.nix +++ b/overlays/suckless.nix @@ -1,11 +1,12 @@ {pkgs, home, ...}: (final: prev: { st = (prev.st.overrideAttrs (oldAttrs: rec { src = /. + home + "/flake/mut/st"; - version = "0.1.0"; + version = "0.2.0"; buildInputs = oldAttrs.buildInputs ++ [prev.harfbuzz]; })); dwm = (prev.dwm.overrideAttrs (oldAttrs: rec { src = /. + home + "/flake/mut/dwm"; + version = "0.1.0"; })); dwmblocks =(prev.stdenv.mkDerivation rec { pname = "dwmblocks"; diff --git a/profiles/core/home.nix b/profiles/core/home.nix index 7f654a1..fc33dcb 100644 --- a/profiles/core/home.nix +++ b/profiles/core/home.nix @@ -55,7 +55,7 @@ }; home.sessionVariables = { - EDITOR = "kak"; + EDITOR = "nvim"; TERMINAL = "st"; }; @@ -114,26 +114,6 @@ bind-key -T copy-mode-vi V send -X select-line bind-key -T copy-mode-vi y send -X copy-pipe-and-cancel 'xclip -in -selection clipboard' bind-key -T copy-mode-vi : command-prompt - - bind-key -T window k select-pane -t '{up-of}' - bind-key -T window j select-pane -t '{down-of}' - bind-key -T window l select-pane -t '{right-of}' - bind-key -T window h select-pane -t '{left-of}' - bind-key -T window = select-layout even-vertical - bind-key -T window o kill-pane -a - bind-key -T window _ resize-pane -y 90% - bind-key -T window n run-shell ' - window="$(tmux display -p "#{window_name}")" - if [[ "''${window##kakc@}" != "$window" ]]; then - tmux splitw "kak -c ''${window##kakc@}" - else - tmux splitw "kak -c ''${KAK_SERVER##kaks@}" - fi - ' - bind -n C-space switch-client -T window - - bind -n C-s run-shell tmux-normal-mode - bind -n C-q run-shell 'tmux-normal-mode --quit' ''; }; diff --git a/profiles/email/mailsync.nix b/profiles/email/mailsync.nix index 8504e39..3095194 100644 --- a/profiles/email/mailsync.nix +++ b/profiles/email/mailsync.nix @@ -28,8 +28,8 @@ Service = { Type = "oneshot"; RemainAfterExit = "no"; - ExecSearchPath = "${config.hm.home.profileDirectory}/bin:/run/current-system/sw/bin"; - ExecStart = "${pkgs.coreutils}/bin/env mailsync"; + ExecSearchPath = "${config.users.users.mike.home}/.local/bin:${config.hm.home.profileDirectory}/bin:/run/current-system/sw/bin"; + ExecStart = "mailsync"; }; }; }; |