From c57738cb08102449240da3b71a577e79c8fd0c5c Mon Sep 17 00:00:00 2001 From: "Skylar \"The Cobra\" Widulski" Date: Thu, 21 Dec 2023 22:56:51 -0500 Subject: [PATCH] bump Signed-off-by: Skylar "The Cobra" Widulski --- .bash_profile | 1 + .config/guix/cobra/home.scm | 1 + .config/guix/cobra/home/bin.scm | 12 +++++------- .config/guix/home-config.scm | 7 +++++++ .local/bin/logout-wofi | 6 +++--- .local/bin/start-pipewire | 6 ++---- .newsboat/config | 2 +- 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.bash_profile b/.bash_profile index f5caaef..85d08b2 100644 --- a/.bash_profile +++ b/.bash_profile @@ -8,6 +8,7 @@ export LESS_TERMCAP_so='' export LESS_TERMCAP_ue='' export LESS_TERMCAP_us='' export LESS=-R +export PATH="$HOME/.local/bin${PATH:+:$PATH}" . ~/.devspec [ -f ~/.guix-home/setup-environment ] && . ~/.guix-home/setup-environment diff --git a/.config/guix/cobra/home.scm b/.config/guix/cobra/home.scm index a3ad475..c4c8e65 100644 --- a/.config/guix/cobra/home.scm +++ b/.config/guix/cobra/home.scm @@ -33,6 +33,7 @@ export LESS_TERMCAP_so='' export LESS_TERMCAP_ue='' export LESS_TERMCAP_us='' export LESS=-R +export PATH=\"$HOME/.local/bin${PATH:+:$PATH}\" . ~/.devspec [ -f ~/.guix-home/setup-environment ] && . ~/.guix-home/setup-environment diff --git a/.config/guix/cobra/home/bin.scm b/.config/guix/cobra/home/bin.scm index cbd6eb3..1f7bec5 100644 --- a/.config/guix/cobra/home/bin.scm +++ b/.config/guix/cobra/home/bin.scm @@ -47,10 +47,8 @@ done" "\nEOF")) (system (string-append #$coreutils "/bin/cat << \"EOF\" >" #$output "\n" "\ #!/usr/bin/env bash -rm -rf /run/user/$UID/pulse -pkill pulseaudio -rm -rf /run/user/$UID/pulse - +pkill pipewire +pkill wireplumber pipewire & pipewire-pulse & wireplumber &" "\nEOF")) @@ -127,9 +125,9 @@ fi")) case \"$(printf \"logout\\nreboot\\nshutdown\\nsleep\\n\" | wofi --dmenu -i -H 500 -W 250 -x 0 -y 0 )\" in 'logout') swaymsg exit;; - 'sleep') ~/.local/bin/suspend ;; - 'reboot') sudo reboot ;; - 'shutdown') sudo poweroff ;; + 'sleep') loginctl suspend ;; + 'reboot') sudo /run/current-system/profile/sbin/reboot ;; + 'shutdown') sudo /run/current-system/profile/sbin/halt ;; *) exit 1 ;; esac" "\nEOF")) (chmod #$output #o755)))) diff --git a/.config/guix/home-config.scm b/.config/guix/home-config.scm index 5ed771e..dd97da1 100644 --- a/.config/guix/home-config.scm +++ b/.config/guix/home-config.scm @@ -29,6 +29,8 @@ (list ;; Audio "alsa-utils" "cmus" + "mpd" + "mpd-mpc" "mumble" "pamixer" "pipewire" @@ -83,6 +85,7 @@ ;; Development "at-spi2-core" ;"avr-toolchain" + "cmake" "gcc-toolchain" "git" "git:send-email" @@ -107,6 +110,10 @@ "teeworlds" "xonotic" + ;; Guile + "fftw" + "guile-sdl2" + ;; Multimedia "ffmpeg" "gimp" diff --git a/.local/bin/logout-wofi b/.local/bin/logout-wofi index 3b12410..5b79b4e 100755 --- a/.local/bin/logout-wofi +++ b/.local/bin/logout-wofi @@ -2,8 +2,8 @@ case "$(printf "logout\nreboot\nshutdown\nsleep\n" | wofi --dmenu -i -H 500 -W 250 -x 0 -y 0 )" in 'logout') swaymsg exit;; - 'sleep') ~/.local/bin/suspend ;; - 'reboot') sudo reboot ;; - 'shutdown') sudo poweroff ;; + 'sleep') loginctl suspend ;; + 'reboot') sudo /run/current-system/profile/sbin/reboot ;; + 'shutdown') sudo /run/current-system/profile/sbin/halt ;; *) exit 1 ;; esac diff --git a/.local/bin/start-pipewire b/.local/bin/start-pipewire index 6f419f9..99e4cbf 100755 --- a/.local/bin/start-pipewire +++ b/.local/bin/start-pipewire @@ -1,9 +1,7 @@ #!/usr/bin/env bash -rm -rf /run/user/$UID/pulse -pkill pulseaudio -rm -rf /run/user/$UID/pulse - +pkill pipewire +pkill wireplumber pipewire & pipewire-pulse & wireplumber & diff --git a/.newsboat/config b/.newsboat/config index 4288967..aff172c 100644 --- a/.newsboat/config +++ b/.newsboat/config @@ -1,4 +1,4 @@ -browser "cmus-remote -U; swayhide mpv --user-agent=Mozilla/5.0 '--ytdl-format=bestvideo[height=?480][fps<=?30][vcodec!=?vp9]+bestaudio/best' %u" +browser "mpc -h /tmp/mpd-socket pause; swayhide mpv --user-agent=Mozilla/5.0 '--ytdl-format=bestvideo[height=?480][fps<=?30][vcodec!=?vp9]+bestaudio/best' %u" use-proxy yes proxy-type socks5h proxy 127.0.0.1:9050