diff options
| -rw-r--r-- | alacritty/alacritty.yml | 9 | ||||
| -rw-r--r-- | cudatext/user.json | 6 | ||||
| -rw-r--r-- | dunst/dunstrc | 2 | ||||
| -rw-r--r-- | fontconfig/fonts.conf | 28 | ||||
| -rw-r--r-- | foot/foot.ini | 4 | ||||
| -rw-r--r-- | i3/config | 2 | ||||
| -rwxr-xr-x | install.sh | 14 | ||||
| -rw-r--r-- | nvim/init.lua | 2 | ||||
| -rw-r--r-- | polybar/config | 4 | ||||
| -rw-r--r-- | python/requirements.pip310.txt | 1 | ||||
| -rw-r--r-- | qutebrowser/autoconfig.yml | 6 | ||||
| -rw-r--r-- | rofi/config.rasi | 2 | ||||
| -rw-r--r-- | sublime-text/Adaptive.sublime-theme | 4 | ||||
| -rw-r--r-- | sublime-text/Preferences.sublime-settings | 2 | ||||
| -rw-r--r-- | sway/config | 2 | ||||
| -rwxr-xr-x | sway/terminal.sh | 16 | ||||
| -rw-r--r-- | tmux/.tmux.conf | 46 | ||||
| -rw-r--r-- | tmux/tmux.conf | 59 | ||||
| -rw-r--r-- | waybar/style.css | 4 |
19 files changed, 126 insertions, 87 deletions
diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml index 8b484eb..1285d95 100644 --- a/alacritty/alacritty.yml +++ b/alacritty/alacritty.yml @@ -70,22 +70,19 @@ scrolling: font: # Normal (roman) font face normal: - family: RobotoMono Nerd Font - # family: monospace + family: monospace # The `style` can be specified to pick a specific face. style: Regular # Bold font face bold: - family: RobotoMono Nerd Font - # family: monospace + family: monospace # The `style` can be specified to pick a specific face. style: Bold # Italic font face italic: - family: RobotoMono Nerd Font - # family: monospace + family: monospace # The `style` can be specified to pick a specific face. style: Italic diff --git a/cudatext/user.json b/cudatext/user.json index 4e25129..73d7ecd 100644 --- a/cudatext/user.json +++ b/cudatext/user.json @@ -1,7 +1,7 @@ { - "font_name__linux" : "Roboto Mono", + "font_name__linux" : "monospace", "font_size__linux" : 12, - "ui_font_name__linux" : "Inter", + "ui_font_name__linux" : "sans-serif", "ui_font_size__linux" : 12, "ui_font_output_size__linux" : 12, "show_cur_line" : true, @@ -22,4 +22,4 @@ "ui_tree_theme" : "for_dark_16x16", "ui_theme" : "gruvbox (dark) (medium)", "ui_theme_syntax" : "gruvbox (dark) (medium)" -}
\ No newline at end of file +} diff --git a/dunst/dunstrc b/dunst/dunstrc index 2466cc2..cc68a90 100644 --- a/dunst/dunstrc +++ b/dunst/dunstrc @@ -86,7 +86,7 @@ ### Text ### - font = Inter 10 + font = sans-serif 10 # The spacing between lines. If the height is smaller than the # font height, it will get raised to the font height. diff --git a/fontconfig/fonts.conf b/fontconfig/fonts.conf new file mode 100644 index 0000000..c1224d8 --- /dev/null +++ b/fontconfig/fonts.conf @@ -0,0 +1,28 @@ +<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd"> +<fontconfig> + <alias> + <family>sans-serif</family> + <prefer> + <family>Inter</family> + <family>NotoSans Nerd Font</family> + <family>Noto Sans</family> + </prefer> + </alias> + <alias> + <family>serif</family> + <prefer> + <family>NotoSerif Nerd Font</family> + <family>Noto Serif</family> + </prefer> + </alias> + <alias> + <family>monospace</family> + <prefer> + <family>RobotoMono Nerd Font</family> + <family>NotoMono Nerd Font</family> + <family>Roboto Mono</family> + <family>Noto Mono</family> + </prefer> + </alias> +</fontconfig> diff --git a/foot/foot.ini b/foot/foot.ini index 862b61e..98b09a6 100644 --- a/foot/foot.ini +++ b/foot/foot.ini @@ -8,11 +8,11 @@ # title=foot # locked-title=no -font=RobotoMono Nerd Font:size=14 +font=monospace:size=14 # font-bold=<bold variant of regular font> # font-italic=<italic variant of regular font> # font-bold-italic=<bold+italic variant of regular font> -# line-height=18 +line-height=20 # letter-spacing=0 # horizontal-letter-offset=0 # vertical-letter-offset=2 @@ -18,7 +18,7 @@ workspace $ws7 output DP1-3 workspace $ws8 output DP1-3 set $mod Mod4 -font pango:Inter Medium 12 +font pango:sans-serif 12 floating_modifier $mod default_border pixel 4 @@ -78,6 +78,9 @@ fi # dunst symlink ~/.dotfiles/dunst ~/.config/dunst +# fontconfig +symlink ~/.dotfiles/fontconfig ~/.config/fontconfig + # foot symlink ~/.dotfiles/foot ~/.config/foot @@ -120,22 +123,21 @@ symlink ~/.dotfiles/qt-designer/qt-designer.desktop \ # qutebrowser mkdir -p ~/.config/qutebrowser -symlink ~/.dotfiles/qutebrowser/autoconfig.yml ~/.config/qutebrowser/autoconfig.yml +symlink ~/.dotfiles/qutebrowser/autoconfig.yml \ + ~/.config/qutebrowser/autoconfig.yml # radio symlink ~/.dotfiles/radio/student ~/bin/radio-student symlink ~/.dotfiles/radio/sljeme ~/bin/radio-sljeme # ranger -mkdir -p ~/.config/ranger -symlink ~/.dotfiles/ranger/rc.conf ~/.config/ranger/rc.conf +symlink ~/.dotfiles/ranger ~/.config/ranger # river symlink ~/.dotfiles/river ~/.config/river # rofi -mkdir -p ~/.config/rofi -symlink ~/.dotfiles/rofi/config.rasi ~/.config/rofi/config.rasi +symlink ~/.dotfiles/rofi ~/.config/rofi # setkbmap symlink ~/.dotfiles/setkbmap/setkbmap ~/bin/setkbmap @@ -177,7 +179,7 @@ done symlink ~/.dotfiles/sway ~/.config/sway # tmux -symlink ~/.dotfiles/tmux/.tmux.conf ~/.tmux.conf +symlink ~/.dotfiles/tmux ~/.config/tmux # vm mkdir -p ~/vm/alpine diff --git a/nvim/init.lua b/nvim/init.lua index e3b859a..0de9dde 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -105,7 +105,7 @@ vim.api.nvim_create_autocmd({"BufWritePost"}, { -- gui settings vim.o.linespace = 4 -vim.o.guifont = "Roboto_Mono:h12" +vim.o.guifont = "monospace:h12" -- neovide settings if vim.g.neovide then diff --git a/polybar/config b/polybar/config index 134e84a..2e67a63 100644 --- a/polybar/config +++ b/polybar/config @@ -7,8 +7,8 @@ height = 30 padding = 1 background = #000000 foreground = #ffffff -font-0 = "RobotoMono Nerd Font:size=12" -font-1 = "Inter Medium:size=12" +font-0 = "monospace:size=12" +font-1 = "sans-serif:size=12" module-margin = 1 separator = | separator-foreground = #919191 diff --git a/python/requirements.pip310.txt b/python/requirements.pip310.txt index 40f9460..eb2c599 100644 --- a/python/requirements.pip310.txt +++ b/python/requirements.pip310.txt @@ -1,3 +1,2 @@ doit -jedi-language-server pip diff --git a/qutebrowser/autoconfig.yml b/qutebrowser/autoconfig.yml index 4727ac8..90ed30f 100644 --- a/qutebrowser/autoconfig.yml +++ b/qutebrowser/autoconfig.yml @@ -7,7 +7,7 @@ config_version: 2 settings: fonts.default_family: - global: Roboto Mono + global: monospace fonts.default_size: global: 12pt fonts.messages.info: @@ -15,9 +15,9 @@ settings: fonts.statusbar: global: default_size default_family fonts.tabs.selected: - global: default_size Inter + global: default_size sans-serif fonts.tabs.unselected: - global: default_size inter + global: default_size sans-serif qt.highdpi: global: true tabs.indicator.padding: diff --git a/rofi/config.rasi b/rofi/config.rasi index a792def..3802bd7 100644 --- a/rofi/config.rasi +++ b/rofi/config.rasi @@ -1,6 +1,6 @@ configuration { modi: "drun,run,window"; - font: "Inter Medium 12"; + font: "sans-serif 12"; show-icons: true; } diff --git a/sublime-text/Adaptive.sublime-theme b/sublime-text/Adaptive.sublime-theme index 4872ecf..7eaee3c 100644 --- a/sublime-text/Adaptive.sublime-theme +++ b/sublime-text/Adaptive.sublime-theme @@ -3,7 +3,7 @@ "class": "sidebar_label", "font.bold": false, "font.size": 16, - "font.face": "Inter", + "font.face": "sans-serif", "offset": [20, 0] }, { @@ -18,7 +18,7 @@ { "class": "label_control", "font.size": 14, - "font.face": "Inter", + "font.face": "sans-serif", "content_margin": 5 } ] diff --git a/sublime-text/Preferences.sublime-settings b/sublime-text/Preferences.sublime-settings index e33b7bf..4041136 100644 --- a/sublime-text/Preferences.sublime-settings +++ b/sublime-text/Preferences.sublime-settings @@ -43,7 +43,7 @@ "file_exclude_patterns": [ ], - "font_face": "Roboto Mono", + "font_face": "monospace", "font_size": 12, "highlight_line": true, "highlight_modified_tabs": true, diff --git a/sway/config b/sway/config index a453178..4cf9201 100644 --- a/sway/config +++ b/sway/config @@ -6,7 +6,7 @@ seat seat0 xcursor_theme default 32 input type:touchpad tap enable -font "pango:Inter Medium 12" +font "pango:sans-serif 12" floating_modifier $mod default_border pixel 4 diff --git a/sway/terminal.sh b/sway/terminal.sh index d3d1b81..25559c3 100755 --- a/sway/terminal.sh +++ b/sway/terminal.sh @@ -9,18 +9,18 @@ focused_workspace=$(swaymsg -t get_workspaces -r | jq -r '.[] | select(.focused == true) | .name') if [ "$focused_workspace" = "$term_workspace" ]; then - swaymsg workspace back_and_forth + swaymsg -q workspace back_and_forth else - swaymsg workspace $term_workspace - swaymsg move workspace to $focused_output - swaymsg workspace $term_workspace + swaymsg -q workspace $term_workspace + swaymsg -q move workspace to $focused_output + swaymsg -q workspace $term_workspace if ! (swaymsg -t get_tree -r | jq -e "recurse(.nodes[]) | select(.app_id == \"$term_app_id\")" > /dev/null); then - # exec alacritty --class $term_app_id -e \ - # tmux new-session -A -s default - exec foot --app-id $term_app_id \ - tmux new-session -A -s default + exec alacritty --class $term_app_id -e \ + tmux new-session -A -s default + # exec foot --app-id $term_app_id \ + # tmux new-session -A -s default fi fi diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf deleted file mode 100644 index 60ce1c0..0000000 --- a/tmux/.tmux.conf +++ /dev/null @@ -1,46 +0,0 @@ -set -g escape-time 0 - -set -g prefix C-a -bind C-a send-prefix -unbind C-b - -set -g set-clipboard on - -setw -g base-index 1 - -setw -g mode-keys vi - -set -g default-terminal "screen-256color" -set -g default-command /bin/zsh - -set -g mouse on - -bind-key -n 'C-M-Left' prev -bind-key -n 'C-M-Right' next -bind-key -n 'C-M-Up' new-window -bind-key -n 'C-M-Down' confirm-before -p "kill-window #W? (y/n)" kill-window - -bind-key -n 'C-M-h' prev -bind-key -n 'C-M-l' next -bind-key -n 'C-M-k' new-window -bind-key -n 'C-M-j' confirm-before -p "kill-window #W? (y/n)" kill-window - -#bind-key -n 'C-M-\\' split-window -h -#bind-key -n 'C-M-\-' split-window -bind-key -n 'C-M-x' confirm-before -p "kill-pane #P? (y/n)" kill-pane - - -set -g status-style "fg=black,bg=colour34" -bind-key 'Up' select-pane -P 'fg=white,bg=black' -bind-key 'Down' select-pane -P 'fg=black,bg=white' - -set -g status-right "%Y-%m-%d %H:%M" - -bind-key ] run "sh ~/.dotfiles/tmux/paste.sh" - - -set -g @plugin 'christoomey/vim-tmux-navigator' - -if "test ! -d ~/.tmux/plugins/tpm" \ - "run 'git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm && ~/.tmux/plugins/tpm/bin/install_plugins'" -run -b '~/.tmux/plugins/tpm/tpm' diff --git a/tmux/tmux.conf b/tmux/tmux.conf new file mode 100644 index 0000000..9a5c623 --- /dev/null +++ b/tmux/tmux.conf @@ -0,0 +1,59 @@ +set -g escape-time 0 + +set -g prefix C-a +bind C-a send-prefix +unbind C-b + +set -g set-clipboard on + +setw -g base-index 1 + +setw -g mode-keys vi + +set -g default-terminal "screen-256color" +set -g default-command /bin/zsh + +set -g mouse on + +bind-key -n 'C-M-Left' prev +bind-key -n 'C-M-Right' next +bind-key -n 'C-M-Up' new-window +bind-key -n 'C-M-Down' confirm-before -p "kill-window #W? (y/n)" kill-window + +bind-key -n 'C-M-h' prev +bind-key -n 'C-M-l' next +bind-key -n 'C-M-k' new-window +bind-key -n 'C-M-j' confirm-before -p "kill-window #W? (y/n)" kill-window + +#bind-key -n 'C-M-\\' split-window -h +#bind-key -n 'C-M-\-' split-window +bind-key -n 'C-M-x' confirm-before -p "kill-pane #P? (y/n)" kill-pane + + +set -g status-style "fg=black,bg=colour34" +bind-key 'Up' select-pane -P 'fg=white,bg=black' +bind-key 'Down' select-pane -P 'fg=black,bg=white' + +set -g status-right "%Y-%m-%d %H:%M" + +bind-key ] run "sh ~/.config/tmux/paste.sh" + + +# Smart pane switching with awareness of Vim splits. +# See: https://github.com/christoomey/vim-tmux-navigator +is_vim="ps -o state= -o comm= -t '#{pane_tty}' \ + | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|l?n?vim?x?)(diff)?$'" +bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h' 'select-pane -L' +bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j' 'select-pane -D' +bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k' 'select-pane -U' +bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l' 'select-pane -R' +tmux_version='$(tmux -V | sed -En "s/^tmux ([0-9]+(.[0-9]+)?).*/\1/p")' +if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \ + "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\' 'select-pane -l'" +if-shell -b '[ "$(echo "$tmux_version >= 3.0" | bc)" = 1 ]' \ + "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\' 'select-pane -l'" +bind-key -T copy-mode-vi 'C-h' select-pane -L +bind-key -T copy-mode-vi 'C-j' select-pane -D +bind-key -T copy-mode-vi 'C-k' select-pane -U +bind-key -T copy-mode-vi 'C-l' select-pane -R +bind-key -T copy-mode-vi 'C-\' select-pane -l diff --git a/waybar/style.css b/waybar/style.css index 3cba0bc..d360bb7 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -1,5 +1,5 @@ * { - font-family: Inter Regular; + font-family: sans-serif; font-size: 12pt; color: white; } @@ -42,5 +42,5 @@ window#waybar { #tray { padding: 0 15px; border-left: 2px solid rgba(255, 255, 255, 0.2); - font-family: "RobotoMono Nerd Font"; + font-family: monospace; } |