diff options
Diffstat (limited to '')
-rw-r--r-- | .config/alacritty/alacritty.toml | 2 | ||||
-rw-r--r-- | .config/dunst/dunstrc | 23 | ||||
-rw-r--r-- | .config/go2work/go2work.toml | 19 | ||||
-rw-r--r-- | .config/mimeapps.list | 4 | ||||
-rw-r--r-- | .config/nvim/after/plugin/gitsigns.lua | 3 | ||||
-rw-r--r-- | .config/nvim/after/plugin/lualine.lua | 2 | ||||
-rw-r--r-- | .config/picom.conf | 10 | ||||
-rwxr-xr-x | .config/wayland/init.sh | 5 | ||||
-rw-r--r-- | .config/x11/xinitrc | 8 | ||||
-rw-r--r-- | .config/zsh/alias.zsh | 2 | ||||
-rwxr-xr-x | .local/bin/dmbookm | 3 | ||||
-rwxr-xr-x | .local/bin/mic | 45 | ||||
-rwxr-xr-x | .local/bin/mixer-set | 86 | ||||
-rwxr-xr-x | .local/bin/setwp | 4 | ||||
-rwxr-xr-x | .local/bin/synchdd | 4 | ||||
-rw-r--r-- | .ssh/config | 1 |
16 files changed, 138 insertions, 83 deletions
diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index 8233a9f..a5b5fbf 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -117,7 +117,7 @@ semantic_escape_chars = ",│`|:\"' ()[]{}<>\t" [window] decorations = "full" -opacity = 0.92 +opacity = 1.00 title = "Alacritty" [window.class] diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc index 493a8a1..5239e3a 100644 --- a/.config/dunst/dunstrc +++ b/.config/dunst/dunstrc @@ -3,14 +3,14 @@ follow = none width = (200, 800) origin = top-right - offset = 50x50 + offset = (0, 0) indicate_hidden = yes shrink = yes transparency = 0 separator_height = 4 - padding = 2 + padding = 6 horizontal_padding = 10 - frame_width = 2 + frame_width = 2 close = ctrl+space history = ctrl+grave context = ctrl+shift+period @@ -75,23 +75,24 @@ [urgency_low] # IMPORTANT: colors have to be defined in quotation marks. # Otherwise the "#" and following would be interpreted as a comment. - background = "#32302f" - foreground = "#b8a994" - frame_color = "#887964" + background = "#282828" + foreground = "#a89984" + frame_color = "#a89984" + highlight = "#458588" timeout = 10 # Icon for notifications with low urgency, uncomment to enable #icon = /path/to/icon [urgency_normal] - background = "#cc241d" - foreground = "#ebdbb2" - frame_color = "#ebdbb2" + background = "#282828" + foreground = "#cc241d" + frame_color = "#cc241d" timeout = 10 [urgency_critical] background = "#cc241d" - foreground = "#ebdbb2" - frame_color = "#b77901" + foreground = "#1d2021" + frame_color = "#1d2021" timeout = 20 # Every section that isn't one of the above is interpreted as a rules to diff --git a/.config/go2work/go2work.toml b/.config/go2work/go2work.toml index 0fecd1e..188e724 100644 --- a/.config/go2work/go2work.toml +++ b/.config/go2work/go2work.toml @@ -3,25 +3,24 @@ # is set to 'true' files = [ # '/home/jozan/mu/rock/grunge/alice_in_chains/1992_dirt/01_them_bones.flac', - # '/var/hdd/files/mu/rock/grunge/pearl_jam/2020_mtv_unplugged_live/02_state_of_love_and_trust.flac', - # '/home/jozan/mu/rock/stoner_rock/slo_burn/1997_amusing_the_amazing_ep/02_muezli.flac' + # '/home/jozan/mu/rock/grunge/pearl_jam/2020_mtv_unplugged_live/02_state_of_love_and_trust.flac', + # '/home/jozan/mu/rock/stoner_rock/slo_burn/1997_amusing_the_amazing_ep/02_muezli.flac' # '/home/jozan/mu/rock/stoner_rock/slo_burn/1997_amusing_the_amazing_ep/03_pilot_the_dune.flac' - # '/usr/local/hdd/jozan/dl/Songs Of Anarchy/2015 Songs of Anarchy:Vol. 4 (US, 88875 06146 2)/05 Billy Valentine & The Forest Rangers - All Along The Watchtower.flac', - # 'dl/Songs Of Anarchy/2011 Songs of Anarchy:Music From Sons of Anarchy Seasons 1-4 (US, 88691 91432 2)/09 Paul Brady & The Forest Rangers - Gimme Shelter.flac', # '/home/jozan/mu/ost/mick_gordon/2020_doom_eternal_original_game_soundtrack/54_meathook.flac', # '/home/jozan/mu/rock/punk/guerilla_poubelle/2007_punk_existentialisme/10_dans_la_diagonale.flac', - # '/var/hdd/files/mu/rock/punk/guerilla_poubelle/2005_il_faut_repeindre_le_monde_en_noir/15_exception_culturelle_trafic_darmes.flac', + # '/home/jozan/mu/rock/punk/guerilla_poubelle/2005_il_faut_repeindre_le_monde_en_noir/15_exception_culturelle_trafic_darmes.flac', # '/home/jozan/mu/ost/mick_gordon/2020_doom_eternal_original_game_soundtrack/21_the_super_gore_nest.flac', # '/home/jozan/16-441/06_conflagration.wav', # '/home/jozan/mu/progressive/progressive_black_metal/deathspell_omega/2010_paracletus/02_wings_of_predation.flac', - '/home/jozan/mu/metal/technical_death_metal/gojira/2016_magma/04_stranded.flac', + # '/home/jozan/mu/metal/technical_death_metal/gojira/2016_magma/04_stranded.flac', # '/home/jozan/mu/metal/technical_death_metal/gojira/2005_form_mars_to_sirius/02_backbone.flac', # '/usr/home/jozan/mu/metal/technical_death_metal/ulcerate/2011_the_destroyers_of_all/07_the_destroyers_of_all.flac', - #'/home/jozan/mu/rock/grunge/nirvana/2011_nevermind_20th_anniversary_deluxe_edition/cd_1/04_breed.flac', + '/home/jozan/mu/rock/grunge/nirvana/2011_nevermind_20th_anniversary_deluxe_edition/cd_1/04_breed.flac', # '/home/jozan/mu/rock/grunge/alice_in_chains/1990_facelift/02_man_in_the_box.flac', - # '/var/hdd/files/mu/rock/grunge/alice_in_chains/1992_dirt/11_angry_chair.flac', - # '/var/hdd/files/mu/rock/grunge/soundgarden/1994_superunknown/04_mailman.flac', - # '/var/hdd/files/mu/rock/grunge/nirvana/2005_sliver_the_best_of_the_box_compilation/03_mrs._butterworth_rehearsal_demo.flac', + # '/home/jozan/mu/rock/grunge/alice_in_chains/1992_dirt/11_angry_chair.flac', + # '/home/jozan/mu/rock/grunge/alice_in_chains/1995_alice_in_chains/08_god_am.flac', + # '/home/jozan/mu/rock/grunge/soundgarden/1994_superunknown/04_mailman.flac', + # '/home/jozan/mu/rock/grunge/nirvana/2005_sliver_the_best_of_the_box_compilation/03_mrs._butterworth_rehearsal_demo.flac', # '/home/jozan/mu/rock/grunge/nirvana/2009_bleach_20th_anniversary_deluxe_edition/04_school.flac', ] # The program used to play the music files diff --git a/.config/mimeapps.list b/.config/mimeapps.list index af1787d..a7d1359 100644 --- a/.config/mimeapps.list +++ b/.config/mimeapps.list @@ -12,7 +12,7 @@ application/xhtml+xml=userapp-Firefox-SWW0Y1.desktop application/x-extension-xhtml=userapp-Firefox-SWW0Y1.desktop application/x-extension-xht=userapp-Firefox-SWW0Y1.desktop application/pdf=org.pwmt.zathura-pdf-poppler.desktop -image/jpeg=sxiv.desktop +image/jpeg=imv.desktop image/gif=nsxiv.desktop audio/mpeg=mpv.desktop audio/flac=mpv.desktop @@ -82,7 +82,7 @@ x-scheme-handler/mid=userapp-Thunderbird-SJ2821.desktop;userapp-Thunderbird-BXAR video/x-msvideo=mpv.desktop; x-scheme-handler/http=firefox.desktop;userapp-Firefox-SWW0Y1.desktop; video/quicktime=mpv.desktop; -image/jpeg=sxiv.desktop; +image/jpeg=sxiv.desktop;imv.desktop; [Removed Associations] x-scheme-handler/http=librewolf.desktop; diff --git a/.config/nvim/after/plugin/gitsigns.lua b/.config/nvim/after/plugin/gitsigns.lua index 8070d1a..7b4d6a2 100644 --- a/.config/nvim/after/plugin/gitsigns.lua +++ b/.config/nvim/after/plugin/gitsigns.lua @@ -36,7 +36,4 @@ require('gitsigns').setup { row = 0, col = 1 }, - yadm = { - enable = false - }, } diff --git a/.config/nvim/after/plugin/lualine.lua b/.config/nvim/after/plugin/lualine.lua index b266af3..7f94ccd 100644 --- a/.config/nvim/after/plugin/lualine.lua +++ b/.config/nvim/after/plugin/lualine.lua @@ -224,7 +224,7 @@ ins_right { function() local msg = 'no lsp' local buf_ft = vim.api.nvim_buf_get_option(0, 'filetype') - local clients = vim.lsp.get_active_clients() + local clients = vim.lsp.get_clients() if next(clients) == nil then icon = '' return '' diff --git a/.config/picom.conf b/.config/picom.conf index dc1dfb2..f4afb05 100644 --- a/.config/picom.conf +++ b/.config/picom.conf @@ -23,7 +23,7 @@ no-use-damage = true; # detect-rounded-corners = true; # Enabled client-side shadows on windows. -shadow = true; +shadow = false; # The blur radius for shadows. (default 12) shadow-radius = 12; # The left offset for shadows. (default -15) @@ -97,13 +97,13 @@ wintypes: }; dock = { shadow = true; } dnd = { shadow = false; } - popup_menu = { - opacity = 1.0; + popup_menu = { + opacity = 1.0; shadow = false; fade = false; } - dropdown_menu = { - opacity = 1.0; + dropdown_menu = { + opacity = 1.0; fade = false; } }; diff --git a/.config/wayland/init.sh b/.config/wayland/init.sh index 62d90ed..b86db41 100755 --- a/.config/wayland/init.sh +++ b/.config/wayland/init.sh @@ -43,6 +43,10 @@ startif() { startif ydotoold startif dunst pgrep $mpd >/dev/null || $mpd >/dev/null 2>&1 +pkill wireplumber +pkill pipewire-pulse +pkill pipewire +sleep 1 startif pipewire sleep 1 startif pipewire-pulse @@ -52,5 +56,4 @@ export QT_QPA_PLATFORM=xcb startif copyq startif nextcloud startif stalonetray -firefox & notify-send -u normal 'welcome' "$icon welcome back, partner!" diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index 0d3a577..1510554 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -47,7 +47,7 @@ dunst_shit() { for pid in $(ps aux | grep local/bin/kb | awk '{print $2}'); do kill -9 $pid done - [ $host = "mother" ] && "$HOME"/.local/bin/setwp "$HOME"/pics/wp.png || "$HOME"/.local/bin/setwp "$HOME"/pics/wp/129.jpg + [ $host = "mother" ] && "$HOME"/.local/bin/setwp "$HOME"/pics/wp.png || "$HOME"/.local/bin/setwp "$HOME"/pics/wp/desert "$HOME"/.local/bin/kb & } @@ -57,9 +57,9 @@ start_apps() { startif copyq startif nextcloud QT_SCALE_FACTOR=1.35 startif rclone-browser - startif nixGL teams-for-linux - startif thunderbird - startif firefox + # startif nixGL teams-for-linux + # startif thunderbird + # startif firefox } export LANG='en_US.UTF-8' diff --git a/.config/zsh/alias.zsh b/.config/zsh/alias.zsh index 4cd4099..4b01038 100644 --- a/.config/zsh/alias.zsh +++ b/.config/zsh/alias.zsh @@ -220,7 +220,7 @@ update() { yay ;; po-rbo) - doas apt update && doas apt dist-upgrade + doas apt update; doas apt dist-upgrade nix-channel --update nix-env -u # git -C $HOME/.local/packs/neovim checkout master diff --git a/.local/bin/dmbookm b/.local/bin/dmbookm index 22a9e52..dcd0e36 100755 --- a/.local/bin/dmbookm +++ b/.local/bin/dmbookm @@ -37,6 +37,9 @@ use constant LIST => { nua_aether => 'https://aether.int.ysosecure.com/ui', nua_gaia => 'https://gaia.int.ysosecure.com/', nua_certsrv => 'https://orca1.int.ysosecure.com/certsrv', + nua_sentry => 'https://sentry.nuabee.fr/', + nua_leek => 'https://leek.int.ysosecure.com/', + nua_otc => 'https://auth.otc.t-systems.com/', }; sub main diff --git a/.local/bin/mic b/.local/bin/mic index b53c966..492c773 100755 --- a/.local/bin/mic +++ b/.local/bin/mic @@ -3,6 +3,7 @@ use strict; use warnings; use Capture::Tiny qw(capture); +use Sys::Hostname qw(hostname); use constant { MIXER_PATH => '/usr/sbin/mixer', @@ -12,22 +13,52 @@ use constant { sub main { my $rec_vol; + my $host; - $rec_vol = `mixer rec | awk -F ':' '{print \$2}'`; - chomp $rec_vol; - if ($rec_vol == 0) { - capture { - system(MIXER_PATH, 'rec', '100'); + $host = hostname(); + if ($host eq "po-rbo.ln.ysosecure.com") { + system('/usr/bin/pactl', 'set-source-mute', '@DEFAULT_SOURCE@', 'toggle'); + my $muted = `/usr/bin/pactl get-source-mute \@DEFAULT_SOURCE\@ | awk '{print \$2}'`; + chomp $muted; + if ($muted eq "yes") { system( - NOTIF_PATH, + '/usr/bin/notify-send', '-u', 'low', '-t', '1750', 'mixer-set', - ' Microphone restored' + ' muted' ); + } + else { + system( + '/usr/bin/notify-send', + '-u', + 'low', + '-t', + '1750', + 'mixer-set', + ' restored' + ); + } + exit; + } + $rec_vol = `mixer rec | awk -F ':' '{print \$2}'`; + chomp $rec_vol; + if ($rec_vol == 0) { + capture { + system(MIXER_PATH, 'rec', '100'); }; + system( + NOTIF_PATH, + '-u', + 'low', + '-t', + '1750', + 'mixer-set', + ' Microphone restored' + ); } else { capture { diff --git a/.local/bin/mixer-set b/.local/bin/mixer-set index c5911bb..9963c91 100755 --- a/.local/bin/mixer-set +++ b/.local/bin/mixer-set @@ -4,6 +4,7 @@ use strict; use warnings; use Term::ANSIColor; use Capture::Tiny qw(capture); +use Sys::Hostname qw(hostname); sub main { my $argc = $#ARGV + 1; @@ -21,23 +22,41 @@ sub main { print "Too many arguments, only one needed\n"; exit 2; } + my $host = hostname(); my $curr_vol = 0; my $curr_vol_cmd = "/usr/sbin/mixer vol | /usr/bin/awk -F ':' '{print \$2}'"; + if ($host eq "po-rbo.ln.ysosecure.com") { + $curr_vol_cmd = "/usr/bin/pactl get-sink-volume \@DEFAULT_SINK\@ | /usr/bin/awk '{print \$5}'"; + } + my $ns = '/usr/local/bin/notify-send'; + if (hostname() eq "po-rbo.ln.ysosecure.com") { + $ns = '/usr/bin/notify-send'; + } if ($ARGV[0] eq "lower" || $ARGV[0] eq "raise") { if ($ARGV[0] eq "lower") { - capture { - system('/usr/sbin/mixer', 'vol', '-5'); - }; + if ($host eq "po-rbo.ln.ysosecure.com") { + system('/usr/bin/pactl', 'set-sink-volume', '@DEFAULT_SINK@', '-5%'); + } + else { + capture { + system('/usr/sbin/mixer', 'vol', '-5'); + }; + } } else { - capture { - system('/usr/sbin/mixer', 'vol', '+5'); - }; + if ($host eq "po-rbo.ln.ysosecure.com") { + system('/usr/bin/pactl', 'set-sink-volume', '@DEFAULT_SINK@', '+5%'); + } + else { + capture { + system('/usr/sbin/mixer', 'vol', '+5'); + }; + } } $curr_vol = `$curr_vol_cmd`; chomp $curr_vol; system( - '/usr/local/bin/notify-send', + $ns, '-h', 'int:value:' . $curr_vol, '-u', @@ -45,7 +64,7 @@ sub main { '-t', '1000', 'mixer-set', - '墳 Volume' + ' volume' ); system('kill -68 $(pidof dwmblocks)'); exit; @@ -58,21 +77,26 @@ sub main { open(my $fh, '>:encoding(UTF-8)', $tmp_file); print $fh $curr_vol; close($fh); - capture { - system( - '/usr/sbin/mixer', - 'vol', - '0' - ); - }; + if ($host eq "po-rbo.ln.ysosecure.com") { + system('/usr/bin/pactl', 'set-sink-volume', '@DEFAULT_SINK@', '0%'); + } + else { + capture { + system( + '/usr/sbin/mixer', + 'vol', + '0' + ); + }; + } system( - '/usr/local/bin/notify-send', + $ns, '-u', 'low', '-t', '1750', 'mixer-set', - '婢 Volume muted' + ' muted' ); system('kill -68 $(pidof dwmblocks)'); } @@ -80,25 +104,21 @@ sub main { open(my $fh, '<:encoding(UTF-8)', $tmp_file); $curr_vol = <$fh>; close($fh); - capture { - system( - '/usr/sbin/mixer', - 'vol', - $curr_vol - ); - }; - my $icon; - if ($curr_vol <= 33) { - $icon = '奄 '; - } - elsif ($curr_vol <= 66) { - $icon = '奔 '; + if ($host eq "po-rbo.ln.ysosecure.com") { + chomp $curr_vol; + system('/usr/bin/pactl', 'set-sink-volume', '@DEFAULT_SINK@', $curr_vol); } else { - $icon = '墳 '; + capture { + system( + '/usr/sbin/mixer', + 'vol', + $curr_vol + ); + }; } system( - '/usr/local/bin/notify-send', + $ns, '-h', 'int:value:' . $curr_vol, '-u', @@ -106,7 +126,7 @@ sub main { '-t', '1750', 'mixer-set', - $icon . ' Volume restored' + ' restored' ); system('kill -68 $(pidof dwmblocks)'); } diff --git a/.local/bin/setwp b/.local/bin/setwp index 5340138..85041ec 100755 --- a/.local/bin/setwp +++ b/.local/bin/setwp @@ -44,12 +44,12 @@ sub set_wp return 1 if !(-r $wp) || !(-f $wp); if (defined $ENV{WAYLAND_DISPLAY}) { - $old_pid = `pidof swaybg`; + $old_pid = `pidof wbg`; chomp $old_pid; $pid = fork(); if (not $pid) { setsid(); - exec("swaybg", "--image", $wp); + exec("wbg", $wp); } else { sleep(1); exec("kill", $old_pid); diff --git a/.local/bin/synchdd b/.local/bin/synchdd index 642967a..49cc428 100755 --- a/.local/bin/synchdd +++ b/.local/bin/synchdd @@ -25,5 +25,5 @@ rsync -avhk --delete-after \ rsync -avhk --delete-after \ $HOME/vids $dest # sort_dir -rsync -avhk --delete-after \ - $HOME/hdd/sort $dest +#rsync -avhk --delete-after \ +# $HOME/hdd/sort $dest diff --git a/.ssh/config b/.ssh/config index 6c52b02..f30d4d9 100644 --- a/.ssh/config +++ b/.ssh/config @@ -1,6 +1,7 @@ Host * !mars !mother !helios User root StrictHostKeyChecking no + UserKnownHostsFile /dev/null Host mars User jozan Host mother |