diff --git a/README.md b/README.md index 06f7327..b71cd64 100644 --- a/README.md +++ b/README.md @@ -16,13 +16,13 @@ SFMono also provides icons. + `wob` (progress bar) + `wofi` (launcher) + `slurp`, `grim`, `swappy` (screenshot) ++ [`wmrctl`](https://git.sr.ht/~brocellous/wlrctl) (window switcher) ### other (used in scripts) + `fzf` (used in many places) + `ripgrep` + `ripgrep-all` (used in grep scripts) + `fd` (rust find; used in scripts) -+ `fu` (find icons; not needed) + all `fcitx5` stuff (data, gtk, qt, mozc) ### theming stuff diff --git a/files/nvim/.config/nvim/init.lua b/files/nvim/.config/nvim/init.lua index c7d6b39..2bb0acf 100644 --- a/files/nvim/.config/nvim/init.lua +++ b/files/nvim/.config/nvim/init.lua @@ -2,6 +2,9 @@ -- Treesitter with `:TSUpdate` -- LSP with `:LSPInstall`, log with `:LSPInfo` +-- Don't load this in plugins.lua +vim.cmd("set termguicolors") + require 'plugins' -- Load plugins require 'settings' -- General settings require 'mappings' -- Keyboard mappings diff --git a/files/nvim/.config/nvim/lua/plugins.lua b/files/nvim/.config/nvim/lua/plugins.lua index 96def91..2d892f3 100644 --- a/files/nvim/.config/nvim/lua/plugins.lua +++ b/files/nvim/.config/nvim/lua/plugins.lua @@ -17,7 +17,6 @@ return require('packer').startup(function(use) use({ 'sainnhe/everforest', config = function() - vim.cmd("set termguicolors") vim.cmd("set background=light") vim.cmd("let g:everforest_background = 'hard'") vim.cmd("colorscheme everforest") diff --git a/files/sway/.config/sway/config b/files/sway/.config/sway/config index d875fb0..0fc37b8 100644 --- a/files/sway/.config/sway/config +++ b/files/sway/.config/sway/config @@ -95,17 +95,32 @@ input type:keyboard { bindsym $mod+Shift+Backspace kill # wofi - set $files fd -I "\.pdf$" $HOME | cut -f 4- -d "/" - set $lock_screen \ - printf "/home/marc/.local/bin/lock.sh\nsystemctl suspend\nswaymsg reload\nshutdown now\nloginctl terminate-user marc" - bindsym $mod+d exec wofi --show drun -p 'Open application' - bindsym $mod+Shift+d exec wofi --show run -p 'dmenu' - bindsym $mod+p exec $files \ - | wofi -d -p 'Search pdfs' -W 70% \ - | xargs -d '\n' -r xdg-open - bindsym $mod+Ctrl+Backspace exec $lock_screen \ - | wofi -d -p "Power" -L 6 \ - | xargs -d '\n' -r /bin/bash -c + # show normal applications + bindsym $mod+d exec wofi --show drun -p 'Open application' + + # show binaries in PATH + bindsym $mod+Shift+d exec wofi --show run -p 'dmenu' + + # show all pdfs in HOME + bindsym $mod+p exec \ + fd -I "\.pdf$" $HOME \ + | cut -f 4- -d "/" \ + | wofi -d -p 'Search pdfs' -W 70% \ + | xargs -d '\n' -r xdg-open + + # show shutdown menu + bindsym $mod+Ctrl+Backspace exec \ + printf "/home/marc/.local/bin/lock.sh\nsystemctl suspend\nswaymsg reload\nshutdown now\nloginctl terminate-user marc" \ + | wofi -d -p "Power" -L 6 \ + | xargs -d '\n' -r /bin/bash -c + + # switch windows + bindsym $mod+w exec \ + wlrctl window list \ + | awk '{print $1}' \ + | sed 's/://' \ + | wofi --dmenu \ + | xargs -r wlrctl window focus # Screenshot bindsym $mod+Shift+s exec grim -g "$(slurp)" - | wl-copy