From a8e2190128f3dbba24792c01db6a88262c251e38 Mon Sep 17 00:00:00 2001 From: Alex Kelly Date: Fri, 14 Apr 2023 12:14:47 -0400 Subject: [PATCH 01/12] add 1password to startups --- autostart.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/autostart.conf b/autostart.conf index 79d06d1..75e5f27 100644 --- a/autostart.conf +++ b/autostart.conf @@ -42,7 +42,7 @@ exec --no-startup-id firefox # start the auto run .desktop files exec --no-startup-id dex-autostart --autostart --environment i3 -# Start redshift, becuase I like not being blinded at night +# Start redshift, because I like not being blinded at night exec --no-startup-id redshift # Start thunderbird, because I guess I'm doing that again @@ -53,3 +53,6 @@ exec --no-startup-id "i3-msg workspace $ws3" # Start spotify from the stupid flatpak exec --no-startup-id "/usr/bin/flatpak run --branch=stable --arch=x86_64 --command=spotify --file-forwarding com.spotify.Client" + +# Start 1password +exec --no-startup-id "/usr/bin/1password" From cd95d1083e1617bd9746b97faafb2681c2d44bed Mon Sep 17 00:00:00 2001 From: Alex Kelly Date: Fri, 14 Apr 2023 12:19:05 -0400 Subject: [PATCH 02/12] merge changed version into main --- autostart.conf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/autostart.conf b/autostart.conf index 75e5f27..927faad 100644 --- a/autostart.conf +++ b/autostart.conf @@ -3,7 +3,8 @@ exec --no-startup-id greenclip daemon #picom for compositing -exec_always --no-startup-id picom --backend glx --vsync +exec_always --no-startup-id /usr/bin/picom --backend glx --vsync --fade-exclude 'class_g = "xsecurelock"' +#exec_always --no-startup-id picom --backend glx --vsync --fade-exclude 'class_g = "xsecurelock"' #password keyring unlock exec --no-startup-id /home/kellya/projects/public/gnome-keyring-yubikey-unlock/unlock_keyrings.sh /home/kellya/gnome-secret @@ -14,6 +15,7 @@ exec --no-startup-id nm-applet # Set screen lock exec xset s 300 5 exec xss-lock -n /usr/libexec/xsecurelock/dimmer -l -- xsecurelock +#exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock -c 04090e --nofork # Load workspace configs exec --no-startup-id "i3-msg 'workspace $ws1; append_layout ~/.config/i3/layout/w1.json'" @@ -38,11 +40,12 @@ exec --no-startup-id firefox # since I'm using thunderbird now, let's pause the neomutt start # Create a kitty workspace for mail #exec --no-startup-id "kitty --name mail neomutt" +exec --no-startup-id "kitty" # start the auto run .desktop files exec --no-startup-id dex-autostart --autostart --environment i3 -# Start redshift, because I like not being blinded at night +# Start redshift, becuase I like not being blinded at night exec --no-startup-id redshift # Start thunderbird, because I guess I'm doing that again From 5e9fb90205336ded39998e9739ce7e900a47d888 Mon Sep 17 00:00:00 2001 From: Alex Kelly Date: Fri, 14 Apr 2023 12:20:21 -0400 Subject: [PATCH 03/12] add scratchpad bindings --- conf.d/key_bindings.conf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/conf.d/key_bindings.conf b/conf.d/key_bindings.conf index 931db64..4356d88 100644 --- a/conf.d/key_bindings.conf +++ b/conf.d/key_bindings.conf @@ -17,7 +17,7 @@ bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOU bindsym XF86AudioPause exec --no-startup-id mpc toggle #Bind media player buttons -bindsym XF86AudioPlay exec "~/bin/mediakeys.sh play-pause"; +bindsym XF86AudioPlay exec "~/bin/mediakeys.sh play-pause" bindsym XF86AudioStop exec "~/bin/mediakeys.sh stop"; bindsym XF86AudioPrev exec "~/bin/mediakeys.sh previous"; bindsym XF86AudioNext exec "~/bin/mediakeys.sh next"; @@ -93,3 +93,8 @@ bindsym $mod+Shift+7 move container to workspace number $ws7 bindsym $mod+Shift+8 move container to workspace number $ws8 bindsym $mod+Shift+9 move container to workspace number $ws9 bindsym $mod+Shift+0 move container to workspace number $ws10 + +# scratchpad +bindsym $mod+Shift+minus move scratchpad +bindsym $mod+minus scratchpad show +bindsym $mod+plus floating toggle From d037340532f6e457eee51c6243705b2a93127990 Mon Sep 17 00:00:00 2001 From: Alex Kelly Date: Fri, 14 Apr 2023 12:21:03 -0400 Subject: [PATCH 04/12] attempt to handle links directly opening the firefox workspace --- conf.d/window_rules.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf.d/window_rules.conf b/conf.d/window_rules.conf index 086a5c4..0b468cc 100644 --- a/conf.d/window_rules.conf +++ b/conf.d/window_rules.conf @@ -4,3 +4,6 @@ for_window [all] title_window_icon on for_window [all] title_window_icon padding 1px for_window [all] title_format "%class" for_window [class="gnome-calculator"] floating enable +for_window [urgent="latest" class="firefox" workspace=$ws1] focus ; workspace number $ws1 +for_window [class="pycharm"] workspace number $ws4 +for_window [urgent=latest] focus From 6ac622d20f9efc2be634b63a5bbf33549f30f4b0 Mon Sep 17 00:00:00 2001 From: Alex Kelly Date: Fri, 14 Apr 2023 12:22:13 -0400 Subject: [PATCH 05/12] add MS Teams BS to junk up my workspace --- layout/w2.json | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/layout/w2.json b/layout/w2.json index 226a841..c1570bd 100644 --- a/layout/w2.json +++ b/layout/w2.json @@ -26,42 +26,23 @@ ], "type": "con" }, + { - "border": "none", + "border": "normal", "current_border_width": 2, "floating": "auto_off", "geometry": { - "height": 1060, + "height": 1040, "width": 1916, "x": 2, "y": 18 }, "marks": [], - "name": "Microsoft Teams - $hit$how", + "name": "Teams", "percent": 0.25, "swallows": [ { - "class": "^Microsoft\\ Teams\\ \\-\\ Preview$" - } - ], - "type": "con" - }, - { - "border": "none", - "current_border_width": 2, - "floating": "auto_off", - "geometry": { - "height": 1060, - "width": 1916, - "x": 2, - "y": 18 - }, - "marks": [], - "name": "Microsoft Teams - $hit$how", - "percent": 0.25, - "swallows": [ - { - "class": "^Microsoft\\ Teams\\ \\-\\ Preview$" + "class": "^Microsoft-edge$" } ], "type": "con" From 5bfc4554a1aaacf7bab935560eabd291b9895d33 Mon Sep 17 00:00:00 2001 From: Alex Kelly Date: Tue, 18 Apr 2023 14:35:11 -0400 Subject: [PATCH 06/12] remove border from firefox --- conf.d/window_rules.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf.d/window_rules.conf b/conf.d/window_rules.conf index 0b468cc..4383604 100644 --- a/conf.d/window_rules.conf +++ b/conf.d/window_rules.conf @@ -7,3 +7,4 @@ for_window [class="gnome-calculator"] floating enable for_window [urgent="latest" class="firefox" workspace=$ws1] focus ; workspace number $ws1 for_window [class="pycharm"] workspace number $ws4 for_window [urgent=latest] focus +for_window [class="firefox"] border pixel 0 From ce0cb2432e1d5688d925eb8b131adf3f78d5a0b1 Mon Sep 17 00:00:00 2001 From: Alex Kelly Date: Wed, 10 May 2023 08:37:11 -0400 Subject: [PATCH 07/12] removed the yubikey/gnome key thing that wasn't working --- autostart.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autostart.conf b/autostart.conf index 927faad..8e4ff19 100644 --- a/autostart.conf +++ b/autostart.conf @@ -7,7 +7,7 @@ exec_always --no-startup-id /usr/bin/picom --backend glx --vsync --fade-exclude #exec_always --no-startup-id picom --backend glx --vsync --fade-exclude 'class_g = "xsecurelock"' #password keyring unlock -exec --no-startup-id /home/kellya/projects/public/gnome-keyring-yubikey-unlock/unlock_keyrings.sh /home/kellya/gnome-secret +#exec --no-startup-id /home/kellya/projects/public/gnome-keyring-yubikey-unlock/unlock_keyrings.sh /home/kellya/gnome-secret # start nm-applet for network tray icon exec --no-startup-id nm-applet From 3959183ff8a68fea4d9d394a13939bc44ae441ba Mon Sep 17 00:00:00 2001 From: Alex Kelly Date: Mon, 3 Jul 2023 10:12:42 -0400 Subject: [PATCH 08/12] add logseq to view --- layout/w6.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/layout/w6.json b/layout/w6.json index c5abcc9..c7c0eee 100644 --- a/layout/w6.json +++ b/layout/w6.json @@ -47,6 +47,26 @@ } ], "type": "con" + }, + { + "border": "normal", + "current_border_width": 2, + "floating": "auto_off", + "geometry": { + "height": 1040, + "width": 1916, + "x": 0, + "y": 18 + }, + "marks": [], + "name": "logseq", + "percent": 0.5, + "swallows": [ + { + "class": "^logseq$" + } + ], + "type": "con" } ] } From f6810505106771522c90744b24b8c1afd82b01d1 Mon Sep 17 00:00:00 2001 From: Alex Kelly Date: Mon, 3 Jul 2023 11:04:03 -0400 Subject: [PATCH 09/12] add logseq to autostart --- autostart.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/autostart.conf b/autostart.conf index 8e4ff19..19c78ec 100644 --- a/autostart.conf +++ b/autostart.conf @@ -37,6 +37,9 @@ exec --no-startup-id ~/bin/bg_rotate.sh # Always need firefox, so let's just start it exec --no-startup-id firefox +# Startup logseq +exec --no-startup-id /home/kellya/bin/logseq + # since I'm using thunderbird now, let's pause the neomutt start # Create a kitty workspace for mail #exec --no-startup-id "kitty --name mail neomutt" From 7b1c328dfe5bb31a59b6dccfbdae2302de65b515 Mon Sep 17 00:00:00 2001 From: Alex Kelly Date: Wed, 5 Jul 2023 13:49:44 -0400 Subject: [PATCH 10/12] update w6 with logseq from save instead of manual --- layout/w6.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/layout/w6.json b/layout/w6.json index c7c0eee..39bde64 100644 --- a/layout/w6.json +++ b/layout/w6.json @@ -1,6 +1,6 @@ // vim:ts=4:sw=4:et { - // tabbed split container with 2 children + // tabbed split container with 3 children "border": "normal", "floating": "auto_off", "layout": "tabbed", @@ -20,7 +20,7 @@ }, "marks": [], "name": "Joplin", - "percent": 0.5, + "percent": 0.333333333333333, "swallows": [ { "class": "^Joplin$" @@ -40,7 +40,7 @@ }, "marks": [], "name": "Inbox - kellya@arachnitech.com - Mozilla Thunderbird", - "percent": 0.5, + "percent": 0.333333333333333, "swallows": [ { "class": "^thunderbird$" @@ -53,17 +53,17 @@ "current_border_width": 2, "floating": "auto_off", "geometry": { - "height": 1040, - "width": 1916, + "height": 1035, + "width": 1920, "x": 0, - "y": 18 + "y": 22 }, "marks": [], - "name": "logseq", - "percent": 0.5, + "name": "Logseq", + "percent": 0.333333333333333, "swallows": [ { - "class": "^logseq$" + "class": "^Logseq$" } ], "type": "con" From 25aeb6afceaf1a8201bfcbcf280ed0ec49c393b5 Mon Sep 17 00:00:00 2001 From: Alex Kelly Date: Fri, 28 Jul 2023 22:13:20 -0400 Subject: [PATCH 11/12] change to teams-for-linux from shitty PWA --- layout/w2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layout/w2.json b/layout/w2.json index c1570bd..bb61419 100644 --- a/layout/w2.json +++ b/layout/w2.json @@ -42,7 +42,7 @@ "percent": 0.25, "swallows": [ { - "class": "^Microsoft-edge$" + "class": "^teams-for-linux$" } ], "type": "con" From dffc43f8aaac919631f8169f9338644c1912e5da Mon Sep 17 00:00:00 2001 From: Alex Kelly Date: Fri, 28 Jul 2023 22:21:16 -0400 Subject: [PATCH 12/12] retry with save instead of manually adding --- layout/w2.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/layout/w2.json b/layout/w2.json index bb61419..c0c5818 100644 --- a/layout/w2.json +++ b/layout/w2.json @@ -32,17 +32,17 @@ "current_border_width": 2, "floating": "auto_off", "geometry": { - "height": 1040, - "width": 1916, - "x": 2, - "y": 18 + "height": 1035, + "width": 1920, + "x": 0, + "y": 22 }, "marks": [], - "name": "Teams", - "percent": 0.25, + "name": "Calls | Microsoft Teams", + "percent": 0.5, "swallows": [ { - "class": "^teams-for-linux$" + "class": "^teams\\-for\\-linux$", } ], "type": "con"