Compare commits

...

352 Commits

Author SHA1 Message Date
39745885c2 Enable VFR at Hyprland 2025-08-20 16:15:25 -05:00
af79a7c09c Use less stepped-on env file location for proj 2025-08-19 17:45:48 -05:00
ade6aba195 Fix socket 2025-07-09 12:43:20 -05:00
b3777d53a9 Cleaning up some vim plugins 2025-06-29 16:19:32 -05:00
3782f0b76c Disable relative line numbering 2025-05-15 11:38:02 -05:00
4f67e2b9f7 Add memory limits to ollama 2025-05-15 11:37:39 -05:00
e48092d2ae Play with hyprland bounce animations 2025-02-27 02:05:38 -06:00
ee6cf018b7 Set a non-default split ratio for dwindle 2025-02-27 01:56:17 -06:00
84bdaa7bd0 Switch to swapwindow
This more closely mimicks bspwm
2025-02-27 01:48:32 -06:00
bd3063e370 Cleanup 2025-02-27 01:48:20 -06:00
c653114e2c Implement moving into that submap 2025-02-27 01:11:27 -06:00
4efd4c3625 Implement resize submap 2025-02-27 01:05:00 -06:00
90ef8c3271 Set ft to hyprlang in hyprland dots (oops) 2025-02-13 14:24:36 -06:00
926510a96c Re-add moving windows with alt+click 2025-02-13 13:07:56 -06:00
4510be46e7 Use $mainMod when binding hyprexpo 2025-02-13 13:07:41 -06:00
2e538f2a6b Alter window rules 2025-02-09 14:22:02 -06:00
1f9c670dce Rework monitors on dsk-ryzen-1 2025-02-09 14:16:16 -06:00
b26a5435e7 Add module for staged rpm-ostree deployments 2025-02-08 23:31:38 -06:00
13015b5bcb Switch to Feishin, not Spotify 2025-02-07 21:32:23 -06:00
ce15981965 Update .bin 2025-02-07 21:23:20 -06:00
0a64734884 Add plugin conf for hyprexpo 2025-02-04 21:59:30 -06:00
80027dc5bf Replace note with a shell alias to do the note instead 2025-02-04 21:56:12 -06:00
fb488350aa Notate that alias 2025-02-04 21:50:36 -06:00
ffdfbf8220 Add hyprpm toolbox alias 2025-02-04 21:48:38 -06:00
e877892276 Different icon for plugged-in batteries 2025-02-01 03:45:24 -06:00
5445e6de4d Faster battery polling in waybar 2025-02-01 03:41:33 -06:00
f7b3c7728f Remove outdated overview section in README 2025-01-27 05:46:19 -06:00
975f17d1a0 Remove old themes 2025-01-27 05:41:08 -06:00
cd6b8ea9f0 Remove weird scratchpad keybinds 2025-01-24 01:42:04 -06:00
26168e2808 Minor polishing for foot 2025-01-22 01:37:08 -06:00
df4fedf23f Use foot instead of kitty
Yeah really not liking it tbh
2025-01-22 01:33:04 -06:00
8880fde097 Revert "Remove defunct foot config"
This reverts commit a0a38f776d.
2025-01-22 01:30:07 -06:00
770328c432 Add quick script to set the remote to gitea 2025-01-21 02:31:29 -06:00
e362d48c76 Update terraform vim module 2025-01-21 01:07:50 -06:00
d08697c431 Change behavior for opening an app behind a fullscreen one, comment 2025-01-21 01:07:05 -06:00
40bfa59169 Fix some indentation 2025-01-21 01:01:56 -06:00
8e0a3f938b Update .bin 2025-01-16 02:00:49 -06:00
3eb55227d9 Lock on sleep 2025-01-12 05:02:02 -06:00
937e18a6a6 Add brightness controls to hyprland 2025-01-12 03:07:11 -06:00
5705506f4a Launch steam in silent mode 2025-01-11 04:26:53 -06:00
Salt
f3f9d8d634 Add lemp13 config 2025-01-10 18:05:59 -05:00
Jacob Babor
b807c961e5 Update submodules 2025-01-10 16:18:59 -06:00
a130a2600d Update .bin 2025-01-10 14:46:39 -06:00
8e093d3d6b Launch Steam at startup 2025-01-06 02:18:20 -06:00
dceaaf7455 Reenable resizing with mouse
haha oops
2025-01-03 00:03:24 -06:00
b1d83cb9c0 Disable clicky binds 2025-01-01 22:26:26 -06:00
195d36e1c5 Lower time threshold for auto-trashing 2024-12-29 12:08:27 -06:00
83ec5f1ec2 Sort out SuperTurtleIdle backups 2024-12-23 12:21:23 -06:00
d08967c511 Add rule for Steam 2024-12-19 13:52:17 -06:00
Jacob Babor
445d898611 Set focus follows mouse for kitty 2024-12-18 19:53:08 -06:00
Jacob Babor
eb94273ba6 Add broadcaster 2024-12-18 19:22:14 -06:00
Jacob Babor
999e88a03d Remove firestarter from basic desktop stuff 2024-11-27 16:44:54 -06:00
Jacob Babor
9106503ffa Rip out firestarter 2024-11-27 16:39:34 -06:00
Jacob Babor
24a40d2865 Add RDP cleanup to autocategorize 2024-11-27 16:38:55 -06:00
Jacob Babor
319d7c5d49 Autostart OBS 2024-11-13 15:12:51 -06:00
c8cb8c1bcd Fix window rules for pavu on nonwork 2024-11-07 22:45:13 -06:00
Jacob Babor
f4a672b833 Fix a bunch of zoom rules 2024-11-07 22:44:36 -06:00
79034b7ffc Fix swww-daemon forking in multiuser setups 2024-11-06 21:49:47 -06:00
Jacob Babor
87eef60701 Adwaita light because I'm a sociopath 2024-11-05 20:57:14 -06:00
Jacob Babor
c661155c2e Update submodules 2024-11-05 20:51:08 -06:00
Jacob Babor
0845419583 Add Hyprland work config 2024-11-05 20:50:29 -06:00
55efdb4a21 Auto set up remote for git
I finally did the thing
2024-10-27 14:18:03 -05:00
6586a6b450 Tweak some dwindle settings 2024-10-27 13:31:20 -05:00
8cdf4ab033 Prevent multiple hyprlocks 2024-10-26 14:37:09 -05:00
4dea7b99af Darken the update indicator -- it doesn't need that much attention 2024-10-21 12:42:13 -05:00
53617395a9 Set kitty to act like a default xterm-256color
Because so many of my hosts have no clue what the fuck an xterm-kitty is
2024-10-21 12:41:48 -05:00
6c17a0171b Add custom flatpak update module to waybar 2024-10-20 19:32:30 -05:00
1cb07b84c1 Update date more frequently
Yeah, I'm okay with it being wrong for 30 seconds but not 24 hours
2024-10-19 02:31:01 -05:00
e2207863e7 Darken lock screen even more 2024-10-19 02:30:04 -05:00
3bd62f1815 Trim the fug outta kitty 2024-10-18 19:41:04 -05:00
eb4b119b9f Disable confirming closure of windows running programs in kitty 2024-10-18 17:45:36 -05:00
45b93322df Rice hyprlock 2024-10-18 17:44:07 -05:00
c534f35bce Swap to hypridle 2024-10-18 17:16:27 -05:00
4303c84073 Add dysfunctional hypr configs 2024-10-18 17:14:29 -05:00
1b20fb90e9 Remove sway stuff from hyprland 2024-10-18 17:14:20 -05:00
a0a38f776d Remove defunct foot config 2024-10-18 17:07:06 -05:00
6fdf1a9ce3 Update hyprland config 2024-10-18 17:03:45 -05:00
657afe2418 Use kitty --single-instance with some extra flags 2024-10-18 16:56:38 -05:00
1ae6991331 Disable Kitty update checks 2024-10-18 16:51:05 -05:00
f00d347d4c Use Kitty instead of Foot 2024-10-18 16:49:02 -05:00
c29981ac7a Fix spotify rules 2024-10-15 11:27:00 -05:00
e3bba0cdea Bring back spotify 2024-10-12 00:32:03 -05:00
07c370ce48 Fix not starting swww-daemon 2024-09-24 10:17:56 -05:00
f81ba8a211 Fix shit 2024-09-20 19:36:24 -05:00
767d05aae9 Quote more vars 2024-09-20 19:20:15 -05:00
2d827a24dc Add post script 2024-09-20 19:19:32 -05:00
a57acea205 Add more intelligent swww-daemon startup 2024-09-20 19:12:19 -05:00
8d8e9ceabc Maybe hopefully fix keyring stuff 2024-09-17 02:29:34 -05:00
1d22a2aba1 Work through more window rules 2024-09-17 02:17:00 -05:00
ba98f5cdf2 Add indicator for maximized workspaces 2024-09-17 01:43:43 -05:00
4ae3c91d83 Make active workspaces on other monitors a different color again 2024-09-17 01:39:54 -05:00
76bb8e1aa3 Add window name display to waybar 2024-09-17 01:39:06 -05:00
3755c324fd Add LD_LIBRARY_PATH to ollama service 2024-09-14 13:31:38 -05:00
bf0bf38370 Update autocategorize 2024-09-14 13:31:30 -05:00
304c1868a1 Add debug log conf for hyperland 2024-09-04 00:52:44 -05:00
c6825ff197 Hide wofi scrollbar too 2024-08-30 01:31:47 -05:00
49d50e3507 Disable actions for wofi 2024-08-30 01:23:16 -05:00
2dc3516653 Put 11th workspace on laptop 2024-08-30 01:20:05 -05:00
97e1a4d4c3 More visibility 2024-08-29 22:34:58 -05:00
681ec430b9 The fabled 11th workspace 2024-08-29 22:34:54 -05:00
c4cd0b945f Tweak colors a bit 2024-08-29 20:26:37 -05:00
5fc2e1d18a Add laptop config 2024-08-29 18:02:59 -05:00
4d4c002ff4 Add contrib readme 2024-08-29 17:59:52 -05:00
65b2aadd23 Theme Dunst a bit more 2024-08-29 17:49:06 -05:00
c349feea51 Compact muted indicator 2024-08-29 17:49:01 -05:00
696a5146de Transparent vim bg finally 2024-08-29 17:39:11 -05:00
31936cc008 Remove drop-shadow from hyprland 2024-08-29 14:14:46 -05:00
292c6da3ae ...Fix waybar? 2024-08-29 14:12:42 -05:00
8f90389691 Theme the shit out of wofi 2024-08-29 14:06:04 -05:00
38b9a1a487 Basic wofi stuff 2024-08-29 01:30:11 -05:00
f7f3c1fa98 I am going way deep down the rice rabbit hole 2024-08-29 01:24:29 -05:00
b4f9f5d81f Make mute a lot easier to see 2024-08-29 01:22:04 -05:00
f3e4edc09b Add swww-daemon to exec stuff 2024-08-29 01:15:27 -05:00
35737cd238 RICE RICE RICE RICE RICE RICE 2024-08-29 00:26:32 -05:00
93d8f5be12 Fix gaps 2024-08-29 00:07:39 -05:00
353d3897e6 Fix up waybar audio 2024-08-28 23:51:00 -05:00
8c7fc1a387 Add keybinds for locking, fix wofi doubling up 2024-08-28 23:45:19 -05:00
a1a5a4e2f5 Add polkitd 2024-08-28 23:42:20 -05:00
24759eceee Add swayidle 2024-08-28 23:42:16 -05:00
0e9e4e98a6 Move wlsunset into daemons file 2024-08-28 02:49:08 -05:00
4dccafbead Disable blur (we don't really need it and it drains bat) 2024-08-28 02:46:54 -05:00
61296c3cd4 Maybe fix some window rules, change workspace swipe behavior 2024-08-28 02:45:56 -05:00
bb7c661fc2 Don't scale xwayland apps 2024-08-28 02:38:00 -05:00
5a41e9701d Holy shit we're adding so much hyprland 2024-08-28 02:34:50 -05:00
09b3c2b43f We workin on more hyprland 2024-08-27 19:12:27 -05:00
df88af735d Working on hyprland stuff 2024-08-27 18:32:33 -05:00
9783051217 Duplicate sericea configs into hyprland 2024-08-27 13:39:37 -05:00
11beb9b182 Also disable adaptive sync????? 2024-08-24 19:30:59 -05:00
4ed2003a96 Reenable noscanout to see if it fixes a sway bug I'm hitting 2024-08-24 18:25:51 -05:00
7f33f6ca70 Make exif-strip a lot nicer 2024-08-22 00:35:04 -05:00
7fbc41cbd1 Add alias for realtime process showing 2024-08-20 09:52:34 -05:00
ed1af0ea75 Revert "Update desktop wallpape"
This reverts commit 825aeae1d4.
2024-08-19 20:50:33 -05:00
825aeae1d4 Update desktop wallpape 2024-08-16 23:10:18 -05:00
0f6775753c Disable noscanout for sway 2024-08-12 23:10:49 -05:00
ea7304a653 Add Docker-Podman alias 2024-08-06 21:57:33 -05:00
91f4feae1c Have ollama listen on all ifs 2024-08-01 16:26:52 -05:00
aa7e9f75da Update laptop wp 2024-08-01 15:51:20 -05:00
556448c8f7 Update dsk wp 2024-08-01 15:51:06 -05:00
0f1a5cc8b4 Add EDF 6 rule 2024-07-28 22:25:31 -05:00
43eed9be2e Modify colors on waybar to make visible but unfocused workspaces clearer 2024-07-27 23:31:22 -05:00
8307ea7ed7 Polish the fuck out of those bars 2024-07-27 23:15:29 -05:00
202a370558 Fix incorrect settings for temperature module 2024-07-23 03:49:27 -05:00
9a8739057c Add nuclear to app rules 2024-07-21 02:16:35 -05:00
b14526d70b Move temperature 2024-07-20 13:36:27 -05:00
55ed9a1bb6 Clean up the bar a bit more 2024-07-20 13:35:21 -05:00
272cb0af2c Simplify some waybar modules 2024-07-20 13:32:21 -05:00
51ecf7e199 Add temperature monitor 2024-07-20 13:23:27 -05:00
43ca837317 Make idle inhibitor just white when active
It's not necessarily a failure, after all
2024-07-15 18:45:14 -05:00
6118d3295c Reorder notifiers in waybar 2024-07-10 21:47:19 -05:00
2c12518d07 Update ALE 2024-07-07 11:02:43 -05:00
b5c1b2ed07 Fix up some window rules 2024-07-05 22:43:00 -05:00
1a7814c84e Add sdwebui service 2024-06-30 03:49:14 -05:00
c8dd400543 Add sillytavern service 2024-06-30 00:35:28 -05:00
ef02f6e3b8 Add services for llama stuff 2024-06-28 11:30:25 -05:00
71dd9ad849 Add 11th workspace to waybar 2024-06-25 22:18:35 -05:00
7426c4211a Add 11th workspace 2024-06-25 22:18:07 -05:00
f2745f024d Disable steam rules 2024-06-09 11:14:58 -05:00
c296f4136a Add network disconnection thing, move network to left of bottom bar 2024-06-07 11:43:05 -05:00
0ebebaad1a Update window rules more 2024-06-07 00:28:19 -05:00
a9568985fb Update window rules 2024-06-07 00:24:38 -05:00
58f2f6ad45 Update submodules 2024-06-07 00:04:50 -05:00
efd5937768 Show swap percentage in memory module as subtext 2024-06-01 16:14:30 -05:00
964dfaab31 Revert "Add swap space to bar"
This reverts commit dbb6352564.
2024-06-01 16:07:08 -05:00
dbb6352564 Add swap space to bar 2024-06-01 15:48:45 -05:00
215491a175 Fix battery color being completely wrong 2024-05-18 15:46:53 -05:00
b988e899b1 Give toolbox PS1s the name of their container
TY Fedora Magazine! https://fedoramagazine.org/alternative-way-of-saving-toolboxes-for-later-use/
2024-05-17 10:47:05 -05:00
8a9d9b4a8e Add vesktop to rules 2024-05-15 10:26:15 -05:00
a8bf27be01 Disable direct scanout 2024-05-10 21:39:48 -05:00
c75e1a6326 update refresh rate 2024-05-10 21:27:55 -05:00
316be04712 Add flatpak dump timer 2024-05-04 20:35:06 -05:00
d74f91cefa Disable StrictHostKeyChecking 2024-05-03 21:59:40 -05:00
91d2601344 Reenable some sway keybinds 2024-05-03 22:06:58 -05:00
0250e8a666 Add waybar module to check for failed backups 2024-05-03 18:45:52 -05:00
07ace6160d Modify theme meta 2024-05-03 13:38:36 -05:00
4e50d19f40 Add vesktop theme 2024-05-03 13:36:37 -05:00
c43b42ab18 Unify colors more 2024-04-30 10:42:41 -05:00
3468abeb5d Move battery to left side of bar 2024-04-30 10:42:29 -05:00
3d9d9f9fe8 Make a regular-ass battery white instead of green 2024-04-30 10:41:14 -05:00
2c37f60dd0 Fix battery colors 2024-04-30 10:38:01 -05:00
6bbec1f422 Update submodules 2024-04-27 18:08:55 -05:00
9b13f99bb5 Unify waybar a bit 2024-04-27 12:21:48 -05:00
9b040f5337 Add CPU and Memory to waybar 2024-04-26 23:26:48 -05:00
143f48996a Move clock to corner 2024-04-26 14:00:30 -05:00
87f3b0b1db Fix waybar lengths 2024-04-26 12:00:56 -05:00
51e4e345e2 Double bar power 2024-04-26 11:41:19 -05:00
941b07bc3e Don't stow swap files gdi 2024-04-26 10:46:50 -05:00
13a662b060 Turn foot font into something that hurts my eyes less 2024-04-23 21:25:51 -05:00
6ee3b04bcf Revamp pulseaudio module 2024-04-23 21:16:16 -05:00
df58feb9c9 Stylize hover effect on waybar workspaces 2024-04-23 20:50:06 -05:00
44c90d4e63 Rerice the things 2024-04-23 20:14:46 -05:00
e096dfe038 Consolidate monitors on dsk-ryzen-1 2024-04-21 18:38:59 -05:00
1822f7cd83 Simplify the shit out of swayidle 2024-04-18 15:04:55 -05:00
9f807854fa Black lockscreen instead of wp one 2024-04-18 15:02:39 -05:00
bec07d6fea Fully modularize sway configs 2024-04-17 01:35:18 -05:00
6494402d57 Modularize sway configs 2024-04-17 01:27:21 -05:00
7f756565a0 Add wlsunset 2024-04-17 01:12:31 -05:00
c5a8fa7f50 Remove deprecated resource 2024-04-16 10:30:13 -05:00
1b9d8264d5 Add screenshot hotkey, rework pavu hotkey 2024-04-13 16:41:17 -05:00
2ec7591a65 Add template machine file for swaywm 2024-04-13 16:31:24 -05:00
1c88a04ee3 More configuration 2024-04-13 16:31:16 -05:00
94189aa4b1 Add a bunch of new stuff 2024-04-13 13:38:46 -05:00
f249325f06 Disable dwt 2024-04-13 13:13:03 -05:00
2c0c7682d4 Update volume icons 2024-03-23 14:43:01 -05:00
7215925ea8 Update ALE 2024-03-23 14:35:59 -05:00
b426ccc2c8 Update submodules 2024-03-06 22:30:07 -06:00
7c73bef79a Update sway config for mouse 2024-03-06 22:30:03 -06:00
57445fae63 Export generic terminfo for foot 2024-02-22 19:13:12 -06:00
494fade73a Make network indicator less obtrusive and more readable 2024-02-17 00:35:23 -06:00
350249a6f6 Update waybar with traffic monitoring 2024-02-17 00:21:52 -06:00
9ae5d2ca36 Butt workspaces up against the edge too 2024-02-15 03:51:25 -06:00
4850134136 Move clickables to the end of the bar 2024-02-15 03:50:31 -06:00
188486ff0c Manipulate waybar a bit more to reach parity with my old polybar setup 2024-02-15 03:48:54 -06:00
737dd52eaf Revise window rules to fit new updated flatpaks 2024-02-15 03:29:07 -06:00
d2a965a972 Tighten dunst config, add progress bar support 2024-02-15 03:20:51 -06:00
9e1482604f Rename sway desktop to represent how fedora-specific it is 2024-02-15 03:04:59 -06:00
583fb23d61 Add titlebar border thickness matching that of windows 2024-02-15 03:01:20 -06:00
f21cca3252 Remove old i3-settree from sway cfg 2024-02-15 02:56:25 -06:00
88997abede Reorg the shit out of sway colors 2024-02-15 02:53:59 -06:00
cc70578be2 Remove extraneous restart cmd in sway cfg 2024-02-15 02:41:44 -06:00
44ae7b5736 Minor cleanup in sway cfg 2024-02-15 02:37:44 -06:00
6d86feaa76 Add machine-specific configs to sway 2024-02-15 02:35:09 -06:00
fe8e4cff89 Minimalize mpris widget 2024-02-15 02:24:02 -06:00
8746f3f737 Move idle_inhibitor a space to the right
This way the variable-width widget is leftmost
2024-02-15 02:20:04 -06:00
ba197b44e5 Move inhibitor to the right 2024-02-15 02:19:28 -06:00
5c4a03900d Add mpris (media player) widget to waybar 2024-02-15 02:17:45 -06:00
5ec82e75a2 Add idle inhibitor to waybar 2024-02-15 01:54:38 -06:00
fd8a8dc5d9 Fix mode hint not using gruvbox 2024-02-15 01:45:55 -06:00
36ae2c53d4 Add persistent workspaces to waybar, style urgent ones 2024-02-15 01:44:51 -06:00
796e1a717b Get rid of comments in waybar 2024-02-15 01:36:10 -06:00
6b6239c318 Dunst minor reorg 2024-02-15 01:28:17 -06:00
9a5bb99d61 Add modeline 2024-02-15 01:26:52 -06:00
5864c9d46f Clean the hell outta the dunst config 2024-02-15 01:24:30 -06:00
5ff46e0232 Make rofi a bit more dense 2024-02-15 01:09:13 -06:00
f280c76297 Do the same for element 2024-02-14 23:20:49 -06:00
d42fc38e87 Inhibit discord idle while visible 2024-02-14 23:20:32 -06:00
0eb776fd3a Override autolocker 2024-02-14 23:17:22 -06:00
60e2c6f0b4 Update configuration for input devices 2024-02-13 21:27:39 -06:00
c895e17283 Update waybar a bit 2024-02-13 20:02:16 -06:00
aced90f23b Add swaylock config 2024-02-12 19:22:46 -06:00
530b93e802 Add dunst configs 2024-02-12 19:18:31 -06:00
5c8368cab4 Add element window rule 2024-02-12 19:01:18 -06:00
5caa7ee34e Add window rules to sway 2024-02-12 19:00:10 -06:00
129bb880c3 Disable some portions that fedora enables automagically 2024-02-12 18:50:11 -06:00
57e518188f More sway stuff 2024-02-12 18:47:42 -06:00
f73916a221 Add waybar to swaywm config 2024-02-12 18:37:09 -06:00
f3262a344f Update submodules 2024-02-12 18:34:35 -06:00
211c5e8bce Update sway configs 2024-02-12 18:34:26 -06:00
0bc302721c Flatten rofi 2024-02-12 17:58:05 -06:00
330fc4f818 Update autocategorize 2024-01-18 20:06:58 -06:00
6e68d085fe Add exif stripping service 2023-11-16 10:43:18 -06:00
c4c00a8701 Add autocategorize service 2023-06-15 15:31:12 -05:00
0c5d0a80b5 Update ale 2023-06-15 14:56:00 -05:00
4bf2a9bffc Update all the things 2023-06-04 20:00:49 -05:00
b35223e41f Set default branch to master 2022-12-02 11:04:18 -06:00
969fb15988 Minor reconfig to actually bootstrap homebrew jfc 2022-11-28 16:04:28 -06:00
5a5eb83345 Syntax fix 2022-11-28 15:59:36 -06:00
330274bbc0 Minor compat patch for MacOS systems 2022-11-28 15:59:04 -06:00
51bf4161b2 Add some brew compat (possibly?) 2022-11-28 15:57:31 -06:00
bb63236125 Update submodules 2022-11-25 13:14:14 -06:00
13255c5e74 Add prefix to prompt when we're in a toolbox
Hooray more functionality!
Hooray kinoite/silverblue!
2022-08-28 01:31:45 -05:00
fd5b3bf7ea Update submodules 2022-08-27 20:01:43 -05:00
5a1a08c11e Add default.target.wants to gitignore
WE DONT CARE
2022-08-20 16:30:34 -05:00
98c4e79442 Rework .bash template
The config file functionality was something I never used, and for good reason
Best get rid of it
2022-06-06 23:54:22 -05:00
cbd575b7b1 Trim the fat from .profile
Still have so much to do though
2022-06-06 23:50:11 -05:00
9211b18f23 Update a bunch of Vim plugins 2022-06-06 23:45:11 -05:00
710056840e Remove mineclone2 submodule, replace with a suggestion README 2022-06-06 23:44:35 -05:00
a381f1fb6d Make all Vim templates use my new email 2022-04-27 17:19:42 -05:00
e13a5a4b88 Just use /etc/hostname all the time, please 2022-04-15 22:10:00 -05:00
606a31c422 Rewrite rofi config to support the version in 22.04 2022-04-15 22:07:10 -05:00
12b0ca4d52 Update submodules 2022-04-13 18:53:48 -05:00
ae733d53b3 Modify our hostname get in the Bash PS1 to work on systems without hostname installed
Might just switch to that permanently tbh; it's nicer and quicker
2022-04-13 18:53:44 -05:00
149c957d37 Reconfigure git.user
It's about time I stopped associating everything with that throwaway email address
2022-03-19 12:18:37 -05:00
2863ec45b4 Ignore .netrwhist for vim 2022-03-19 12:16:46 -05:00
7cdb0d708f Rebase 2022-01-29 08:41:18 -06:00
c552d62cad Center date? Center date. 2022-01-27 08:03:24 -06:00
315d3510fb Minor polish to Sway
But I still hate libinput and this touchpad, ugh
2022-01-26 15:58:19 -06:00
b0b6047f06 Slight cosmetic adjustments to swaywm 2022-01-26 15:46:30 -06:00
8b1ae5722d Update README 2022-01-26 15:42:35 -06:00
318923dcd5 Add a script to make some template directories for me 2022-01-26 15:41:37 -06:00
b01f43751a Make Polybar a bit more energy-efficient 2022-01-24 11:12:04 -06:00
561ec9d4eb Adapt Dunst to this new theme 2022-01-23 14:05:49 -06:00
2414251e1f Modify my rice for better compatibility on my new high-res monitor
like fug, my eyes are hurty
2022-01-23 13:18:45 -06:00
fbc2f92c9d Add some Vim configuration for Jenkinsfiles 2022-01-22 15:19:20 -06:00
92b2a7dd3f Update sxhkd to use the KDE screen locker direct
Required change for 21.10
2022-01-21 21:43:01 -06:00
de417b51e8 Remove numlock warning indicator 2022-01-21 21:42:27 -06:00
6b73f3b1dd Add compatibility for Framework laptop 2022-01-21 17:22:14 -06:00
8a5ed3e32f Update plugins 2022-01-21 17:06:08 -06:00
261edaa1c2 Add vim-terraform 2021-08-01 19:37:23 -05:00
c396e838ca Add Terraform autocomplete 2021-08-01 19:34:05 -05:00
ccbfdf3ec0 Update submodules 2021-07-19 14:49:22 -05:00
ca29690fd3 Make aliases for BSD congruent with GNU 2021-07-11 14:12:54 -05:00
baf172aa78 Fix bug with .profile and assigning BSD ls flags 2021-07-11 14:07:11 -05:00
6775a187c4 Add a rule for modloader64 2021-07-01 22:59:58 -05:00
2847694671 Update submodules 2021-06-30 23:34:23 -05:00
1d13fb73ed Remove dsk-ryzen from the .xinitrc
Its monitor changes will be done in a firestarterrc
2021-06-30 23:33:50 -05:00
41f60a8070 Update submodules 2021-06-21 13:40:49 -05:00
1aad56b213 Update submodules 2021-05-21 12:00:52 -05:00
f4e0a53eff Update .bin 2021-05-08 17:01:29 -05:00
aab8931831 Update submodules 2021-05-04 12:16:04 -05:00
6d3f874d0f Polish Polybar up, re-adding the spacing at the edges and adding a new keylock indicator 2021-05-04 12:15:19 -05:00
a10b25428d Put a pulse widget on secondary bars 2021-05-04 01:06:18 -05:00
49df19fd11 Update mineclone2 2021-04-28 12:41:55 -05:00
a9fd4a6853 Update submodules 2021-04-20 11:22:26 -05:00
6caafb0ef3 Update plugins 2021-04-19 14:25:27 -05:00
3d639da78b Update plugins 2021-04-12 17:52:08 -05:00
220da453ed Add indicators for bspwm 2021-04-12 17:51:37 -05:00
280791dc43 Update plugins 2021-04-09 14:52:02 -05:00
cbb3361de7 Have polybar render out the exact percentage of the battery remaining 2021-03-29 15:16:08 -05:00
cd99422f49 Update submodules 2021-03-29 15:14:26 -05:00
583fbcd694 Update submodules 2021-03-17 10:24:29 -05:00
79a235fd4c Add kubectl alias 2021-03-17 10:24:25 -05:00
eb58893b48 Fix not having a function in bash template 2021-03-06 05:37:02 -06:00
3594b1c2a2 Update submodules 2021-03-06 05:11:31 -06:00
1d6dab2107 Add automatic kubectl completion 2021-03-01 14:53:19 -06:00
10b8ddb1f2 Update .bin 2021-02-28 01:25:06 -06:00
5f9dd857be Update .bin 2021-02-28 01:23:45 -06:00
8eb42d45a4 Update MineClone2 2021-02-28 01:14:36 -06:00
9420d1d578 Update scripts 2021-02-28 01:12:44 -06:00
6dc61b9758 Update submodules 2021-02-26 11:51:30 -06:00
906ba74538 Edit keybind to kill compositor 2021-02-16 07:16:17 -06:00
e9e6e5e3f0 GOD FUCKING DAMMIT 2021-02-16 06:58:48 -06:00
2a13cbb92f Rename BSPWM rule section to obey desktops 2021-02-16 06:20:42 -06:00
0733f165ee Update submodules, rewrite small portion of xinitrc for desktop 2021-02-16 06:07:06 -06:00
df195ce40e Make yaml less ass 2021-02-15 12:08:38 -06:00
6c68f369ce Make some tweaks to profile and functions 2021-02-15 10:24:57 -06:00
16448e5d8d Update ALE, MineClone2 2021-02-11 10:53:55 -06:00
06d82f1f61 TODO 2021-02-10 19:38:37 -06:00
eb383a3365 Add sway and waybar configs 2021-02-05 09:09:36 -06:00
bc68f48e82 Remove deploy-all
Now that's just asking for trouble
2021-02-04 22:31:23 -06:00
38947e2468 Rework directory structure to more accurately reflect what the "work" package did 2021-02-04 22:29:15 -06:00
1d15c38369 Move .xinitrc to the rice itself 2021-02-04 22:26:29 -06:00
efd62518d3 Move themes to their own package 2021-02-04 22:17:10 -06:00
3c43b8bcfd Remove lesser-used aliases 2021-02-03 01:22:50 -06:00
814166d27f Bluify our Plasma colorscheme 2021-02-02 13:47:15 -06:00
ec3bc04782 Fix echoing instead of logging when done stowing package 2021-01-28 23:47:54 -06:00
b9ff1ce0a6 Update ALE, MineClone 2 2021-01-28 23:46:31 -06:00
03293faf89 Fix bugs in bootleg stow, such as not copying symlinks and empty directory removal not working 2021-01-28 23:45:17 -06:00
2c4341e5e8 Update README 2021-01-27 02:21:04 -06:00
2fb59d407e Add a bootleg stow utility 2021-01-27 02:20:08 -06:00
779b8c6c9d Tweak CRT config 2021-01-23 21:04:35 -06:00
679364ee20 Add cool retro term config 2021-01-23 20:59:38 -06:00
1ed328d882 Update README clone instructions 2021-01-19 03:30:47 -06:00
916382b5dc Add work dots 2021-01-19 03:17:45 -06:00
149caa6cc9 Update systemd unit for dotfile fetching 2021-01-19 02:40:09 -06:00
93bd41c157 Move Firestarter into different config buckets as well 2021-01-19 02:36:49 -06:00
b22eb9b2eb Move bin into base 2021-01-19 02:32:01 -06:00
9df7fbc0ba Move Vim configuration into base 2021-01-19 02:29:22 -06:00
006aa36b1c Remove "dot" alias
Kinda don't need that anymore
2021-01-19 02:19:47 -06:00
f371c43557 Add a deploy-all script 2021-01-19 02:19:05 -06:00
967ffe1310 Add a script for updating submodules, make README nicer 2021-01-19 02:16:17 -06:00
deb6ad1c87 Move Mac configs over
HA
2021-01-19 02:00:56 -06:00
9554034956 Revert "Add backup configuration"
This reverts commit 0b54cabfe4.
2021-01-19 01:56:33 -06:00
62932 changed files with 5521 additions and 369691 deletions

2
.gitignore vendored
View File

@@ -1 +1,3 @@
*.swp *.swp
.netrwhist
*/.config/systemd/user/default.target.wants/

41
.gitmodules vendored
View File

@@ -1,45 +1,48 @@
[submodule "vim/.vim/pathogen"] [submodule "vim/.vim/pathogen"]
path = vim/.vim/pathogen path = base/.vim/pathogen
url = https://github.com/tpope/vim-pathogen url = https://github.com/tpope/vim-pathogen
[submodule "vim/.vim/bundle/vim-closetag"] [submodule "vim/.vim/bundle/vim-closetag"]
path = vim/.vim/bundle/vim-closetag path = base/.vim/bundle/vim-closetag
url = https://github.com/alvan/vim-closetag.git url = https://github.com/alvan/vim-closetag.git
[submodule "vim/.vim/bundle/gruvbox"] [submodule "vim/.vim/bundle/gruvbox"]
path = vim/.vim/bundle/gruvbox path = base/.vim/bundle/gruvbox
url = https://github.com/morhetz/gruvbox url = https://github.com/morhetz/gruvbox
[submodule "vim/.vim/bundle/SimpylFold"] [submodule "vim/.vim/bundle/SimpylFold"]
path = vim/.vim/bundle/SimpylFold path = base/.vim/bundle/SimpylFold
url = https://github.com/tmhedberg/SimpylFold.git url = https://github.com/tmhedberg/SimpylFold.git
[submodule "vim/.vim/bundle/vim-template"] [submodule "vim/.vim/bundle/vim-template"]
path = vim/.vim/bundle/vim-template path = base/.vim/bundle/vim-template
url = https://github.com/aperezdc/vim-template.git url = https://github.com/aperezdc/vim-template.git
[submodule "vim/.vim/bundle/incsearch.vim"] [submodule "vim/.vim/bundle/incsearch.vim"]
path = vim/.vim/bundle/incsearch.vim path = base/.vim/bundle/incsearch.vim
url = https://github.com/haya14busa/incsearch.vim.git url = https://github.com/haya14busa/incsearch.vim.git
[submodule "vim/.vim/bundle/lightline.vim"] [submodule "vim/.vim/bundle/lightline.vim"]
path = vim/.vim/bundle/lightline.vim path = base/.vim/bundle/lightline.vim
url = https://github.com/itchyny/lightline.vim url = https://github.com/itchyny/lightline.vim
[submodule "vim/.vim/bundle/ale"] [submodule "vim/.vim/bundle/ale"]
path = vim/.vim/bundle/ale path = base/.vim/bundle/ale
url = https://github.com/w0rp/ale url = https://github.com/w0rp/ale
[submodule "vim/.vim/bundle/lightline-gruvbox.vim"] [submodule "vim/.vim/bundle/lightline-gruvbox.vim"]
path = vim/.vim/bundle/lightline-gruvbox.vim path = base/.vim/bundle/lightline-gruvbox.vim
url = https://github.com/shinchu/lightline-gruvbox.vim url = https://github.com/shinchu/lightline-gruvbox.vim
[submodule "vim/.vim/bundle/vim-css-color"] [submodule "vim/.vim/bundle/vim-css-color"]
path = vim/.vim/bundle/vim-css-color path = base/.vim/bundle/vim-css-color
url = https://github.com/ap/vim-css-color url = https://github.com/ap/vim-css-color
[submodule "vim/.vim/bundle/vim-javascript"] [submodule "vim/.vim/bundle/vim-javascript"]
path = vim/.vim/bundle/vim-javascript path = base/.vim/bundle/vim-javascript
url = https://github.com/pangloss/vim-javascript url = https://github.com/pangloss/vim-javascript
[submodule "vim/.vim/bundle/vim-ansible-yaml"] [submodule "vim/.vim/bundle/vim-ansible-yaml"]
path = vim/.vim/bundle/vim-ansible-yaml path = base/.vim/bundle/vim-ansible-yaml
url = https://github.com/chase/vim-ansible-yaml url = https://github.com/chase/vim-ansible-yaml
[submodule "firestarter/.firestarter"]
path = firestarter/.firestarter
url = git@git.desu.ltd:salt/firestarter
[submodule "bin/.bin"] [submodule "bin/.bin"]
path = bin/.bin path = base/.bin
url = git@git.desu.ltd:salt/bin url = git@git.desu.ltd:salt/bin
[submodule "desktop-common/.minetest/games/mineclone2"] [submodule "base/.vim/bundle/vim-terraform"]
path = desktop-common/.minetest/games/mineclone2 path = base/.vim/bundle/vim-terraform
url = https://git.minetest.land/Wuzzy/MineClone2 url = https://github.com/hashivim/vim-terraform
[submodule "base/.vim/bundle/vim-groovy"]
path = base/.vim/bundle/vim-groovy
url = https://github.com/thecodesmith/vim-groovy
[submodule "base/.vim/bundle/FastFold"]
path = base/.vim/bundle/FastFold
url = https://github.com/Konfekt/FastFold

View File

@@ -8,16 +8,11 @@ Clone the repository and stow in configs that you want, like so:
```bash ```bash
cd cd
git clone git@git.desu.ltd:salt/dotfiles .dotfiles git clone git@git.desu.ltd:salt/dotfiles --recurse-submodules .dotfiles
cd .dotfiles cd .dotfiles
git submodule update --recursive --remote stow base # Or whatever config set you want
stow vim # Or whatever config set you want
``` ```
I would highly recommend using this repository only as a reference and building your own dotfile solution from scratch. I would highly recommend using this repository only as a reference and building your own dotfile solution from scratch.
However, I would *also* highly recommend using this stow-based approach instead of putting a bare repo in your home directory. Been there, done that. It sucks, especially if you're the type to diverge configs between machines or just want a subset installed. However, I would *also* highly recommend using this stow-based approach instead of putting a bare repo in your home directory. Been there, done that. It sucks, especially if you're the type to diverge configs between machines or just want a subset installed.
## Overview
TODO: Overview of config sets

1
base/.bin Submodule

Submodule base/.bin added at 45a99b283d

View File

@@ -0,0 +1,89 @@
#! /bin/sh
set -e
# Pull in user-dirs.dirs if it exists
userdirs="${XDG_CONFIG_DIR:-$HOME/.config}"/user-dirs.dirs
[ -f "$userdirs" ] && . "$userdirs"
# Obtain download directory from there, otherwise use default
downloaddir="${XDG_DOWNLOAD_DIR:-$HOME/Downloads}"
documentsdir="${XDG_DOCUMENTS_DIR:-$HOME/Documents}"
picturesdir="${XDG_PICTURES_DIR:-$HOME/Pictures}"
videosdir="${XDG_VIDEOS_DIR:-$HOME/Videos}"
# If we have Nextcloud installed, this will be our backups dir
backupsdir="${HOME}/Nextcloud/Backups"
# Take loose crap out of the home folder
echo "Sorting away videos from homedir..."
find "$HOME" \
-maxdepth 1 \
-type f \
\( \
-iname "*.mov" -or \
-iname "*.webm" -or \
-iname "*.mkv" -or \
-iname "*.mp4" \
\) \
-print \
-exec mv {} "$videosdir" \;
echo "Sorting away pictures from homedir..."
find "$HOME" \
-maxdepth 1 \
-type f \
\( \
-iname "*.jpg" -or \
-iname "*.jpeg" -or \
-iname "*.gif" -or \
-iname "*.png" -or \
-iname "*.webp" \
\) \
-print \
-exec mv {} "$picturesdir" \;
# Sort out downloads
[ -e "$downloaddir" ] && {
# Sort out epubs
if [ -d ~/Books ]; then
echo "Sorting out books..."
find "$downloaddir" \
-type f \
\( \
-iname "*.epub" -or \
-iname "*.mobi" \
\) \
-print \
-exec mv {} ~/Books \;
fi
# Remove RDP stuffs
echo "Removing RDP zone identifiers..."
find "$downloaddir" \
-type f -iname "*:Zone.Identifier" \
-print -delete
# Remove anything that's wicked old
echo "Removing ancient downloads..."
find "$downloaddir" \
-mtime +60 \
-print -delete
# Remove anything kinda old but really big
echo "Removing large downloads..."
find "$downloaddir" \
-mtime +30 -size +10M \
-print -delete
# Remove zips, but at a lower tolerance
echo "Removing old zips..."
find "$downloaddir" \
-mtime +30 -type f -iname "*.zip" \
-print -delete
# Sort out Super Turtle Idle automatic backups
[ -d "$backupsdir" ] && {
echo "Sorting out turtle backups..."
mkdir -p "$backupsdir/SuperTurtleIdle"
for file in "$downloaddir"/SuperSaveData-*.json; do
if [ -e "$file" ]; then
lastmod="$(stat -c %y -- "$file")"
echo "Moving backup from $lastmod"
mv "$file" "$backupsdir/SuperTurtleIdle/SuperSaveData-$lastmod.json"
fi
done
}
}

View File

@@ -0,0 +1,9 @@
# vim:ft=systemd:
[Unit]
Description=Autocategorize service
[Service]
ExecStart=%h/.config/systemd/user/autocategorize
[Install]
WantedBy=default.target

View File

@@ -0,0 +1,11 @@
# vim:ft=systemd:
[Unit]
Description=Autocategorize timer
[Timer]
Persistent=true
OnBootSec=15min
OnCalendar=*-*-* 22:00:00
[Install]
WantedBy=default.target

View File

@@ -3,7 +3,7 @@
Description=Dotfile fetch service Description=Dotfile fetch service
[Service] [Service]
ExecStart=git --git-dir=%h/.dotfiles/ --work-tree=%h fetch ExecStart=git --git-dir=%h/.dotfiles/.git fetch
[Install] [Install]
WantedBy=default.target WantedBy=default.target

View File

@@ -0,0 +1,9 @@
# vim:ft=systemd:
[Unit]
Description=Image metadata stripping service
[Service]
ExecStart=toolbox run -c general nice -n 20 ionice -c 3 exiftool -recurse -overwrite_original -all= %h/Pictures/Photos
[Install]
WantedBy=default.target

View File

@@ -0,0 +1,10 @@
# vim:ft=systemd:
[Unit]
Description=Image metadata stripping timer
[Timer]
Persistent=true
OnCalendar=*:0/15
[Install]
WantedBy=default.target

View File

@@ -0,0 +1,9 @@
# vim:ft=systemd:
[Unit]
Description=Flatpak manifest backup service
[Service]
ExecStart=bash -c 'flatpak list --columns=application --app > $HOME/.backup/flatpak-latest.txt'
[Install]
WantedBy=default.target

View File

@@ -0,0 +1,10 @@
# vim:ft=systemd:
[Unit]
Description=Flatpak manifest backup timer
[Timer]
Persistent=true
OnCalendar=*:0/15
[Install]
WantedBy=default.target

View File

@@ -0,0 +1,15 @@
[Unit]
Description=Ollama Service
After=network-online.target
[Service]
Environment="OLLAMA_HOST=0.0.0.0"
Environment="LD_LIBRARY_PATH=/var/home/salt/Projects/ollama/rocm/lib/ollama/"
ExecStart=/home/salt/Projects/ollama/ollama serve
Restart=always
RestartSec=3
MemoryHigh=3G
MemoryMax=4G
[Install]
WantedBy=default.target

View File

@@ -0,0 +1,11 @@
[Unit]
Description=OpenWebUI Service
After=network-online.target
[Service]
ExecStart=/home/salt/Projects/ollama/run-webui.sh
Restart=always
RestartSec=3
[Install]
WantedBy=default.target

View File

@@ -0,0 +1,12 @@
[Unit]
Description=StableDiffusion Web UI Service
After=network-online.target
[Service]
WorkingDirectory=/home/salt/Projects/ollama/sdwebui/
ExecStart=/home/salt/Projects/ollama/sdwebui/webui-docker.sh
Restart=always
RestartSec=3
[Install]
WantedBy=default.target

View File

@@ -0,0 +1,11 @@
[Unit]
Description=SillyTavern Service
After=network-online.target
[Service]
ExecStart=/home/salt/Projects/ollama/run-sillytavern.sh
Restart=always
RestartSec=3
[Install]
WantedBy=default.target

View File

@@ -1,4 +1,4 @@
#! /bin/sh #! /bin/bash
# #
# .functions # .functions
# Functions for interactive shells # Functions for interactive shells
@@ -19,6 +19,15 @@ proj() {
if [ -d "$projdir" ]; then if [ -d "$projdir" ]; then
# It exists # It exists
cd "$projdir" || return 50 cd "$projdir" || return 50
# Run code if we have it
# The fun part is this environment file can access some vars about the proj
local envfile="$projdir/.project-env"
if [ -r "$envfile" ]; then
. "$envfile"
echo "Sourced environment file for project"
# Also mark an envvar to ensure we can detect this condition
export PROJECT="$projname"
fi
else else
# It does not exist # It does not exist
echo "Creating new project \"$projname\"" echo "Creating new project \"$projname\""
@@ -53,18 +62,3 @@ _proj() {
COMPREPLY=($(compgen -W "$COMPREPLY" "${COMP_WORDS[COMP_CWORD]}")) COMPREPLY=($(compgen -W "$COMPREPLY" "${COMP_WORDS[COMP_CWORD]}"))
return 0 return 0
} }
# Autocompletion for zsh
compdef _proj proj > /dev/null 2>&1 && \
_proj() {
#! /usr/bin/env zsh
# It's okay, shellcheck
# We zsh now
# shellcheck disable=2039
for dir in "$HOME"/Projects/*; do
temp="$(basename "$dir")"
temp="${reply//[^ a-zA-Z0-9.]/}"
reply+=" $temp"
done
return 0
}

View File

@@ -1,15 +1,13 @@
#!/bin/sh #!/bin/sh
#
# Copyright (c) 2017 rehashedsalt/vintagesalt # My shell profile
#
# Copyright (c) 2017-2022 Jacob Babor
# Licensed under the terms of the MIT license # Licensed under the terms of the MIT license
#
## POSIX NOTICE
# This script, or at least the parts expected to be run by a standard sh
# implementation, should be fully POSIX-compliant. If it is not, open a bug
# report at git.9iron.club/salt/home and I'll take care of it.
## SHELLCHECK ## SHELLCHECK
# Not finding these sources is none of my concern; they're out of scope # Yeah whatever I don't care that you can't find these
# shellcheck disable=1091 # shellcheck disable=1091
# shellcheck disable=1090 # shellcheck disable=1090
# I'm well aware of when functions are defined vs used # I'm well aware of when functions are defined vs used
@@ -28,7 +26,6 @@ _baseshell="$(basename -- "$0")"
for dir in \ for dir in \
"$HOME/.bin" \ "$HOME/.bin" \
"$HOME/.local/bin" \ "$HOME/.local/bin" \
"$HOME/.firestarter" \
"/usr/local/opt/coreutils/libexec/gnubin" \ "/usr/local/opt/coreutils/libexec/gnubin" \
"/usr/local/opt/gnu-sed/libexec/gnubin" \ "/usr/local/opt/gnu-sed/libexec/gnubin" \
"/usr/local/opt/grep/libexec/gnubin" \ "/usr/local/opt/grep/libexec/gnubin" \
@@ -55,9 +52,27 @@ has() {
command -v "$1" > /dev/null 2>&1 command -v "$1" > /dev/null 2>&1
} }
# Doot # Source in homebrew configuration, if we have it installed
if ! has doot; then brewfix=/usr/local
alias doot="echo Doot doot." # This patch is needed on Apple silicon
if [ -d /opt/homebrew ]; then
brewfix="/opt/homebrew"
fi
if [ -f "$brewfix"/bin/brew ]; then
eval "$("$brewfix"/bin/brew shellenv)"
# Add coreutils to path, if we can
if [ -d "$brewfix"/opt/coreutils/libexec/gnubin ]; then
export PATH="$brewfix/opt/coreutils/libexec/gnubin:$PATH"
fi
fi
unset brew
# If we have toolbox, assume we're on Wayblue and set up an alias
if has toolbox; then
#toolbox create hyprpm
#toolbox run -c hyprpm sudo dnf -y install hyprland hyprland-devel
alias mktoolbox-hyprpm='toolbox create hyprpm && toolbox run -c hyprpm sudo dnf -y install hyprland hyprland-devel'
alias hyprpm='toolbox run -c hyprpm env HYPRLAND_INSTANCE_SIGNATURE="$HYPRLAND_INSTANCE_SIGNATURE" hyprpm'
fi fi
# Grab pip completion, if it exists # Grab pip completion, if it exists
@@ -82,12 +97,6 @@ if has pip; then
esac esac
fi fi
# Set up go, if we have it
if has go; then
export GOPATH="$HOME/.local/go"
[ "${PATH#*$GOPATH}" = "$PATH" ] && export PATH="$PATH:$GOPATH/bin"
fi
# Grab dircolors, if it exists # Grab dircolors, if it exists
if has dircolors; then if has dircolors; then
dircolorsfile="$HOME/.config/dircolors" dircolorsfile="$HOME/.config/dircolors"
@@ -105,34 +114,10 @@ for editor in vim vi nano; do
break break
fi fi
done done
alias e='$EDITOR'
# Now for a shitton of aliases # Now for a shitton of aliases
if ! has define; then if has podman and ! has docker; then
if has mate-dictionary; then alias docker="podman"
alias define='mate-dictionary -n --look-up'
fi
fi
if ! has helpme; then
# https://breanneboland.com/blog/2020/02/28/you-can-put-what-in-dns-txt-records-a-blog-post-for-con-west-2020/
alias helpme='dig +short txt "$(( RANDOM % 50 )).maybethiscould.work"'
fi
if has emerge; then
alias e-depclean='sudo emerge -a --depclean'
alias e-inst='sudo emerge -a --jobs --tree --quiet-build y'
alias e-upgrade='sudo emerge -DNUua --jobs --tree --quiet-build y --with-bdeps=y --keep-going --backtrack=1000 @world'
alias e-newuse='sudo emerge -Uva --jobs --tree --quiet-build y @world'
alias e-search='emerge -s'
alias e-sync='sudo emerge --sync'
if has eclean; then
alias e-cleanup='sudo eclean -d distfiles && sudo eclean -d packages'
fi
fi
if has firestarter and ! has fs; then
alias fs="firestarter"
fi
if has fork; then
alias dup="fork $TERMINAL $PWD"
fi fi
if has git; then if has git; then
# Thanks Bash-it! # Thanks Bash-it!
@@ -221,19 +206,6 @@ if has git; then
# Show untracked files # Show untracked files
alias gu='git ls-files . --exclude-standard --others' alias gu='git ls-files . --exclude-standard --others'
fi fi
if has nc; then
# I'm not sorry
alias blinkenlights='nc -v towel.blinkenlights.nl 23'
fi
if has ptgdp; then
song() {
if [ -z "$*" ]; then
echo "song: Requires an argument"
return 1
fi
echo "$*" | ptgdp -p
}
fi
if has sed && has find; then if has sed && has find; then
replace() { replace() {
if [ $# -ne 2 ]; then if [ $# -ne 2 ]; then
@@ -261,36 +233,6 @@ if has tree; then
alias ts="tree $treeargs -hL 2" alias ts="tree $treeargs -hL 2"
unset treeargs unset treeargs
fi fi
if has vault; then
alias vlogin="vault login -method=ldap username=$(whoami)"
alias vls="vault list"
alias vr="vault read"
fi
# Dotfile management aliases
if [ -d "$HOME/.dotfiles" ]; then
dotcmd='git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'
alias dot="$dotcmd"
if [ -f "/usr/share/bash-completion/completions/git" ] && [ "$_baseshell" == "bash" ]; then
. "/usr/share/bash-completion/completions/git"
__git_complete dot _git
fi
alias dotupdate="\
printf 'Pulling...\n'
$dotcmd pull
printf 'Updating submodules...\n'
$dotcmd submodule update --init --recursive --remote
$dotcmd status"
alias dotupgrade="\
printf 'Pulling...\n'
$dotcmd pull
printf 'Updating submodules...\n'
$dotcmd submodule update --init
printf 'Checking out masters...\n'
$dotcmd submodule -q foreach --recursive 'git checkout -q master && git pull' && \
$dotcmd status"
unset dotcmd
fi
# Aliases for common utilities # Aliases for common utilities
if [ "$(uname)" = "Linux" ] || has brew; then if [ "$(uname)" = "Linux" ] || has brew; then
@@ -301,18 +243,20 @@ if [ "$(uname)" = "Linux" ] || has brew; then
alias ls="ls $lsarguments" alias ls="ls $lsarguments"
alias ll="ls -Al --file-type $lsarguments" alias ll="ls -Al --file-type $lsarguments"
unset lsarguments unset lsarguments
alias rm='rm -I'
else else
# Else only assume POSIX/BSD # Else only assume POSIX/BSD
lsarguments='-F' lsarguments='-F'
alias l="ls -$lsarguments" alias l="ls -l $lsarguments"
alias la="ls -A $lsarguments" alias la="ls -A $lsarguments"
alias ls="ls $lsarguments" alias ls="ls $lsarguments"
alias ll="ls -Ahl $lsarguments" alias ll="ls -Ahl $lsarguments"
fi fi
alias cp='cp -i'
alias d='du -hs' # Oneoffs and weird oneliners
if [ "$(uname)" = "Linux" ]; then
# Shows realtime and low-nice processes
alias rtps="LIBPROC_HIDE_KERNEL=1 ps -eo pid,class,rtprio,ni,stat,comm --sort=+pcpu | awk '\$4!=0.0 {print}' | awk 'NR>1'"
fi
# Set up a default PS1 for bash # Set up a default PS1 for bash
_ps1bash() { _ps1bash() {
@@ -332,12 +276,24 @@ _ps1bash() {
# Add hostname prefix in SSH sessions # Add hostname prefix in SSH sessions
unset _prefix unset _prefix
# Get the system hostname
if [ -f /etc/hostname ]; then
_hostname="$(</etc/hostname)"
else
_hostname="$(hostname)"
fi
# Alert if in an SSH session # Alert if in an SSH session
if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then
_prefix="${fg_bold}${fg_red}$(hostname -s)${r}${fg_red}:${r}${_prefix}" _prefix="${fg_bold}${fg_red}${_hostname}${r}${fg_red}:${r}${_prefix}"
elif [ -n "$TOOLBOX_PATH" ]; then
_prefix="${fg_bold}${fg_magenta}$(. /run/.containerenv && echo "$name")${r}${fg_magenta}:${r}${_prefix}"
elif [ "$USER" != "salt" ]; then elif [ "$USER" != "salt" ]; then
_prefix="${fg_bold}${fg_yellow}$USER${r}${fg_yellow}:${r}${_prefix}" _prefix="${fg_bold}${fg_yellow}$USER${r}${fg_yellow}:${r}${_prefix}"
fi fi
# If we're in a PROJECT, post that envvar
if [ -n "$PROJECT" ]; then
_prefix="${_prefix}${fg_bold}${fg_blue}$PROJECT${r}${fg_blue}:${r}"
fi
# Color PWD # Color PWD
_prefix="${_prefix}${fg_blue}" _prefix="${_prefix}${fg_blue}"
# Show the tilde instead of $HOME # Show the tilde instead of $HOME
@@ -393,7 +349,6 @@ case "$_baseshell" in
esac esac
# Clean up # Clean up
unset gnubin
unset -v _baseshell unset -v _baseshell
unset -f has unset -f has

1
base/.vim/bundle/ale Submodule

Submodule base/.vim/bundle/ale added at 6c337ad19c

1
base/.vim/pathogen Submodule

Submodule base/.vim/pathogen added at ac4dd9494f

View File

@@ -13,7 +13,6 @@ endif
set autoread " Automatically read when a file is changed outside of Vim set autoread " Automatically read when a file is changed outside of Vim
set clipboard=unnamedplus " Use XA_PRIMARY clipboard by default set clipboard=unnamedplus " Use XA_PRIMARY clipboard by default
set encoding=utf-8 set encoding=utf-8
set foldmethod=syntax
set hidden " Allow buffer switching without saving set hidden " Allow buffer switching without saving
set incsearch " Search while you type set incsearch " Search while you type
set laststatus=2 " Always show statusbar set laststatus=2 " Always show statusbar
@@ -21,16 +20,14 @@ set list
set listchars=tab:>·,trail set listchars=tab:>·,trail
set modeline set modeline
set modelines=5 set modelines=5
set nofoldenable " Fuck autofolding set number
set number relativenumber " Relative line numbering
set t_Co=256 set t_Co=256
set viminfo='20,<1000,s1000 " Increase buffer size set viminfo='20,<1000,s1000 " Increase buffer size
" Folding
set foldmethod=syntax
"nnoremap <space> za
set nofoldenable " Fuck autofolding
" Templates
let g:email = 'rehashedsalt@cock.li'
let g:user = 'Vintage Salt'
let g:license = 'MIT'
let g:templates_directory = [ '~/.vim/templates' ]
" Lightline " Lightline
set noshowmode set noshowmode
let g:lightline = { let g:lightline = {
@@ -51,7 +48,10 @@ let g:lightline = {
\ }, \ },
\} \}
let g:lightline.colorscheme = 'gruvbox' let g:lightline.colorscheme = 'gruvbox'
hi Normal guibg=NONE ctermbg=NONE
" Jenkinsfile
au BufNewFile,BufRead Jenkinsfile setf groovy
" Json " Json
au BufNewFile,BufRead *.json au BufNewFile,BufRead *.json
\ set tabstop=2 | \ set tabstop=2 |
@@ -78,4 +78,7 @@ au BufNewFile,BufRead *.html,*.php
" Treat PHP like HTML " Treat PHP like HTML
au BufNewFile,BufRead *.php au BufNewFile,BufRead *.php
\ set filetype=html \ set filetype=html
au FileType yaml
\ set tabstop=2 |
\ set softtabstop=2 |
\ set shiftwidth=2

Submodule bin/.bin deleted from 8bec6ce196

253
bootleg-stow Executable file
View File

@@ -0,0 +1,253 @@
#! /bin/bash
#
# bootleg-stow
# Copyright (C) 2021 Vintage Salt <rehashedsalt@cock.li>
#
# Distributed under terms of the MIT license.
#
set -e
# Read-only set-once variables
declare -r _name="$(basename -- "$0")"
declare -i _opthelp
declare -i _optverbose
# Modes
declare -i _optstow=1
declare -i _optunstow
# Working variables
declare -a _args
declare _return
declare _files
declare _directories
# Helper functions
log() {
# Print a line to the terminal if _optverbose is greater than $2
# $2 defaults to 0
# loglevel 0: Daily-use messages
# loglevel 1: Detailed but not quite debugging
# loglevel 2: Definitely debugging
[ -z "$1" ] && return 1
if (( _optverbose >= ${2:-0} )); then
printf "%s\\n" "$1"
fi
}
warn() {
# Print a yellow line to the terminal, respecting _optverbose
[ -z "$1" ] && return 1
if (( _optverbose >= ${2:-0} )); then
if [ -t 1 ]; then
printf "\\e[33m%s\\e[0m\\n" "$1"
else
printf "WARN: %s\\n" "$1"
fi
fi
}
error() {
# Print a red line to the terminal, exit if $2 is specified
[ -z "$1" ] && return 1
if [ -t 2 ]; then
printf "\\e[31m%s\\e[0m\\n" "$1" 1>&2
else
printf "ERROR: %s\\n" "$1" 1>&2
fi
[ -z "$2" ] && return
exit "${2:-1}"
}
has() {
# Parse out all arguments and try to find them in path
# If an argument cannot be found, set _return and fail
for prog in "$@"; do
if ! command -v "$prog" > /dev/null 2>&1; then
_return="$prog"
return 1
fi
done
return 0
}
checkconflict() {
# Take a directory as argument 1 and stow its contents in ..
[ -z "$1" ] && return 1
if ! [ -d "$1" ]; then
error "Could not find directory: $1" 2
fi
if ! [ -r "$1" ]; then
error "Could not read directory: $1" 2
fi
# Get our list of files
local files="$(find "$1" ! -name "*.swp" -type f -o -type l)"
local directories="$(find "$1" -type d)"
local -a conflict
# Iterate over them
for file in $files; do
# Get the basename of the file
filename="${file#"$1"/}"
if [ -f ../"$filename" ]; then
if [ -h ../"$filename" ]; then
continue
else
conflict+=("$filename")
fi
fi
done
if [ -n "${conflict[*]}" ]; then
warn "The following non-symlinks would be touched by this operation:"
for file in "${conflict[@]}"; do
echo "$file"
done
error "Please resolve these conflicts manually." 3
fi
_files="$files"
_directories="$directories"
}
stow() {
# Stow all of _files and _directories in $1 as a package name
# Note that you should checkconflict first
[ -z "$1" ] && return 1
stowdir="$(basename -- "$PWD")"
log "Stowing package: $stowdir" 1
pushd .. > /dev/null 2>&1
for dir in $_directories; do
dirname="${dir#"$1"/}"
if [ "$dir" == "$1" ]; then
log "Skipping package directory: $dir" 2
continue
fi
if ! [ -d "$dirname" ]; then
log "Creating directory: $dirname" 2
mkdir -p "$dirname"
fi
done
for file in $_files; do
filename="${file#"$1"/}"
if has realpath dirname; then
path="$(realpath --relative-to="$(dirname "$filename")" "$PWD/$stowdir/$1/$filename")"
else
path="$PWD/$stowdir/$1/$filename"
fi
if [ -h "$filename" ]; then
rm "$filename"
fi
if [ -h "$PWD/$stowdir/$1/$filename" ]; then
log "Copying symlink: $filename" 2
cp -d "$PWD/$stowdir/$1/$filename" "$filename"
else
log "Linking file: $filename to $path" 2
ln -s "$path" "$filename"
fi
done
log "Done stowing package: $1" 1
popd > /dev/null 2>&1
}
unstow() {
# Unstow all of _files and _directories
# Takes a packagename as $1
[ -z "$1" ] && return 1
pushd .. > /dev/null 2>&1
for file in $_files; do
filename="${file#"$1"/}"
if [ -h "$filename" ]; then
rm "$filename"
elif ! [ -e "$filename" ]; then
warn "File does not exist, skipping: $filename" 1
else
warn "File is not a symlink, skipping: $filename"
fi
done
_directories="$(echo "$_directories" | tac)"
log "Removing empty directories" 2
for dir in $_directories; do
dirname="${dir#"$1"/}"
# We silently ignore errors here so that rmdiring a directory with stuff in
# it doesn't break our loop.
rmdir -p "$dirname" > /dev/null 2>&1 || continue
done
popd > /dev/null 2>&1
}
# Core program functions
printhelp() {
cat << EOF
Usage: $_name [OPTION]... PACKAGE...
Bootleg stow for the poor sods who can't get it.
-h Print this help text
-R Unstow a directory.
-S Stow a directory. Default operation.
-v Print more status messages. Stacks
Copyright (c) 2021 rehashedsalt@cock.li
Licensed under the MIT license
EOF
}
# Main
main() {
# Parse out arguments
while [ -n "$1" ]; do
# Parse out flags
while getopts ":hRSv" opt; do
case $opt in
h)
_opthelp=1
;;
R)
_optunstow=1
;;
S)
_optstow=1
;;
v)
_optverbose+=1
;;
:)
error "Option requires argument: -$OPTARG" 2
;;
*)
error "Invalid option: -$OPTARG" 2
;;
esac
done
# Store arguments
shift $((OPTIND - 1))
if [ -n "$1" ]; then
_args+=("$1")
shift
fi
unset OPTIND
done
# Early hook for help
[ -n "$_opthelp" ] && printhelp && exit 0
# Validate critical options
# TODO: That
# Validate core program dependencies
log "Validating dependencies" 2
if ! has basename find tac; then
error "Failed to find program: $_return" 1
fi
# Do the do
if [ -n "$_optunstow" ]; then
if [ -n "${_args[*]}" ]; then
for package in "${_args[@]}"; do
checkconflict "$package"
unstow "$package"
done
else
error "No package specified" 1
fi
elif [ -n "$_optstow" ]; then
if [ -n "${_args[*]}" ]; then
for package in "${_args[@]}"; do
checkconflict "$package"
stow "$package"
done
else
error "No package specified" 1
fi
fi
exit 0
}
main "$@"

View File

@@ -0,0 +1,25 @@
{
"backgroundColor": "#282828",
"fontColor": "#ebdbb2",
"flickering": 0.1047,
"horizontalSync": 0.0833,
"staticNoise": 0.0956,
"chromaColor": 1,
"saturationColor": 1,
"screenCurvature": 0.2026,
"glowingLine": 0.117,
"burnIn": 0.0528,
"bloom": 0.4962,
"rasterization": 0,
"jitter": 0.1997,
"rbgShift": 0,
"brightness": 0.2981,
"contrast": 1,
"ambientLight": 0.1047,
"windowOpacity": 0.897,
"fontName": "TERMINUS_SCALED",
"fontWidth": 1,
"margin": 0.2954,
"name": "Modern",
"version": 2
}

View File

@@ -1 +0,0 @@
../Nextcloud/keepass.kdbx

View File

@@ -21,7 +21,7 @@ IntensityEffect=0
[Colors:Button] [Colors:Button]
BackgroundAlternate=60,56,54 BackgroundAlternate=60,56,54
BackgroundNormal=40,40,40 BackgroundNormal=40,40,40
DecorationFocus=104,157,106 DecorationFocus=131,165,152
DecorationHover=131,165,152 DecorationHover=131,165,152
ForegroundActive=142,192,124 ForegroundActive=142,192,124
ForegroundInactive=55,115,117 ForegroundInactive=55,115,117
@@ -34,8 +34,8 @@ ForegroundVisited=127,140,141
[Colors:Selection] [Colors:Selection]
BackgroundAlternate=142,192,124 BackgroundAlternate=142,192,124
BackgroundNormal=104,157,106 BackgroundNormal=131,165,152
DecorationFocus=104,157,106 DecorationFocus=131,165,152
DecorationHover=131,165,152 DecorationHover=131,165,152
ForegroundActive=252,252,252 ForegroundActive=252,252,252
ForegroundInactive=235,219,178 ForegroundInactive=235,219,178
@@ -49,7 +49,7 @@ ForegroundVisited=189,195,199
[Colors:Tooltip] [Colors:Tooltip]
BackgroundAlternate=60,56,54 BackgroundAlternate=60,56,54
BackgroundNormal=40,40,40 BackgroundNormal=40,40,40
DecorationFocus=104,157,106 DecorationFocus=131,165,152
DecorationHover=131,165,152 DecorationHover=131,165,152
ForegroundActive=184,187,38 ForegroundActive=184,187,38
ForegroundInactive=55,115,117 ForegroundInactive=55,115,117
@@ -63,7 +63,7 @@ ForegroundVisited=127,140,141
[Colors:View] [Colors:View]
BackgroundAlternate=60,56,54 BackgroundAlternate=60,56,54
BackgroundNormal=40,40,40 BackgroundNormal=40,40,40
DecorationFocus=104,157,106 DecorationFocus=131,165,152
DecorationHover=131,165,152 DecorationHover=131,165,152
ForegroundActive=184,187,38 ForegroundActive=184,187,38
ForegroundInactive=55,115,117 ForegroundInactive=55,115,117
@@ -77,7 +77,7 @@ ForegroundVisited=127,140,141
[Colors:Window] [Colors:Window]
BackgroundAlternate=60,56,54 BackgroundAlternate=60,56,54
BackgroundNormal=40,40,40 BackgroundNormal=40,40,40
DecorationFocus=104,157,106 DecorationFocus=131,165,152
DecorationHover=131,165,152 DecorationHover=131,165,152
ForegroundActive=184,187,38 ForegroundActive=184,187,38
ForegroundInactive=55,115,117 ForegroundInactive=55,115,117

View File

@@ -0,0 +1 @@
Consider MineClone2

View File

@@ -66,8 +66,8 @@ bspc config ignore_ewmh_focus true # Fuck you, Discord
## Looks ## Looks
# Padding # Padding
bspc config border_width 4 bspc config border_width 6
bspc config window_gap 6 bspc config window_gap 8
bspc config single_monocle false bspc config single_monocle false
bspc config borderless_monocle false bspc config borderless_monocle false
bspc config gapless_monocle false bspc config gapless_monocle false
@@ -90,7 +90,7 @@ esac
## Rules ## Rules
bspc rule -r '*' bspc rule -r '*'
case $HOSTNAME in case $HOSTNAME in
dsk-cstm-0*) dsk-ryzen-0*)
# Big boy gets pseudotiled Firefox # Big boy gets pseudotiled Firefox
bspc rule -a Firefox state=pseudo_tiled rectangle=1920x1080+0+0 bspc rule -a Firefox state=pseudo_tiled rectangle=1920x1080+0+0
;; ;;
@@ -107,6 +107,7 @@ bspc rule -a spotify desktop=10
bspc rule -a cantata desktop=10 bspc rule -a cantata desktop=10
bspc rule -a 'Minecraft 1.7.10' state=fullscreen bspc rule -a 'Minecraft 1.7.10' state=fullscreen
bspc rule -a 'NieR:Automata' state=fullscreen bspc rule -a 'NieR:Automata' state=fullscreen
bspc rule -a modloader64-gui state=floating border=off
# Plasma rules # Plasma rules
bspc rule -a plasmashell state=floating sticky=on border=off bspc rule -a plasmashell state=floating sticky=on border=off
bspc rule -a krunner state=floating layer=above sticky=on border=off bspc rule -a krunner state=floating layer=above sticky=on border=off

View File

@@ -29,7 +29,7 @@
# the top and down respectively. # the top and down respectively.
# The width can be negative. In this case the actual width is the # The width can be negative. In this case the actual width is the
# screen width minus the width defined in within the geometry option. # screen width minus the width defined in within the geometry option.
geometry = "500x8-6+50" geometry = "600x8-8+64"
corner_radius = 0 corner_radius = 0
# Show how many messages are currently hidden (because of geometry). # Show how many messages are currently hidden (because of geometry).
@@ -62,7 +62,7 @@
# Defines width in pixels of frame around the notification window. # Defines width in pixels of frame around the notification window.
# Set to 0 to disable. # Set to 0 to disable.
frame_width = 4 frame_width = 6
# Defines color of the frame around the notification window. # Defines color of the frame around the notification window.
frame_color = "#f2e5bc" frame_color = "#f2e5bc"
@@ -86,7 +86,7 @@
### Text ### ### Text ###
#font = Monospace 8 #font = Monospace 8
font = Roboto 10 font = IBM Plex Sans 12
# The spacing between lines. If the height is smaller than the # The spacing between lines. If the height is smaller than the
# font height, it will get raised to the font height. # font height, it will get raised to the font height.

View File

@@ -3,8 +3,6 @@
: :
command -v unagi command -v unagi
unagi unagi
command -v picom
picom
command -v compton command -v compton
compton compton
command -v xcompmgr command -v xcompmgr

View File

@@ -32,7 +32,7 @@ bar-width = 50
bar-fill = | bar-fill = |
bar-empty = | bar-empty = |
bar-indicator = bar-indicator =
border-size = 4 border-size = 6
padding = 2 padding = 2
[settings] [settings]
@@ -44,18 +44,19 @@ format-background = ${res/colors.bg}
[template/bar] [template/bar]
bottom = false bottom = false
wm-restack = ${env:PB_WM_RESTACK:i3} wm-restack = ${env:PB_WM_RESTACK:i3}
tray-maxsize = 16 tray-maxsize = 24
background = ${res/colors.bg} background = ${res/colors.bg}
foreground = ${res/colors.fg} foreground = ${res/colors.fg}
border-color = ${res/colors.border} border-color = ${res/colors.border}
tray-background = ${res/colors.bg} tray-background = ${res/colors.bg}
height = 40 height = 48
width = 100% width = 100%:-16
offset-x = 8
padding = 2 padding = 2
border-bottom-size = ${res/config.border-size} border-size = ${res/config.border-size}
font-0 = "IBM Plex Sans:style=Medium:size=10;2" font-0 = "IBM Plex Sans:style=Medium:size=12;2"
font-1 = "Deja Vu Sans Mono:style=Regular:size=10;2" font-1 = "Deja Vu Sans Mono:style=Regular:size=12;2"
font-2 = "IBM Plex Sans:style=Bold:size=10;2" font-2 = "IBM Plex Sans:style=Bold:size=12;2"
font-3 = "Fork Awesome:style=Regular:size=12;2" font-3 = "Fork Awesome:style=Regular:size=12;2"
font-4 = "Font Awesome 5 Free:style=Regular:size=12;2" font-4 = "Font Awesome 5 Free:style=Regular:size=12;2"
font-5 = "Font Awesome 5 Brands:style=Regular:size=12;2" font-5 = "Font Awesome 5 Brands:style=Regular:size=12;2"
@@ -63,15 +64,18 @@ font-5 = "Font Awesome 5 Brands:style=Regular:size=12;2"
[bar/primary] [bar/primary]
monitor = ${env:PB_MONITOR:eDP-1} monitor = ${env:PB_MONITOR:eDP-1}
inherit = template/bar inherit = template/bar
tray-position = center tray-position = right
modules-left = i3 bspwm service-ansible service-backup reboot-required modules-left = i3 bspwm service-ansible service-backup reboot-required
modules-right = backlight pulse battery | date modules-center = date
modules-right = xkeyboard backlight pulse battery battery-bat1 |
border-top-size = 0
[bar/secondary] [bar/secondary]
monitor= ${env:PB_MONITOR:HDMI-A-0} monitor= ${env:PB_MONITOR:HDMI-A-0}
inherit = template/bar inherit = template/bar
modules-left = i3 bspwm modules-left = i3 bspwm
modules-right = wlan-desktop-stats mpd | date modules-right = xkeyboard pulse wlan-desktop-stats mpd | date
border-top-size = 0
## MODULES ## MODULES
[module/|] [module/|]
@@ -95,13 +99,16 @@ bar-indicator = ${res/config.bar-indicator}
type = internal/battery type = internal/battery
full-at = 100 full-at = 100
time-format = %H:%M time-format = %H:%M
interval = 15 interval = 60
format-charging = <ramp-capacity> format-charging = <ramp-capacity> <label-charging>
format-charging-foreground = ${res/colors.green} format-charging-foreground = ${res/colors.green}
format-discharging = <ramp-capacity> format-discharging = <ramp-capacity> <label-discharging>
format-full = <ramp-capacity> format-full = <ramp-capacity> <label-full>
format-full-foreground = ${res/colors.green} format-full-foreground = ${res/colors.green}
label-charging = %percentage%%
label-discharging = %percentage%%
label-full = %percentage%%
ramp-capacity-0 =  ramp-capacity-0 = 
ramp-capacity-0-foreground = ${res/colors.yellow} ramp-capacity-0-foreground = ${res/colors.yellow}
ramp-capacity-1 =  ramp-capacity-1 = 
@@ -109,6 +116,11 @@ ramp-capacity-2 = 
ramp-capacity-3 =  ramp-capacity-3 = 
ramp-capacity-4 =  ramp-capacity-4 = 
[module/battery-bat1]
type = internal/battery
inherit = module/battery
battery = BAT1
[module/bspwm] [module/bspwm]
type = internal/bspwm type = internal/bspwm
format = <label-state> <label-mode> format = <label-state> <label-mode>
@@ -134,6 +146,15 @@ label-urgent-background = ${res/colors.yellow}
label-empty = %name% label-empty = %name%
label-empty-foreground = ${res/colors.border} label-empty-foreground = ${res/colors.border}
label-empty-padding = 4 label-empty-padding = 4
label-monocle = 
label-monocle-padding = 4
label-monocle-background = ${res/colors.red}
label-pseudotiled = 
label-pseudotiled-padding = ${self.label-monocle-padding}
label-pseudotiled-background = ${res/colors.border}
label-floating = 
label-floating-padding = ${self.label-monocle-padding}
label-floating-background = ${res/colors.border}
[module/cpu] [module/cpu]
type = internal/cpu type = internal/cpu
@@ -154,7 +175,7 @@ date = %a %b %d
time = %I:%M %p time = %I:%M %p
interval = 5 interval = 5
format = <label> format = <label>
label = %date% %time% label = %{T3}%date% %time%%{T-}
[module/fshome] [module/fshome]
type = internal/fs type = internal/fs
@@ -234,20 +255,21 @@ format-muted-foreground = ${res/colors.border}
[module/reboot-required] [module/reboot-required]
type = custom/script type = custom/script
interval = 300
exec = "echo Reboot required" exec = "echo Reboot required"
exec-if = "[ -f /var/run/reboot-required ]" exec-if = "[ -f /var/run/reboot-required ]"
format-foreground = ${res/colors.yellow} format-foreground = ${res/colors.yellow}
[module/service-ansible] [module/service-ansible]
type = custom/script type = custom/script
interval = 5 interval = 300
exec = "echo " exec = "echo "
exec-if = "systemctl is-failed --quiet ansible-pull.service" exec-if = "systemctl is-failed --quiet ansible-pull.service"
format-foreground = ${res/colors.red} format-foreground = ${res/colors.red}
[module/service-backup] [module/service-backup]
type = custom/script type = custom/script
interval = 5 interval = 300
exec = "echo " exec = "echo "
exec-if = "systemctl is-failed --quiet backup.service" exec-if = "systemctl is-failed --quiet backup.service"
format-foreground = ${res/colors.red} format-foreground = ${res/colors.red}
@@ -279,8 +301,13 @@ label-connected = U %upspeed% D %downspeed%
[module/xkeyboard] [module/xkeyboard]
type = internal/xkeyboard type = internal/xkeyboard
format = <label-layout> format = <label-indicator>
label-layout = %name% label-indicator-on = %icon%
label-indicator-off = %icon%
label-indicator-on-capslock = 
label-indicator-on-capslock-padding = 4
label-indicator-on-capslock-background = ${res/colors.yellow}
label-indicator-on-capslock-foreground = ${res/colors.black}
[module/xwindow] [module/xwindow]
type = internal/xwindow type = internal/xwindow

View File

@@ -1,28 +0,0 @@
[Appearance]
color_scheme_path=/usr/share/qt5ct/colors/airy.conf
custom_palette=false
icon_theme=Papirus-Dark-Gruvbox
standard_dialogs=kde
style=Breeze
[Fonts]
fixed=@Variant(\0\0\0@\0\0\0\x16\0I\0n\0\x63\0o\0n\0s\0o\0l\0\x61\0t\0\x61@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x39\x10)
general=@Variant(\0\0\0@\0\0\0\x1a\0I\0\x42\0M\0 \0P\0l\0\x65\0x\0 \0S\0\x61\0n\0s@$\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x39\x10)
[Interface]
activate_item_on_single_click=2
buttonbox_layout=2
cursor_flash_time=1000
dialog_buttons_have_icons=2
double_click_interval=400
gui_effects=@Invalid()
keyboard_scheme=2
menus_have_icons=true
show_shortcuts_in_context_menus=true
stylesheets=@Invalid()
toolbutton_style=4
underline_shortcut=1
wheel_scroll_lines=3
[SettingsWindow]
geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x3\xc3\0\0\0\x6\0\0\ay\0\0\x4\x5\0\0\x3\xc7\0\0\0\n\0\0\au\0\0\x4\x1\0\0\0\0\0\0\0\0\a\x80\0\0\x3\xc7\0\0\0\n\0\0\au\0\0\x4\x1)

View File

@@ -38,6 +38,7 @@ configuration {
border: 4px 4px 0 0; border: 4px 4px 0 0;
height: 60%; height: 60%;
width: 30%; width: 30%;
padding: 0em;
} }
#inputbar { #inputbar {
background-color: @background-alt; background-color: @background-alt;
@@ -45,17 +46,30 @@ configuration {
} }
#case-indicator { #case-indicator {
enabled: false; enabled: false;
background-color: @background-alt;
text-color: @foreground-alt;
} }
#prompt { #prompt {
enabled: false; enabled: false;
background-color: @background-alt; }
font: "IBM Plex Sans Medium 12"; #textbox-prompt-colon {
padding: 0.5em; enabled: false;
} }
#entry { #entry {
background-color: @background-alt; background-color: inherit;
font: "IBM Plex Sans 12";
padding: 0.5em;
}
#num-filtered-rows {
background-color: inherit;
font: "IBM Plex Sans 12";
padding: 0.5em;
}
#textbox-num-sep {
background-color: inherit;
font: "IBM Plex Sans 12";
padding: 0.5em 0em;
}
#num-rows {
background-color: inherit;
font: "IBM Plex Sans 12"; font: "IBM Plex Sans 12";
padding: 0.5em; padding: 0.5em;
} }
@@ -69,11 +83,18 @@ configuration {
#listview { #listview {
padding: 1em; padding: 1em;
border: none;
} }
#scrollbar {
handle-color: @background-alt;
enabled: false;
}
#element { #element {
orientation: vertical;
padding: 1em; padding: 1em;
} }
#element alternate.normal {
background-color: @background;
}
#element normal active { #element normal active {
text-color: @cyan; text-color: @cyan;
} }

View File

@@ -12,13 +12,13 @@ alt + Tab
alt + Escape alt + Escape
pkill -USR1 -x sxhkd pkill -USR1 -x sxhkd
ctrl + alt + l ctrl + alt + l
loginctl lock-session /usr/lib/x86_64-linux-gnu/libexec/kscreenlocker_greet
## APPLICATION TOGGLES ## APPLICATION TOGGLES
alt + p alt + p
killall pavucontrol-qt || pavucontrol-qt killall pavucontrol-qt || pavucontrol-qt
alt + shift + m alt + shift + m
killall picom || ~/.firestarter/firestarter start compositor killall compton || ~/.firestarter/firestarter start compositor
## HARDWARE CONTROLS ## HARDWARE CONTROLS
XF86Audio{Raise,Lower}Volume XF86Audio{Raise,Lower}Volume

View File

@@ -1,8 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<defs>
<style id="current-color-scheme" type="text/css">
.ColorScheme-Text { color:#ebdbb2; } .ColorScheme-Highlight { color:#4285f4; }
</style>
</defs>
<path style="fill:currentColor" class="ColorScheme-Text" d="M 8 1 C 4.137 1 1 4.137 1 8 C 1 11.863 4.137 15 8 15 C 11.863 15 15 11.863 15 8 C 15 4.137 11.863 1 8 1 z M 8 3 C 9.0194 3 9.959 3.28763 10.75 3.8125 L 3.8125 10.75 C 3.28763 9.95898 3 9.0194 3 8 C 3 5.2407 5.2408 3 8 3 z M 12.1875 5.25 C 12.71237 6.04102 13 6.9806 13 8 C 13 10.7592 10.7592 13 8 13 C 6.9806 13 6.041 12.71237 5.25 12.1875 L 12.1875 5.25 z"/>
</svg>

Before

Width:  |  Height:  |  Size: 674 B

View File

@@ -1,8 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" version="1.1">
<defs>
<style id="current-color-scheme" type="text/css">
.ColorScheme-Text { color:#ebdbb2; } .ColorScheme-Highlight { color:#4285f4; }
</style>
</defs>
<path style="fill:currentColor" class="ColorScheme-Text" d="M 3,1 C 1.89,1 1,1.89 1,3 V 13 C 1,14.11 1.89,15 3,15 H 13 C 14.11,15 15,14.11 15,13 V 3 C 15,1.89 14.11,1 13,1 Z M 8,4 C 10.21,4 12,5.79 12,8 V 8.5 C 12,9.33 11.33,10 10.5,10 10.06,10 9.64,9.8 9.35,9.46 9,9.79 8.52,10 8,10 6.9,10 6,9.1 6,8 6,6.9 6.9,6 8,6 9.1,6 10,6.9 10,8 V 8.5 C 10,8.78 10.22,9 10.5,9 10.78,9 11,8.78 11,8.5 V 8 C 11,6.34 9.66,5 8,5 6.34,5 5,6.34 5,8 5,9.66 6.34,11 8,11 H 10.5 C 10.5,11 11,11 11,11.5 10.97,12 10.5,12 10.5,12 H 8 C 5.79,12 4,10.21 4,8 4,5.79 5.79,4 8,4 Z M 8,7 C 7.45,7 7,7.45 7,8 7,8.55 7.45,9 8,9 8.55,9 9,8.55 9,8 9,7.45 8.55,7 8,7 Z"/>
</svg>

Before

Width:  |  Height:  |  Size: 887 B

View File

@@ -1,8 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" version="1.1" viewBox="0 0 16 16">
<defs>
<style id="current-color-scheme" type="text/css">
.ColorScheme-Text { color:#ebdbb2; } .ColorScheme-Highlight { color:#4285f4; }
</style>
</defs>
<path style="fill:currentColor" class="ColorScheme-Text" d="M 3 1 L 3 11 L 1 11 L 1 13 L 3 13 L 3 15 L 5 15 L 5 13 L 15 13 L 15 11 L 5 11 L 5 9.5 L 7.90625 7.3203125 L 10.027344 9.4414062 L 15 4.0878906 L 15 1.1484375 L 9.9726562 6.5585938 L 8.09375 4.6796875 L 5 7 L 5 1 L 3 1 z"/>
</svg>

Before

Width:  |  Height:  |  Size: 551 B

View File

@@ -1,9 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" version="1.1" viewBox="0 0 16 16">
<defs>
<linearGradient id="linearGradient4177" x1="8" x2="8" y1="15" y2="1" gradientUnits="userSpaceOnUse">
<stop style="stop-color:#ebdbb2" offset="0"/>
<stop style="stop-color:#ebdbb2;stop-opacity:0" offset="1" stop-opacity="0"/>
</linearGradient>
</defs>
<path style="fill:url(#linearGradient4177)" d="M 1 1 L 1 15 L 15 15 L 15 1 L 1 1 z"/>
</svg>

Before

Width:  |  Height:  |  Size: 462 B

View File

@@ -1,8 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<defs>
<style id="current-color-scheme" type="text/css">
.ColorScheme-Text { color:#ebdbb2; } .ColorScheme-Highlight { color:#4285f4; }
</style>
</defs>
<path style="fill:currentColor" class="ColorScheme-Text" d="M 11 2 A 3 3 0 0 0 8.1757812 4 L 1 4 L 1 6 L 8.1738281 6 A 3 3 0 0 0 11 8 A 3 3 0 0 0 13.824219 6 L 15 6 L 15 4 L 13.826172 4 A 3 3 0 0 0 11 2 z M 6 8 A 3 3 0 0 0 3.1757812 10 L 1 10 L 1 12 L 3.1738281 12 A 3 3 0 0 0 6 14 A 3 3 0 0 0 8.8242188 12 L 15 12 L 15 10 L 8.8261719 10 A 3 3 0 0 0 6 8 z"/>
</svg>

Before

Width:  |  Height:  |  Size: 613 B

View File

@@ -1,8 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<defs>
<style id="current-color-scheme" type="text/css">
.ColorScheme-Text { color:#ebdbb2; } .ColorScheme-Highlight { color:#4285f4; }
</style>
</defs>
<path style="fill:currentColor" class="ColorScheme-Text" d="M 4 1 L 4 3.1738281 A 3 3 0 0 0 2 6 A 3 3 0 0 0 4 8.8242188 L 4 15 L 6 15 L 6 8.8261719 A 3 3 0 0 0 8 6 A 3 3 0 0 0 6 3.1757812 L 6 1 L 4 1 z M 10 1 L 10 8.1738281 A 3 3 0 0 0 8 11 A 3 3 0 0 0 10 13.824219 L 10 15 L 12 15 L 12 13.826172 A 3 3 0 0 0 14 11 A 3 3 0 0 0 12 8.1757812 L 12 1 L 10 1 z"/>
</svg>

Before

Width:  |  Height:  |  Size: 613 B

View File

@@ -1,8 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<defs>
<style id="current-color-scheme" type="text/css">
.ColorScheme-Text { color:#ebdbb2; } .ColorScheme-Highlight { color:#4285f4; }
</style>
</defs>
<path style="fill:currentColor" class="ColorScheme-Text" d="M 1 0 L 1 16 L 3 16 L 3 15 L 3 0 L 1 0 z M 3 15 L 5.5 15 L 6.5625 12 L 11.4375 12 L 12.5 15 L 15.28125 15 L 10 1 L 8 1 L 3 15 z M 9 5 L 10.75 10 L 7.25 10 L 9 5 z"/>
</svg>

Before

Width:  |  Height:  |  Size: 480 B

View File

@@ -1,8 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<defs>
<style id="current-color-scheme" type="text/css">
.ColorScheme-Text { color:#ebdbb2; } .ColorScheme-Highlight { color:#4285f4; }
</style>
</defs>
<path style="fill:currentColor" class="ColorScheme-Text" d="M 9 1 L 9 8 L 14 8 L 14 1 L 9 1 z M 2 3 L 2 8 L 7 8 L 7 3 L 2 3 z M 1 10 L 1 12 L 15 12 L 15 10 L 1 10 z M 9 13 L 9 15 L 14 15 L 14 13 L 9 13 z"/>
</svg>

Before

Width:  |  Height:  |  Size: 461 B

View File

@@ -1,8 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<defs>
<style id="current-color-scheme" type="text/css">
.ColorScheme-Text { color:#ebdbb2; } .ColorScheme-Highlight { color:#4285f4; }
</style>
</defs>
<path style="fill:currentColor" class="ColorScheme-Text" d="M 7 1 L 7 2 L 3 2 L 3 6 L 7 6 L 7 10 L 3 10 L 3 14 L 7 14 L 7 15 L 9 15 L 9 14 L 13 14 L 13 10 L 9 10 L 9 6 L 13 6 L 13 2 L 9 2 L 9 1 L 7 1 z"/>
</svg>

Before

Width:  |  Height:  |  Size: 459 B

View File

@@ -1,8 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<defs>
<style id="current-color-scheme" type="text/css">
.ColorScheme-Text { color:#ebdbb2; } .ColorScheme-Highlight { color:#4285f4; }
</style>
</defs>
<path style="fill:currentColor" class="ColorScheme-Text" d="M 4 1 L 4 15 L 6 15 L 6 1 L 4 1 z M 8 2 L 8 7 L 15 7 L 15 2 L 8 2 z M 1 9 L 1 14 L 3 14 L 3 9 L 1 9 z M 8 9 L 8 14 L 13 14 L 13 9 L 8 9 z"/>
</svg>

Before

Width:  |  Height:  |  Size: 455 B

View File

@@ -1,8 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<defs>
<style id="current-color-scheme" type="text/css">
.ColorScheme-Text { color:#ebdbb2; } .ColorScheme-Highlight { color:#4285f4; }
</style>
</defs>
<path style="fill:currentColor" class="ColorScheme-Text" d="M 1 0 L 1 2 L 3 2 L 3 0 L 1 0 z M 3 2 L 3 16 L 5 16 L 5 15 L 15 15 L 15 11 L 5 11 L 5 7 L 15 7 L 15 3 L 5 3 L 5 2 L 3 2 z"/>
</svg>

Before

Width:  |  Height:  |  Size: 439 B

View File

@@ -1,8 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<defs>
<style id="current-color-scheme" type="text/css">
.ColorScheme-Text { color:#ebdbb2; } .ColorScheme-Highlight { color:#4285f4; }
</style>
</defs>
<path style="fill:currentColor" class="ColorScheme-Text" d="M 2 1 L 2 15 L 4 15 L 4 14 L 14 14 L 14 10 L 4 10 L 4 6 L 14 6 L 14 2 L 4 2 L 4 1 L 2 1 z"/>
</svg>

Before

Width:  |  Height:  |  Size: 407 B

View File

@@ -1,8 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<defs>
<style id="current-color-scheme" type="text/css">
.ColorScheme-Text { color:#ebdbb2; } .ColorScheme-Highlight { color:#4285f4; }
</style>
</defs>
<path style="fill:currentColor" class="ColorScheme-Text" d="M 10 1 L 10 15 L 12 15 L 12 1 L 10 1 z M 1 2 L 1 7 L 8 7 L 8 2 L 1 2 z M 3 9 L 3 14 L 8 14 L 8 9 L 3 9 z M 13 9 L 13 14 L 15 14 L 15 9 L 13 9 z"/>
</svg>

Before

Width:  |  Height:  |  Size: 461 B

View File

@@ -1,8 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<defs>
<style id="current-color-scheme" type="text/css">
.ColorScheme-Text { color:#ebdbb2; } .ColorScheme-Highlight { color:#4285f4; }
</style>
</defs>
<path style="fill:currentColor" class="ColorScheme-Text" d="M 13 0 L 13 2 L 15 2 L 15 0 L 13 0 z M 13 2 L 11 2 L 11 3 L 1 3 L 1 7 L 11 7 L 11 11 L 1 11 L 1 15 L 11 15 L 11 16 L 13 16 L 13 2 z"/>
</svg>

Before

Width:  |  Height:  |  Size: 449 B

Some files were not shown because too many files have changed in this diff Show More