From 1c7837d29e9bf97ba793118a22fcb88519884713 Mon Sep 17 00:00:00 2001 From: Siina Mashek Date: Tue, 16 Apr 2024 02:45:08 +0300 Subject: [PATCH] I think things are where I want them now. --- config/mako/config | 6 +----- config/sway/config | 8 +++++--- config/sway/config.d/01-vars | 2 ++ config/sway/config.d/03-workspaces | 19 ++++++++++--------- config/sway/config.d/app_assignment | 21 +++++++++++---------- config/sway/config.d/autostart | 9 +++++++++ config/sway/config.d/common_floating | 1 + config/sway/config.d/screencapture | 2 +- config/xdg-desktop-portal/portals.conf | 3 +++ profile | 4 ++++ zshrc | 3 +++ 11 files changed, 50 insertions(+), 28 deletions(-) create mode 100644 config/xdg-desktop-portal/portals.conf diff --git a/config/mako/config b/config/mako/config index 4d6a321..fd03b44 100644 --- a/config/mako/config +++ b/config/mako/config @@ -1,7 +1,7 @@ background-color=#2e3440 border-color=#88c0d0 -default-timeout=5000 +default-timeout=2000 [urgency=low] border-color=#cccccc @@ -11,8 +11,4 @@ border-color=#d08770 [urgency=high] border-color=#bf616a -default-timeout=0 -[category=spotify_player] -default-timeout=2000 -group-by=category diff --git a/config/sway/config b/config/sway/config index ff0993b..804aabe 100644 --- a/config/sway/config +++ b/config/sway/config @@ -6,9 +6,11 @@ input type:keyboard xkb_numlock enabled 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 + +exec gentoo-pipewire-launcher & + # Enable agent storage for things like nextcloud-client -#exec gnome-keyring-daemon --start --components=secrets -#exec export $(gnome-keyring-daemon) +exec gnome-keyring-daemon --start --components=secrets +exec export $(gnome-keyring-daemon) diff --git a/config/sway/config.d/01-vars b/config/sway/config.d/01-vars index 6ec5f9a..23ba417 100644 --- a/config/sway/config.d/01-vars +++ b/config/sway/config.d/01-vars @@ -8,3 +8,5 @@ set $right l set $term kitty set $menu bemenu-run -p "" | xargs swaymsg exec -- + +exec echo $XDG_CURRENT_DESKTOP=sway diff --git a/config/sway/config.d/03-workspaces b/config/sway/config.d/03-workspaces index 139b80b..5863c8b 100644 --- a/config/sway/config.d/03-workspaces +++ b/config/sway/config.d/03-workspaces @@ -1,9 +1,10 @@ -workspace Terminal output DP-3 -workspace Steam output DP-3 -workspace Heroic output DP-3 -workspace Unity Editor output DP-3 -workspace Chat output HDMI-A-1 -workspace 5 output HDMI-A-1 -workspace Mail output HDMI-A-1 -workspace OBS output HDMI-A-1 -workspace Spotify output HDMI-A-1 +workspace 1 output DP-3 +workspace 2 output DP-3 +workspace 3 output DP-3 +workspace 4 output DP-3 +workspace 5 output DP-3 +workspace 6 output HDMI-A-1 +workspace 7 output HDMI-A-1 +workspace 8 output HDMI-A-1 +workspace 9 output HDMI-A-1 +workspace 0 output HDMI-A-1 diff --git a/config/sway/config.d/app_assignment b/config/sway/config.d/app_assignment index 85990d3..5c2c89b 100644 --- a/config/sway/config.d/app_assignment +++ b/config/sway/config.d/app_assignment @@ -1,10 +1,11 @@ -assign [title="Steam"] Steam -assign [title="Vivaldi"] Browser -assign [title="Discord"] Chat -assign [app_id="profanity"] Chat -assign [app_id="heroic"] Heroic -assign [app_id="org.telegram.desktop"] Chat -assign [app_id="thunderbird"] Mail -assign [class="battle.net.exe"] Battle.net -assign [app_id="com.obsproject.Studio"] OBS -assign [class="unityhub"] Unity Editor +#assign [title="Vivaldi"] 2 +assign [title="Steam"] 3 +assign [app_id="heroic"] 4 +assign [con_mark="Dungeons & Dragons Online"] 4 +assign [class="battle.net.exe"] 5 +assign [title="Discord"] 6 +assign [app_id="org.telegram.desktop"] 6 +assign [app_id="profanity"] 7 +assign [app_id="quasselclient"] 7 +assign [app_id="com.obsproject.Studio"] 8 +assign [app_id="thunderbird"] 9 diff --git a/config/sway/config.d/autostart b/config/sway/config.d/autostart index 9a0a2be..486912f 100644 --- a/config/sway/config.d/autostart +++ b/config/sway/config.d/autostart @@ -1,10 +1,19 @@ +# Restart pipewire for some fucking reason +exec gentoo-pipewire-launcher restart & + # Run in bg/tray exec keepassxc exec kitty exec /usr/bin/steam +# put vivaldi on workspace 2 +workspace 2 exec vivaldi + exec vesktop exec telegram-desktop exec profanity-autostart +# focus back on workspace 1 +# (not sure if necessary) +workspace 1 diff --git a/config/sway/config.d/common_floating b/config/sway/config.d/common_floating index 2eb3e0e..e90fcd9 100644 --- a/config/sway/config.d/common_floating +++ b/config/sway/config.d/common_floating @@ -12,3 +12,4 @@ for_window [title = "Unlock Database"] floating enable for_window [title = "Reminders"] floating enable for_window [title = "(?:Open|Save) (?:File|Folder|As)"] floating enable, resize set width 1030 height 710 for_window [class = "steam_app.*"] inhibit_idle fullscreen; floating enable; border none +#for_window [app_id = "com.nextcloud.desktopclient.nextcloud"] floating enable diff --git a/config/sway/config.d/screencapture b/config/sway/config.d/screencapture index 14a28ca..7da2d48 100644 --- a/config/sway/config.d/screencapture +++ b/config/sway/config.d/screencapture @@ -1,7 +1,7 @@ set $ps1 Print set $ps2 Control+Print set $ps3 Alt+Print -set $ps4 Alt+Control+Print +set $ps4 Control+Alt+Print set $psf $(xdg-user-dir PICTURES)/ps_$(date +"%Y%m%d%H%M%S").png bindsym $ps1 exec grim - | wl-copy diff --git a/config/xdg-desktop-portal/portals.conf b/config/xdg-desktop-portal/portals.conf new file mode 100644 index 0000000..e6fd868 --- /dev/null +++ b/config/xdg-desktop-portal/portals.conf @@ -0,0 +1,3 @@ +[preferred] +default=gtk +org.freedesktop.impl.portal.FileChooser=gtk diff --git a/profile b/profile index 6a6f2a9..b1dc06d 100644 --- a/profile +++ b/profile @@ -8,11 +8,15 @@ if test -z "${XDG_RUNTIME_DIR}"; then fi fi +export XDG_CURRENT_DESKTOP=sway + # The city's finest exports! export GIT_EDITOR="nvim" export GPG_TTY=$(tty) export PATH="$HOME/.local/bin:$PATH" export SCREENSHOT_DIR="$HOME/Screenshots" +export LC_MESSAGES="C.UTF-8" +export TERM="xterm-256color" # Let's get some private environment vars source $HOME/.config/private.env diff --git a/zshrc b/zshrc index 12292cc..523df5f 100644 --- a/zshrc +++ b/zshrc @@ -2,6 +2,9 @@ export HISTFILE="$HOME/.cache/zsh/history" export HISTSIZE=10000 export SAVEHIST=10000 +bindkey -v +bindkey '^R' history-incremental-search-backward + # Add our zprompts to fpath to use bunni theme fpath=("$HOME/.config/zsh/zprompts" "$fpath[@]")