summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.config/dunst/dunstrc2
-rw-r--r--.config/env5
-rw-r--r--.config/go2work/go2work.toml4
-rw-r--r--.config/lf/lfrc7
-rw-r--r--.config/nvim/after/plugin/gitsigns.lua3
-rw-r--r--.config/nvim/after/plugin/lualine.lua2
-rw-r--r--.config/pipe-viewer/pipe-viewer.conf7
-rwxr-xr-x.config/wayland/init.sh11
-rw-r--r--.config/x11/xinitrc8
-rwxr-xr-x.local/bin/dmapps6
-rwxr-xr-x.local/bin/dmlog6
-rwxr-xr-x.local/bin/dmpass12
-rwxr-xr-x.local/bin/dmrun6
-rwxr-xr-x.local/bin/linkview12
-rwxr-xr-x.local/bin/setwp42
15 files changed, 90 insertions, 43 deletions
diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
index 5171744..493a8a1 100644
--- a/.config/dunst/dunstrc
+++ b/.config/dunst/dunstrc
@@ -1,5 +1,5 @@
[global]
- monitor = 1
+ monitor = 0
follow = none
width = (200, 800)
origin = top-right
diff --git a/.config/env b/.config/env
index afc6d1d..761ef8b 100644
--- a/.config/env
+++ b/.config/env
@@ -99,7 +99,12 @@ export MPD_HOST="$XDG_DATA_HOME"/mpd/socket
export RUSTFLAGS='-L /usr/local/lib'
export WWW_HOME='https://start.duckduckgo.com/'
export YTFZF_HIST='0'
+
+# wayland
export WLR_DRM_NO_ATOMIC=1
+export XDG_SESSION_TYPE=wayland
+export XDG_CURRENT_DESKTOP=dwl
+export MOZ_ENABLE_WAYLAND=1
# PATH
export PATH="$HOME"/.local/bin:"$HOME"/.local/bin/status:/usr/local/llvm13/bin:"$HOME"/.pyenv/bin:"$PATH"
diff --git a/.config/go2work/go2work.toml b/.config/go2work/go2work.toml
index d0ea976..0fecd1e 100644
--- a/.config/go2work/go2work.toml
+++ b/.config/go2work/go2work.toml
@@ -14,8 +14,8 @@ files = [
# '/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/2005_form_mars_to_sirius/02_backbone.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/alice_in_chains/1990_facelift/02_man_in_the_box.flac',
diff --git a/.config/lf/lfrc b/.config/lf/lfrc
index 19653c1..b121f04 100644
--- a/.config/lf/lfrc
+++ b/.config/lf/lfrc
@@ -14,11 +14,6 @@ set previewer '~/.config/lf/scope'
# cmds/functions
cmd open ${{
- if [ -n "$WAYLAND_DISPLAY" ]; then
- IMAGER=imv
- else
- IMAGER="nsxiv -aibo"
- fi
case $(file --mime-type "$(readlink -f $f)" -b) in
application/vnd.openxmlformats-officedocument.spreadsheetml.sheet) localc $fx ;;
application/vnd.openxmlformats-officedocument.wordprocessingml.document) docx2txt $f | $PAGER ;;
@@ -30,7 +25,7 @@ cmd open ${{
image/svg+xml) display -- $f ;;
image/*)
rotdir $f | grep -i "\.\(png\|jpg\|jpeg\|gif\|webp\|tif\|ico\)\(_large\)*$" |
- $IMAGER 2>/dev/null | while read -r file; do
+ imv 2>/dev/null | while read -r file; do
[ -z "$file" ] && continue
lf -remote "send select \"$file\""
lf -remote "send toggle"
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/pipe-viewer/pipe-viewer.conf b/.config/pipe-viewer/pipe-viewer.conf
index c656d8b..6c0d13f 100644
--- a/.config/pipe-viewer/pipe-viewer.conf
+++ b/.config/pipe-viewer/pipe-viewer.conf
@@ -1,6 +1,6 @@
-#!/usr/bin/perl -I/nix/store/3vq9qasxlqpyq1k95nq3s13g2m6w59ay-perl-5.40.0/lib/perl5/site_perl -I/nix/store/l02g9sqkb5625739p07v9a7c5r2q167c-perl5.40.0-Test-Pod-1.52/lib/perl5/site_perl -I/nix/store/ld4ajgzsdkyjh1bpnns8ymm0xrvzdzvy-perl-5.40.0-env/lib/perl5/site_perl -I/nix/store/jy6wvmgmddhh4d82ciq1r3dwgfcialll-perl5.40.0-Module-Build-0.4234/lib/perl5/site_perl -I/nix/store/39z485wv6fl420p04v9dxcf5fz7p64pi-perl5.40.0-pipe-viewer-0.5.3/lib/perl5/site_perl
+#!/usr/bin/perl -I/nix/store/gndky4p2sjhsh0zdlqs3dnyzyslccxha-perl-5.40.0/lib/perl5/site_perl -I/nix/store/v9p0424f6q65zmjq29lqdbr1bj917j9c-perl5.40.0-Test-Pod-1.52/lib/perl5/site_perl -I/nix/store/sfz5ykgb8dg7zb9d0yqf3kxiw3ld4gmv-perl-5.40.0-env/lib/perl5/site_perl -I/nix/store/v37hnszhgvq3c68p3knbhva2dmb3lwna-perl5.40.0-Gtk3-0.038/lib/perl5/site_perl -I/nix/store/mbm6vxxhsadm5b0c4bcl174f8c456n60-perl5.40.0-Cairo-GObject-1.005/lib/perl5/site_perl -I/nix/store/3qbxs296i5znxv9g8p3vr7z6xhpb5mc3-perl5.40.0-Cairo-1.109/lib/perl5/site_perl -I/nix/store/rrkcxg15312yiy9axx6qr5s7wi6djsk0-perl5.40.0-ExtUtils-Depends-0.8001/lib/perl5/site_perl -I/nix/store/3wq4i7l0fvqmkjqv74pz5lkdmwamc22d-perl5.40.0-ExtUtils-PkgConfig-1.16/lib/perl5/site_perl -I/nix/store/hs6y91z06r9j95k35j5y143cvkw718sz-perl5.40.0-Glib-1.3294/lib/perl5/site_perl -I/nix/store/2g298acj7fsnj9grc1h9sl1whmks7gjj-perl5.40.0-Glib-Object-Introspection-0.051/lib/perl5/site_perl -I/nix/store/cg11rf957k3h37h4inyqx4y5gq53nkyz-perl5.40.0-Module-Build-0.4234/lib/perl5/site_perl -I/nix/store/jx8cqiwd6j0163qmfvd1c56a1401y03a-perl5.40.0-pipe-viewer-0.5.4/lib/perl5/site_perl
-# CLI Pipe Viewer 0.5.3 - configuration file
+# CLI Pipe Viewer 0.5.4 - configuration file
use utf8;
@@ -48,6 +48,8 @@ our $CONFIG = {
date => undef,
debug => 0,
download_and_play => 0,
+ download_in_subdir => 0,
+ download_in_subdir_format => "*AUTHOR*",
download_with_wget => 0,
download_with_ytdl => 1,
downloads_dir => ".",
@@ -86,6 +88,7 @@ our $CONFIG = {
remove_played_file => 0,
resolution => "best",
saved_channels_file => "$ENV{HOME}/.config/pipe-viewer/users.txt",
+ set_mtime => 1,
show_video_info => 1,
skip_if_exists => 1,
skip_watched => 0,
diff --git a/.config/wayland/init.sh b/.config/wayland/init.sh
index d9231bc..62d90ed 100755
--- a/.config/wayland/init.sh
+++ b/.config/wayland/init.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+source "$HOME"/.config/env
+
case $(hostname -s) in
mother)
icon=" "
@@ -10,6 +12,7 @@ case $(hostname -s) in
host="mother"
doas mkdir /var/run/jozan && doas chown -v jozan: /var/run/jozan
wlr-randr --output DP-3 --off
+ setwp "$HOME"/pics/wp.png
;;
po-rbo)
icon=" "
@@ -19,6 +22,7 @@ case $(hostname -s) in
ping="ping -c1 -w1 9.9.9.9 >/dev/null 2>&1"
host="po-rbo"
doas mkdir /var/run/r_bousset && doas chown -v r_bousset: /var/run/r_bousset
+ setwp "$HOME"/pics/wp/liminal
;;
mars)
icon=" "
@@ -28,6 +32,7 @@ case $(hostname -s) in
ping="ping -c1 -t1 9.9.9.9 >/dev/null 2>&1"
host="mars"
doas mkdir /var/run/jozan && doas chown -v jozan: /var/run/jozan
+ setwp "$HOME"/pics/wp
;;
esac
@@ -37,13 +42,15 @@ startif() {
startif ydotoold
startif dunst
-startif swaybg --image pics/wp.png &
pgrep $mpd >/dev/null || $mpd >/dev/null 2>&1
startif pipewire
sleep 1
startif pipewire-pulse
sleep 1
startif wireplumber
+export QT_QPA_PLATFORM=xcb
startif copyq
-notify-send -u normal 'Welcome' "$icon Welcome back, partner!"
+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 2b73786..0519270 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.png
"$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 nixGL teams-for-linux
startif thunderbird
- startif firefox
+ # startif firefox
}
export LANG='en_US.UTF-8'
@@ -103,4 +103,4 @@ xrdb "$HOME"/.config/x11/xresources
start_apps &
notify-send -u normal 'Welcome' "$icon Welcome back, partner!"
-[ $host = "po-rbo" ] && exec dwm
+[ $host = "po-rbo" ] && exec dbus-run-session dwm
diff --git a/.local/bin/dmapps b/.local/bin/dmapps
index af0c26d..ccefc76 100755
--- a/.local/bin/dmapps
+++ b/.local/bin/dmapps
@@ -146,7 +146,11 @@ sub main
if (hostname() eq "po-rbo.ln.ysosecure.com") {
$prompt .= WORK_LIST;
}
- $action = `dmenu -i -l 100 -sb '$color' -shb '$color' <<LIST
+ my $menu = "dmenu -sb '$color' -shb '$color'";
+ if (defined $ENV{WAYLAND_DISPLAY}) {
+ $menu = "wmenu -S '$color'";
+ }
+ $action = `$menu -i -l 100 <<LIST
$prompt
LIST`;
if (not $action) {
diff --git a/.local/bin/dmlog b/.local/bin/dmlog
index d209ee5..7264d75 100755
--- a/.local/bin/dmlog
+++ b/.local/bin/dmlog
@@ -93,7 +93,7 @@ sub action
exec(LOGINCTL_PATH, 'suspend');
}
elsif (HOSTNAME eq 'po-rbo') {
- exec('systemctl', 'suspend');
+ exec('doas', 'systemctl', 'suspend');
}
exec(ACPI_PATH, '-s', '3');
}
@@ -112,7 +112,7 @@ sub action
exec(LOGINCTL_PATH, 'reboot');
}
elsif (HOSTNAME eq 'po-rbo') {
- exec('systemctl', 'reboot');
+ exec('doas', 'systemctl', 'reboot');
}
system(
NOTIF_PATH,
@@ -138,7 +138,7 @@ sub action
exec(LOGINCTL_PATH, 'poweroff');
}
elsif (HOSTNAME eq 'po-rbo') {
- exec('systemctl', 'poweroff');
+ exec('doas', 'systemctl', 'poweroff');
}
exec(SHUTDOWN_PATH, '-p', 'now');
}
diff --git a/.local/bin/dmpass b/.local/bin/dmpass
index affe65b..475b96e 100755
--- a/.local/bin/dmpass
+++ b/.local/bin/dmpass
@@ -35,9 +35,17 @@ p="$(pass show "$password")"
if [ $full -eq 1 ]; then
id=$(printf "%s" "$password" | sed 's/.*___//')
printf "%s\n" $id | { IFS= read -r pass; printf %s "$id"; } | $xdotool
- xdotool key Tab
+ if [ -n "$WAYLAND_DISPLAY" ]; then
+ ydotool key 15:1 15:0
+ else
+ xdotool key Tab
+ fi
printf "%s\n" "$p" | { IFS= read -r pass; printf %s "$pass"; } | $xdotool
- xdotool key Return
+ if [ -n "$WAYLAND_DISPLAY" ]; then
+ ydotool key 28:1 28:0
+ else
+ xdotool key Return
+ fi
exit
fi
diff --git a/.local/bin/dmrun b/.local/bin/dmrun
index f47c232..41c0e0e 100755
--- a/.local/bin/dmrun
+++ b/.local/bin/dmrun
@@ -11,7 +11,11 @@ sub main
if (@ARGV == 1) {
$color = $ARGV[0];
}
- return exec("dmenu_run -i -sb '$color' -shb '$color'");
+ my $menu = "dmenu_run -sb '$color' -shb '$color'";
+ if (defined $ENV{WAYLAND_DISPLAY}) {
+ $menu = "wmenu-run -S '$color'";
+ }
+ return exec("$menu -i");
}
main();
diff --git a/.local/bin/linkview b/.local/bin/linkview
index ec928a4..d276634 100755
--- a/.local/bin/linkview
+++ b/.local/bin/linkview
@@ -388,9 +388,15 @@ sub open_link
$pid = fork();
if (not $pid) {
setsid();
- capture {
- exec(COPYQ_PATH, "copy", $url);
- };
+ if (defined $ENV{WAYLAND_DISPLAY}) {
+ system("echo -n " . $url . " | wl-copy");
+ exit(0);
+ }
+ else {
+ capture {
+ exec(COPYQ_PATH, "copy", $url);
+ };
+ }
}
}
return;
diff --git a/.local/bin/setwp b/.local/bin/setwp
index e5fce65..5340138 100755
--- a/.local/bin/setwp
+++ b/.local/bin/setwp
@@ -5,6 +5,7 @@ use warnings;
use File::HomeDir qw(home);
use File::Copy;
use File::Find;
+use POSIX qw(setsid);
use constant {
WP_POOL => home() . '/pics/wp/'
@@ -37,20 +38,37 @@ sub choose_wp
sub set_wp
{
my ($wp) = @_;
+ my $pid;
+ my $old_pid;
return 1 if !(-r $wp) || !(-f $wp);
- system(
- FEH_PATH,
- '--no-fehbg',
- '--image-bg',
- '#1d2021',
- '--bg-fill',
- $wp,
- '--bg-fill',
- $wp,
- '--bg-fill',
- $wp
- );
+
+ if (defined $ENV{WAYLAND_DISPLAY}) {
+ $old_pid = `pidof swaybg`;
+ chomp $old_pid;
+ $pid = fork();
+ if (not $pid) {
+ setsid();
+ exec("swaybg", "--image", $wp);
+ } else {
+ sleep(1);
+ exec("kill", $old_pid);
+ }
+ }
+ else {
+ system(
+ FEH_PATH,
+ '--no-fehbg',
+ '--image-bg',
+ '#1d2021',
+ '--bg-fill',
+ $wp,
+ '--bg-fill',
+ $wp,
+ '--bg-fill',
+ $wp
+ );
+ }
return 0;
}
powered by cgit. Copyright (c) 2020-2023, Joe - this website does not use cookies or php or js