diff options
Diffstat (limited to '')
| -rw-r--r-- | packages.nix | 28 | ||||
| -rwxr-xr-x | packages/dwm/autostart.sh | 32 | ||||
| -rw-r--r-- | packages/dwm/pkg.nix | 5 | ||||
| -rwxr-xr-x | packages/xmonad/autostart.sh | 6 |
4 files changed, 35 insertions, 36 deletions
diff --git a/packages.nix b/packages.nix index b701fa7..e17be41 100644 --- a/packages.nix +++ b/packages.nix @@ -5,9 +5,9 @@ let customPackages = with localPkgs; [ sensible-apps shotkey - xmonad - # dwm - # dwmblocks + # xmonad + dwm + dwmblocks st dmenu anypinentry @@ -23,18 +23,16 @@ let ctags fzf docker-compose - gibo direnv gh + # gibo gcc gnumake - nodejs-18_x + nodejs_20 - # godot - - bspwm - sxhkd + # bspwm + # sxhkd rnix-lsp efm-langserver @@ -43,8 +41,7 @@ let nodePackages.typescript-language-server nodePackages.vscode-json-languageserver nodePackages.vscode-langservers-extracted - # nodePackages.tsun - # nodePackage.bash-language-server + nodePackages.prettier ]; apps = with pkgs; [ @@ -55,9 +52,7 @@ let # ungoogled-chromium # Comm - # slack - # signal-cli - # signal-desktop + slack # Media spotify @@ -71,6 +66,7 @@ let krita zathura blender + j4-dmenu-desktop # chiaki # PS remote play @@ -81,7 +77,7 @@ let # qjackctl # ardour pavucontrol - easyeffects + # easyeffects # TUI stuff lf @@ -128,6 +124,8 @@ let xclip xdo xdotool + + v4l-utils ]; in { diff --git a/packages/dwm/autostart.sh b/packages/dwm/autostart.sh index 5421000..65a02ee 100755 --- a/packages/dwm/autostart.sh +++ b/packages/dwm/autostart.sh @@ -26,9 +26,15 @@ once() { # Kill previous instance and run again run() { local name=$1; shift; - [[ ! -z "$name" ]] && pkill "$name" && sleep 0.05; + [[ ! -z "$name" ]] && pkill "$name" && sleep 0.1; is_kill || $@ & } + +spew() { + local name=$1; shift; + [[ ! -z "$name" ]] && pkill "$name" && sleep 0.1; + is_kill || setsid -f "$@" & +} # }}} @@ -36,29 +42,29 @@ run() { echo "[Autostart]: Running daemons"; # Key daemon - run "shotkey" shotkey; + spew "shotkey" shotkey; # Wallpaper run "" ~/.fehbg; - # Dwm blocks status text - # run "dwmblocks" dwmblocks; - # Notification daemon - run "dunst" dunst -config ~/.config/dunst/dunstrc; + spew "dunst" dunst -config ~/.config/dunst/dunstrc; # Compositor - run "picom" picom --experimental-backends --config ~/.config/picom.conf; - - # Cron jobs - #run "crond" crond -n -f ~/.config/crontab/crontab; + spew "picom" picom --config ~/.config/picom.conf; # Scheduler - run "remind" remind -k"notify-send -a reminder %s" -z10 $REMINDER_FILE; + spew "remind" remind -k='notify-send -a reminder %s' -z10 "$REMINDER_FILE"; # Battery watcher run "" ~/scripts/battery-watch.sh start; + # Dwm blocks status text + # run "dwmblocks" dwmblocks; + + # Cron jobs + #run "crond" crond -n -f ~/.config/crontab/crontab; + # Disk automount #once "udiskie" ~/.bin/with_zsh udiskie; @@ -88,7 +94,9 @@ echo "[Autostart]: Checking applications"; #on_startup sensible-browser; applications() { - #sleep 0.5; + sleep 0.5; + + run "dwmblocks" dwmblocks; #focus_tag 9; #on_startup :today; diff --git a/packages/dwm/pkg.nix b/packages/dwm/pkg.nix index 322071e..a5b1b1d 100644 --- a/packages/dwm/pkg.nix +++ b/packages/dwm/pkg.nix @@ -3,16 +3,15 @@ with pkgs.lib; stdenv.mkDerivation rec { name = "local-dwm-${version}"; - version = "6.2.0"; + version = "6.2.1"; src = ./source; buildInputs = [ libX11 libXinerama libXft ]; - unpackPhase = ''cp -r $src/* .''; - buildPhase = ''make''; + buildPhase = ''make clean dwm''; installPhase = ''make PREFIX=$out DESTDIR="" install''; } diff --git a/packages/xmonad/autostart.sh b/packages/xmonad/autostart.sh index 36f0cd7..d62d895 100755 --- a/packages/xmonad/autostart.sh +++ b/packages/xmonad/autostart.sh @@ -41,18 +41,12 @@ run() { # Wallpaper run "" ~/.fehbg; - # Dwm blocks status text - # run "dwmblocks" dwmblocks; - # Notification daemon run "dunst" dunst -config ~/.config/dunst/dunstrc; # Compositor run "picom" picom --config ~/.config/picom.conf; - # Cron jobs - #run "crond" crond -n -f ~/.config/crontab/crontab; - # Scheduler run "remind" remind -k"notify-send -a reminder %s" -z10 $REMINDER_FILE; |