diff --git a/README.md b/README.md index 64e31be..1638f51 100644 --- a/README.md +++ b/README.md @@ -11,12 +11,12 @@ SFMono also provides icons. ## 'invisible' deps ### for sway -+ `waybar` (cool bar) ++ `waybar` + `SwayNotificationCenter` - default conf + `bemenu` (dmenu replacement) + `slurp`, `grim`, `swappy` (screenshot) -### other +### other (used in scripts) + `fzf` + `ripgrep` + `ripgrep-all` diff --git a/files/alacritty/.config/alacritty/alacritty.yml b/files/alacritty/.config/alacritty/alacritty.yml index d060457..6dc2a4c 100644 --- a/files/alacritty/.config/alacritty/alacritty.yml +++ b/files/alacritty/.config/alacritty/alacritty.yml @@ -3,8 +3,8 @@ env: window: padding: - x: 10 - y: 10 + x: 0 + y: 0 font: normal: diff --git a/files/sway/.config/sway/config b/files/sway/.config/sway/config index a1411cc..c083b4a 100644 --- a/files/sway/.config/sway/config +++ b/files/sway/.config/sway/config @@ -35,8 +35,8 @@ set $bar_bg #323232 # clientclass border backgr. text indicator client.focused $green $green #ffffff $green -client.focused_inactive $baseA2 $baseA2 $baseB0 $baseA2 -client.unfocused $baseA2 $baseA2 $baseB0 $baseA2 +client.focused_inactive $bar_bg $bar_bg $baseB0 $bar_bg +client.unfocused $bar_bg $bar_bg $baseB0 $bar_bg client.urgent $yellow $yellow $baseB3 $orange # Output configuration @@ -86,11 +86,11 @@ input type:keyboard { bindsym $mod+Shift+Backspace kill # bemenu - set $bemenu bemenu -l 7 --tf "#859900" --hf "#859900" --nb "#282828" --hb "#383838" --tb "#282828" --fb "#282828" --fn "SFMono Nerd Font 13" -i -H 30 + set $bemenu bemenu -l 7 --tf "#859900" --hf "#282828" --nb "#282828" --hb "#859900" --tb "#282828" --fb "#282828" --fn "SFMono Nerd Font 13" -i -H 25 set $files fd -I "pdf$" $HOME | cut -f 4- -d "/" set $lock_screen printf "/home/marc/.local/bin/lock.sh\nsystemctl suspend\nshutdown now" | $bemenu -l 3 -p "power" | xargs -d '\n' -r /bin/bash -c - bindsym $mod+d exec dmenu_path | $bemenu | xargs swaymsg exec -- - bindsym $mod+p exec $files | $bemenu -l 20 -p 'pdfs' | xargs -d '\n' -r xdg-open + bindsym $mod+d exec dmenu_path | $bemenu -p 'run' | xargs swaymsg exec -- + bindsym $mod+p exec $files | $bemenu -l 20 -p 'pdf' | xargs -d '\n' -r xdg-open bindsym $mod+Ctrl+Backspace exec $lock_screen # Screenshot @@ -168,15 +168,18 @@ input type:keyboard { bindsym $mod+Control+$right move workspace to output right # Layout stuff: + # titlebar_border_thickness 0 + # titlebar_padding 0 workspace_layout stacking title_align center - default_border pixel 3 - default_floating_border pixel 3 + default_border pixel 0 + default_floating_border pixel 0 # hide title and border, if only one application open hide_edge_borders --i3 smart - gaps inner 5 - smart_gaps off + # just show gaps between windows + # gaps inner 5 + # gaps outer -5 # Make the current focus fullscreen bindsym $mod+f fullscreen @@ -201,7 +204,6 @@ input type:keyboard { for_window [app_id="org.keepassxc.KeePassXC"] move container to workspace number $ws9 # Status Bar -# man 5 sway-bar bar { position top tray_output none diff --git a/files/tmux/.tmux.conf b/files/tmux/.tmux.conf index 6932f36..426b011 100644 --- a/files/tmux/.tmux.conf +++ b/files/tmux/.tmux.conf @@ -50,16 +50,8 @@ set-option -g mouse on set -g base-index 1 setw -g pane-base-index 1 -# some styling -#set -g status-bg white -#set -g window-status-current-style "underscore, bold" -#set -g window-status-current-format "#I:#W" -#set -g window-status-format "#I:#W" -#set -g status-left " " -#set -g status-right "#S @ #h - %I:%M %p " - +# styling set -g status-position top -set -g pane-border-lines heavy # generated, using https://github.com/edkolev/tmuxline.vim set -g status-justify "left" diff --git a/files/vim/.vimrc b/files/vim/.vimrc index cf43243..5c319b4 100644 --- a/files/vim/.vimrc +++ b/files/vim/.vimrc @@ -85,4 +85,6 @@ let g:netrw_liststyle = 3 " Tree-like structure let g:netrw_banner = 0 " Remove useless banner at the top of netrw " ============================== Macros and Mappings -map e :CtrlP +map :CtrlP +map :CtrlPLine +map :w diff --git a/files/waybar/.config/waybar/config b/files/waybar/.config/waybar/config index 5318828..3427d25 100644 --- a/files/waybar/.config/waybar/config +++ b/files/waybar/.config/waybar/config @@ -16,7 +16,7 @@ "position": "top", // If height property would be not present, it'd be calculated dynamically - "height": 30, + "height": 36, "modules-left": [ "sway/workspaces", @@ -25,6 +25,7 @@ "modules-center": [ ], "modules-right": [ + "temperature", "cpu", "backlight", "battery", @@ -124,7 +125,7 @@ "sway/window": { "format": "{}", - "max-length": 80 + "max-length": 120 }, "sway/workspaces": { @@ -134,7 +135,7 @@ "format-icons": { "1": "", "2": "", - "3": "ﭮ", + "3": "‭ﭮ‬", "4": "", "5": "", "8": "", @@ -164,6 +165,7 @@ "temperature": { "critical-threshold": 80, + "thermal-zone": 10, "interval": 5, "format": "{icon} {temperatureC}°C", "format-icons": [ diff --git a/files/waybar/.config/waybar/style.css b/files/waybar/.config/waybar/style.css index 0e5b56f..a2011da 100644 --- a/files/waybar/.config/waybar/style.css +++ b/files/waybar/.config/waybar/style.css @@ -54,7 +54,7 @@ font-size: 13px; } -/* Each module l*/ +/* Each module */ #idle_inhibitor, #battery, #backlight, @@ -66,13 +66,14 @@ #network, #pulseaudio, #temperature, +#window, +#workspaces button, #tray { border-radius: 5px; background-color: #282828; - margin-top: 3px; - margin-bottom: 3px; + margin-top: 5px; + margin-bottom: 5px; margin-left: 5px; - padding-bottom: 2px; padding-left: 10px; padding-right: 10px; } @@ -161,10 +162,6 @@ /* No styles */ } -#custom-spotify { - color: rgb(102, 220, 105); -} - #temperature { /* No styles */ } @@ -174,31 +171,12 @@ } #tray { - /* No styles */ + /* Empty space on the right */ + margin-right: 5px; } -#window { - /* font-weight: bold; */ - border-radius: 5px; - background-color: #282828; - margin-top: 3px; - margin-bottom: 3px; - margin-left: 5px; - padding-bottom: 2px; - padding-left: 10px; - padding-right: 10px; -} - - #workspaces button { - border-top: 2px solid transparent; - padding-bottom: 2px; - padding-left: 10px; - padding-right: 10px; color: white; - border-radius: 5px; - margin-top: 3px; - margin-bottom: 3px; } #workspaces button.focused { @@ -208,6 +186,18 @@ } #workspaces button.urgent { - background-color: #2c303c; + background-color: #dc322f; } +/* remove weird GTK hover effect */ +#workspaces button:hover { + box-shadow: inherit; + text-shadow: inherit; + background: #282828; + border: #282828; +} + +#workspaces button.focused:hover { + background: #859900; + border: #859900; +} diff --git a/presets/notes.tex b/presets/notes.tex index faa8caa..9657fc4 100644 --- a/presets/notes.tex +++ b/presets/notes.tex @@ -23,24 +23,24 @@ \usepackage{wrapfig} %%% make \paragraph{} and \subparagraph{} look like a normal subsection -\makeatletter -\renewcommand\paragraph{% - \@startsection{paragraph}{4}{0mm}% - {-\baselineskip}% - {.5\baselineskip}% - {\normalfont\normalsize\bfseries}} -\makeatother - -\makeatletter -\renewcommand\subparagraph{% - \@startsection{subparagraph}{4}{0mm}% - {-\baselineskip}% - {.5\baselineskip}% - {\normalfont\normalsize\bfseries}} -\makeatother - -\setcounter{tocdepth}{5} -\setcounter{secnumdepth}{5} +%\makeatletter +%\renewcommand\paragraph{% +% \@startsection{paragraph}{4}{0mm}% +% {-\baselineskip}% +% {.5\baselineskip}% +% {\normalfont\normalsize\bfseries}} +%\makeatother +% +%\makeatletter +%\renewcommand\subparagraph{% +% \@startsection{subparagraph}{4}{0mm}% +% {-\baselineskip}% +% {.5\baselineskip}% +% {\normalfont\normalsize\bfseries}} +%\makeatother +% +%\setcounter{tocdepth}{5} +%\setcounter{secnumdepth}{5} %%% links in toc etc \usepackage{hyperref}