diff options
-rw-r--r-- | .Xmodmap | 2 | ||||
-rw-r--r-- | .config/XMonad/lib/Defaults.hs | 2 | ||||
-rw-r--r-- | .config/XMonad/lib/Keybindings.hs | 11 | ||||
-rw-r--r-- | .config/fish/config.fish | 3 | ||||
-rw-r--r-- | .config/lightdm/lightdm.conf | 2 | ||||
-rw-r--r-- | .config/mpd/database | bin | 0 -> 8448 bytes | |||
-rw-r--r-- | .config/mpd/mpd.conf | 14 | ||||
-rw-r--r-- | .config/mpd/playlists/main.m3u | 8 | ||||
-rw-r--r-- | .config/ncmpcpp/config | 2 | ||||
-rw-r--r-- | .config/polybar/config.ini | 21 | ||||
-rwxr-xr-x | .scripts/audio_dl.sh | 2 | ||||
-rwxr-xr-x | .scripts/screenrefresh | 17 |
12 files changed, 66 insertions, 18 deletions
@@ -98,7 +98,7 @@ keycode 104 = KP_Enter NoSymbol KP_Enter keycode 105 = Menu NoSymbol Menu keycode 106 = KP_Divide KP_Divide KP_Divide KP_Divide KP_Divide KP_Divide XF86Ungrab keycode 107 = Print Sys_Req Print Sys_Req -keycode 108 = Super_L NoSymbol Super_L +keycode 108 = Super_R NoSymbol Super_R keycode 109 = Linefeed NoSymbol Linefeed keycode 110 = Home NoSymbol Home keycode 111 = Up NoSymbol Up diff --git a/.config/XMonad/lib/Defaults.hs b/.config/XMonad/lib/Defaults.hs index df81331..8492cd7 100644 --- a/.config/XMonad/lib/Defaults.hs +++ b/.config/XMonad/lib/Defaults.hs @@ -27,7 +27,7 @@ myModMask' = mod1Mask myModShiftMask = myModMask .|. shiftMask myModShiftMask' = myModMask' .|. shiftMask -myLockscreen = "notify-send 'to be set up!' 'to be set up!'" +myLockscreen = "betterlockscreen -q -l" myColorPicker = "colorpicker --short --one-shot --preview | xsel -b" myTerminal = "open_terminal" diff --git a/.config/XMonad/lib/Keybindings.hs b/.config/XMonad/lib/Keybindings.hs index 672e286..7e65e81 100644 --- a/.config/XMonad/lib/Keybindings.hs +++ b/.config/XMonad/lib/Keybindings.hs @@ -43,6 +43,7 @@ myMouseKeybindings = [ myKeybindings :: [((KeyMask, KeySym), X ())] myKeybindings = [ ((myModMask, xK_Return), spawn myTerminal) + , ((myModShiftMask, xK_Return), spawn myLockscreen) , ((myModMask .|. shiftMask, xK_q), kill1) , ((myModShiftMask, xK_p), spawn myLauncher) @@ -66,10 +67,10 @@ myKeybindings = [ , ((myModMask .|. shiftMask, xK_minus), spawn backlightDown) -- modify gaps on runtime - , ((myModMask, xK_F2), incWindowSpacing 1) - , ((myModMask, xK_F1), decWindowSpacing 1) - , ((myModMask .|. shiftMask, xK_F2), incScreenSpacing 1) - , ((myModMask .|. shiftMask, xK_F1), decScreenSpacing 1) + -- , ((myModMask, xK_F2), incWindowSpacing 1) + -- , ((myModMask, xK_F1), decWindowSpacing 1) + -- , ((myModMask .|. shiftMask, xK_F2), incScreenSpacing 1) + -- , ((myModMask .|. shiftMask, xK_F1), decScreenSpacing 1) -- view prev/next workspaces , ((myModShiftMask, xK_Tab ), prevWS) @@ -169,6 +170,8 @@ myKeybindingsP = [ , ("M-a m", spawn volMute) , ("M-a p", spawn pausePlay) , ("M-a d", myScratchpad "arandr") + , ("M-a r", spawn "screenrefresh") + , ("M-a S-r", spawn "screenrefresh -b") -- media , ("M-m w", myScratchpad "wallpaper") , ("M-S-x", myScratchpad "wallpaper") diff --git a/.config/fish/config.fish b/.config/fish/config.fish index fc30b3c..959abfd 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -2,7 +2,8 @@ if status is-interactive # Commands to run in interactive sessions can go here starship init fish | source - neofetch + # neofetch + pfetch # abbreviations abbr --add --global gA 'git add -A' diff --git a/.config/lightdm/lightdm.conf b/.config/lightdm/lightdm.conf index 99e5265..c5a0652 100644 --- a/.config/lightdm/lightdm.conf +++ b/.config/lightdm/lightdm.conf @@ -86,7 +86,7 @@ sessions-directory=/usr/share/xsessions [Seat:*] #type=local #pam-service=lightdm -#pam-autologin-service=lightdm-autologin +pam-autologin-service=lightdm-autologin #pam-greeter-service=lightdm-greeter #xserver-command=X #xmir-command=Xmir diff --git a/.config/mpd/database b/.config/mpd/database Binary files differnew file mode 100644 index 0000000..07df128 --- /dev/null +++ b/.config/mpd/database diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf index fda695a..15b0859 100644 --- a/.config/mpd/mpd.conf +++ b/.config/mpd/mpd.conf @@ -1,8 +1,8 @@ -db_file "/home/zt/.local/share/mpd/database" pid_file "/home/zt/.local/share/mpd/pid" -state_file "/home/zt/.local/share/mpd/state" +#state_file "/home/zt/.local/share/mpd/state" +db_file "/home/zt/.config/mpd/database" playlist_directory "/home/zt/.config/mpd/playlists" -music_directory "/hdd/Music" +music_directory "/home/zt/hdd/Music/lib" port "6600" auto_update "yes" log_file "syslog" @@ -13,8 +13,8 @@ audio_output { } audio_output { - type "fifo" - name "Visualizer feed" - path "/tmp/mpd.fifo" - format "44100:16:2" + type "fifo" + name "Visualizer feed" + path "/tmp/mpd.fifo" + format "44100:16:2" } diff --git a/.config/mpd/playlists/main.m3u b/.config/mpd/playlists/main.m3u new file mode 100644 index 0000000..0fce2b6 --- /dev/null +++ b/.config/mpd/playlists/main.m3u @@ -0,0 +1,8 @@ +heeriye.opus +pasoori.opus +i_do.opus +alibi.opus +bad_habits.opus +bbibbi.opus +uchiyage_hanabi.opus +the_feels.opus diff --git a/.config/ncmpcpp/config b/.config/ncmpcpp/config index 79c1cc0..e5d4ae3 100644 --- a/.config/ncmpcpp/config +++ b/.config/ncmpcpp/config @@ -31,7 +31,7 @@ # ## Needed for tag editor and file operations to work. ## -mpd_music_dir = /hdd/Music +mpd_music_dir = /home/zt/Music/lib # #mpd_crossfade_time = 5 # diff --git a/.config/polybar/config.ini b/.config/polybar/config.ini index 749dc1a..cef5832 100644 --- a/.config/polybar/config.ini +++ b/.config/polybar/config.ini @@ -153,7 +153,8 @@ font-3 = fixed:pixelsize=10;1 ;font-4 = unifont:fontformat=truetype:size=8:antialias=false;0 ;font-5 = siji:pixelsize=10;1 -modules-left = date uptime wlan eth storage-ssd storage-hdd cpu temperature memory xwindow +modules-left = date uptime wlan eth storage-ssd storage-hdd cpu temperature memory mpd +modules-center = xwindow modules-right = battery pulseaudio ewmh override-redirect = false @@ -409,3 +410,21 @@ label-urgent-foreground = ${colors.ws-urgent-fg} label-urgent-background = ${colors.ws-urgent-bg} label-urgent-underline = ${colors.ws-urgent-ul} label-urgent-padding = 3 + +[module/mpd] +type = internal/mpd + +format-online = <label-song> <label-time> +label-song = %title% + +label-song-foreground = ${colors.module-color-0} +label-time-foreground = ${colors.module-color-0} + +; Host where mpd is running (either ip or domain name) +; Can also be the full path to a unix socket where mpd is running. +host = 127.0.0.1 +port = 6600 + +; Seconds to sleep between progressbar/song timer sync +; Default: 1 +interval = 1 diff --git a/.scripts/audio_dl.sh b/.scripts/audio_dl.sh index 8e6c9eb..e13aebf 100755 --- a/.scripts/audio_dl.sh +++ b/.scripts/audio_dl.sh @@ -5,7 +5,7 @@ LINES=$(cat $FILE) counter=1 for line in $LINES; do - youtube-dl -x --audio-format mp3 "https://www.youtube.com/watch?v=$line" || echo "$line" >> "$FILE""_failed" + yt-dlp -x --audio-format opus "https://www.youtube.com/watch?v=$line" || echo "$line" >> "$FILE""_failed" counter=$((counter+1)) tail -n "+$counter" "$FILE" > "$FILE""_remaining" done diff --git a/.scripts/screenrefresh b/.scripts/screenrefresh new file mode 100755 index 0000000..f6e17e5 --- /dev/null +++ b/.scripts/screenrefresh @@ -0,0 +1,17 @@ +#!/bin/sh + +polystart="false" +while getopts 'b' flag; do + case "${flag}" in + b) polystart="true" ;; + *) exit 1 ;; + esac +done + +screensetup.sh + +nitrogen --restore + +if [ "$polystart" = "true" ]; then + polystart & +fi |