From e9e1ba93e95ca6cf894bd1e88610f4a0c7f4f0da Mon Sep 17 00:00:00 2001 From: Siina Mashek Date: Mon, 1 Apr 2024 07:27:41 +0300 Subject: [PATCH] Updating sawyful things --- bashrc | 2 +- config/kitty/kitty.conf | 14 +++++++---- config/kitty/theme.conf | 3 +-- config/nvim/init.vim | 2 +- config/sway/config | 38 +++++++++++++++-------------- config/sway/config.d/app_assignment | 1 + config/sway/config.d/steam | 11 +-------- config/sway/config.d/theme | 29 +++++++++++++++++++--- config/sway/config.d/wallpaper | 6 ++--- profile | 10 ++++---- 10 files changed, 67 insertions(+), 49 deletions(-) diff --git a/bashrc b/bashrc index cc3a82d..8b3bae9 100644 --- a/bashrc +++ b/bashrc @@ -1,6 +1,6 @@ -source $HOME/.profile if [[ $- != *i* ]] ; then # Shell is non-interactive. Be done now! return fi +source $HOME/.profile diff --git a/config/kitty/kitty.conf b/config/kitty/kitty.conf index d0a288b..233ddaf 100644 --- a/config/kitty/kitty.conf +++ b/config/kitty/kitty.conf @@ -1,11 +1,15 @@ enable_audio_bell no -font_size 10 -font_family JetBrains Mono Thin -bold_font JetBrains Mono -italic_font JetBrains Mono -bold_italic_font JetBrains Mono +font_size 11 +font_family Iosevka Slab Extended +bold_font auto +italic_font auto +bold_italic_font auto cursor_shape underline +window_padding_width 4 + +#modify_font cell_width 110% + scrollback_lines 10000 scrollback_pager_history_size 20000 diff --git a/config/kitty/theme.conf b/config/kitty/theme.conf index 92ae705..0e9e204 100644 --- a/config/kitty/theme.conf +++ b/config/kitty/theme.conf @@ -10,8 +10,7 @@ # The basic colors foreground #C6D0F5 -#background #303446 -background #1E2030 +background #303446 selection_foreground #303446 selection_background #F2D5CF diff --git a/config/nvim/init.vim b/config/nvim/init.vim index e32fa39..241d382 100644 --- a/config/nvim/init.vim +++ b/config/nvim/init.vim @@ -46,7 +46,7 @@ require 'nvim-treesitter.configs'.setup { local parser_config = require'nvim-treesitter.parsers'.get_parser_configs() parser_config.dfraw = { install_info = { - url = 'https://code.criminallycute.fi/siina/tree-sitter-dfraw', + url = 'https://code.criminallycute.fi/mirrors/tree-sitter-dfraw', files = { 'src/parser.c' }, branch = 'main' }, diff --git a/config/sway/config b/config/sway/config index 97914de..8b55d08 100644 --- a/config/sway/config +++ b/config/sway/config @@ -1,32 +1,33 @@ -set $icon 'Nordzy' -set $cursor 'Numix-Cursor' -set $gtktheme 'Catppuccin-Macchiato-Standard-Lavender-Dark' -set $font 'Noto Sans 10' - output DP-3 resolution 1920x1080@143.855hz pos 0 540 output HDMI-A-1 resolution 1920x1080@72.038hz pos 1920 0 transform 90 input type:keyboard xkb_numlock enabled -font pango:JetbrainsMono Normal 9 - -# Colours based on Catppuccino Macchiato Lavendar +# Colours based on Catppuccino Frappe Lavender bar { - position top - status_command while ~/.config/sway/status.sh; do sleep 1; done - colors { - statusline #cad3f5 - background #1e2030 - active_workspace #494d64 #1e2030 #cad3f5 - focused_background #24273a - focused_workspace #5b6078 #24273a #cad3f5 - inactive_workspace #1e2030 #1e2030 #5b6078 + position top + status_command while ~/.config/sway/status.sh; do sleep 1; done + colors { + # bar text + statusline #c6d0f5 + # bar background on all displays + background #292c3c + # focused bar on current display + focused_background #292c3c + # active workspace on each display + active_workspace #c6d0f5 #303446 #c6d0f5 + # focused workspace on current display + focused_workspace #c6d0f5 #303446 #c6d0f5 + # inactive workspace on each display + inactive_workspace #414559 #292c3c #838ba7 } # tray { -# icon_theme $icon +# icon_theme $icon # } } +output * bg #313244 solid_color + client.focused #5b6078 #24273a #cad3f5 #5b6078 client.focused_inactive #494d64 #1e2030 #cad3f5 client.unfocused #494d64 #1e2030 #5b6078 @@ -34,6 +35,7 @@ client.unfocused #494d64 #1e2030 #5b6078 include /etc/sway/config.d/* include /home/siina/.config/sway/config.d/* +exec gentoo-pipewire-launcher & # Screencast fix exec --no-startup-id dbus-update-activation-environment --all # Enable agent storage for things like nextcloud-client diff --git a/config/sway/config.d/app_assignment b/config/sway/config.d/app_assignment index 8dda201..a0ac048 100644 --- a/config/sway/config.d/app_assignment +++ b/config/sway/config.d/app_assignment @@ -1,4 +1,5 @@ assign [title="Steam"] 2 +assign [title="Vivaldi"] Browser assign [title="Discord"] 4 assign [app_id="org.telegram.desktop"] 5 assign [app_id="org.gajim.Gajim"] 5 diff --git a/config/sway/config.d/steam b/config/sway/config.d/steam index 3e54c8a..e107ba8 100644 --- a/config/sway/config.d/steam +++ b/config/sway/config.d/steam @@ -1,11 +1,2 @@ -for_window [class="^Steam$" title="^Friends$"] floating enable -for_window [class="^Steam$" title="Steam - News"] floating enable -for_window [class="^Steam$" title=".* - Chat"] floating enable -for_window [class="^Steam$" title="^Settings$"] floating enable -for_window [class="^Steam$" title=".* - event started"] floating enable -for_window [class="^Steam$" title=".* CD key"] floating enable -for_window [class="^Steam$" title="^Steam - Self Updater$"] floating enable -for_window [class="^Steam$" title="^Screenshot Uploader$"] floating enable -for_window [class="^Steam$" title="^Steam Guard - Computer Authorization Required$"] floating enable -for_window [title="^Steam Keyboard$"] floating enable +for_window [title="Steam Settings"] floating enable diff --git a/config/sway/config.d/theme b/config/sway/config.d/theme index 0022de3..9fd489f 100644 --- a/config/sway/config.d/theme +++ b/config/sway/config.d/theme @@ -1,8 +1,29 @@ +# removes window titles +default_border pixel 0 +# adds gaps around windows +gaps inner 10 + +# swayfx things +blur enable +shadows enable + +set $icon 'Zafiro-Icons-Dark' +set $cursor 'Catppuccin-Frappe-Lavender' +set $gtktheme 'Catppuccin-Frappe-Standard-Lavender-Dark' +set $bar_font 'Iosevka Etoile 10' +set $font 'Iosevka Aile 10' +#font pango:$font +font $bar_font + +# Qt-based things are modified using `qt6ct` for now + set $gnome-schema org.gnome.desktop.interface seat seat0 xcursor_theme $cursor exec_always { - gsettings set $gnome-schema cursor-theme $cursor - gsettings set $gnome-schema font-name $font - gsettings set $gnome-schema gtk-theme $gtktheme - gsettings set $gnome-schema icon-theme $icon + export GTK_THEME="$font" + gsettings set $gnome-schema cursor-theme $cursor + gsettings set $gnome-schema font-name $font + gsettings set $gnome-schema gtk-theme $gtktheme + gsettings set $gnome-schema icon-theme $icon + gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' } diff --git a/config/sway/config.d/wallpaper b/config/sway/config.d/wallpaper index e0522cc..e1dc8ce 100644 --- a/config/sway/config.d/wallpaper +++ b/config/sway/config.d/wallpaper @@ -1,3 +1,3 @@ -set $bgdir '$HOME/Pictures/Wallpaper' -output HDMI-A-1 bg $bgdir/dark-night-river-forest-minimal-art.jpg fill -output DP-3 bg $bgdir/moose-in-the-night-hd.png fill +#set $bgdir '$HOME/Pictures/Wallpaper' +#output HDMI-A-1 bg $bgdir/dark-night-river-forest-minimal-art.jpg fill +#output DP-3 bg $bgdir/moose-in-the-night-hd.png fill diff --git a/profile b/profile index 1ea1409..faa3ae0 100644 --- a/profile +++ b/profile @@ -9,10 +9,10 @@ if test -z "${XDG_RUNTIME_DIR}"; then fi # The city's finest exports! -export GTK_THEME="Catppuccin-Macchiato-Standard-Lavender-Dark" export QT_QPA_PLATFORM="wayland" -export QT_QPA_PLATFORMTHEME="qt6ct" +export QT_QPA_PLATFORMTHEME="qt5ct" export XDG_CURRENT_DESKTOP=sway +export GTK_THEME="Catppuccin-Frappe-Standard-Lavender-Dark" export GIT_EDITOR="nvim" export GPG_TTY=$(tty) export PATH="$HOME/.local/bin:$PATH" @@ -20,17 +20,17 @@ export PATH="$HOME/.local/bin:$PATH" export SCREENSHOT_DIR="$HOME/Screenshots" # Let's get some private environment vars -source $HOME/.profile.private +source $HOME/.config/private.env # Let's keep $HOME clean -LESSHISTFILE=- +export LESSHISTFILE=- # Launch sway! if [ -z "${WAYLAND_DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then dbus-run-session sway fi - +alias fastfetch="LANG=fi_FI.UTF8 fastfetch" alias ccat="highlight -O ansi $@" alias ls="ls -h --color=auto" alias myip6="curl https://ifconfig.co"