From 9e89ed86810e4eaaca5387b787393d7d8bf2e3ed Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Thu, 22 Apr 2021 18:49:02 +0300 Subject: [PATCH] Initial changes --- home/.config/sway/conf.d/02-bar.conf | 5 ---- .../conf.d/{03-input.conf => 02-input.conf} | 0 .../conf.d/{04-output.conf => 03-output.conf} | 0 ...{05-workspaces.conf => 04-workspaces.conf} | 0 .../{06-keybinds.conf => 05-keybinds.conf} | 0 ...{07-appearance.conf => 06-appearance.conf} | 0 home/.config/sway/conf.d/07-exec.conf | 12 ++++++++ home/.config/sway/conf.d/08-exec.conf | 28 ------------------- home/.config/sway/env | 20 +++++++++++++ home/.config/systemd/user/foot.service | 10 +++++++ home/.zprofile | 5 ---- 11 files changed, 42 insertions(+), 38 deletions(-) delete mode 100644 home/.config/sway/conf.d/02-bar.conf rename home/.config/sway/conf.d/{03-input.conf => 02-input.conf} (100%) rename home/.config/sway/conf.d/{04-output.conf => 03-output.conf} (100%) rename home/.config/sway/conf.d/{05-workspaces.conf => 04-workspaces.conf} (100%) rename home/.config/sway/conf.d/{06-keybinds.conf => 05-keybinds.conf} (100%) rename home/.config/sway/conf.d/{07-appearance.conf => 06-appearance.conf} (100%) create mode 100644 home/.config/sway/conf.d/07-exec.conf delete mode 100644 home/.config/sway/conf.d/08-exec.conf create mode 100755 home/.config/sway/env create mode 100644 home/.config/systemd/user/foot.service diff --git a/home/.config/sway/conf.d/02-bar.conf b/home/.config/sway/conf.d/02-bar.conf deleted file mode 100644 index 04630004..00000000 --- a/home/.config/sway/conf.d/02-bar.conf +++ /dev/null @@ -1,5 +0,0 @@ -# vim:ft=i3config - -bar { - swaybar_command waybar -} diff --git a/home/.config/sway/conf.d/03-input.conf b/home/.config/sway/conf.d/02-input.conf similarity index 100% rename from home/.config/sway/conf.d/03-input.conf rename to home/.config/sway/conf.d/02-input.conf diff --git a/home/.config/sway/conf.d/04-output.conf b/home/.config/sway/conf.d/03-output.conf similarity index 100% rename from home/.config/sway/conf.d/04-output.conf rename to home/.config/sway/conf.d/03-output.conf diff --git a/home/.config/sway/conf.d/05-workspaces.conf b/home/.config/sway/conf.d/04-workspaces.conf similarity index 100% rename from home/.config/sway/conf.d/05-workspaces.conf rename to home/.config/sway/conf.d/04-workspaces.conf diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/05-keybinds.conf similarity index 100% rename from home/.config/sway/conf.d/06-keybinds.conf rename to home/.config/sway/conf.d/05-keybinds.conf diff --git a/home/.config/sway/conf.d/07-appearance.conf b/home/.config/sway/conf.d/06-appearance.conf similarity index 100% rename from home/.config/sway/conf.d/07-appearance.conf rename to home/.config/sway/conf.d/06-appearance.conf diff --git a/home/.config/sway/conf.d/07-exec.conf b/home/.config/sway/conf.d/07-exec.conf new file mode 100644 index 00000000..3fa4f834 --- /dev/null +++ b/home/.config/sway/conf.d/07-exec.conf @@ -0,0 +1,12 @@ +# vim:ft=i3config + +exec_always { + gsettings set $gnome-schema gtk-theme 'Matcha-dark-azul' + gsettings set $gnome-schema icon-theme 'Papirus-Dark' + gsettings set $gnome-schema cursor-theme 'Breeze' + gsettings set $gnome-schema font-name 'Overpass 12' + gsettings set $gnome-schema document-font-name 'Overpass 12' + gsettings set $gnome-schema monospace-font-name 'Hack Nerd Font Mono 12' + + systemctl --user import-environment; systemctl --user start sway-session.target +} diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf deleted file mode 100644 index 19289cfe..00000000 --- a/home/.config/sway/conf.d/08-exec.conf +++ /dev/null @@ -1,28 +0,0 @@ -# vim:ft=i3config - -exec { - foot -s - $scripts/idle.sh - autotiling - redshift-gtk -m wayland - telegram-desktop - /usr/lib/kdeconnectd - kdeconnect-indicator - mako - wl-paste -t text --watch clipman store --notify 1>> ~/.log/clipman 2>&1 - wl-paste -p -t text --watch clipman store -P --histpath="~/.local/share/clipman-primary.json" - mkfifo $SWAYSOCK.wob && tail -f $SWAYSOCK.wob | wob - /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 - mpDris2 - swaymsg workspace 1 - dbus-update-activation-environment DISPLAY -} - -exec_always { - gsettings set $gnome-schema gtk-theme 'Matcha-dark-azul' - gsettings set $gnome-schema icon-theme 'Papirus-Dark' - gsettings set $gnome-schema cursor-theme 'Breeze' - gsettings set $gnome-schema font-name 'Overpass 12' - gsettings set $gnome-schema document-font-name 'Overpass 12' - gsettings set $gnome-schema monospace-font-name 'Hack Nerd Font Mono 12' -} diff --git a/home/.config/sway/env b/home/.config/sway/env new file mode 100755 index 00000000..e2c42b18 --- /dev/null +++ b/home/.config/sway/env @@ -0,0 +1,20 @@ +# Firefox +MOZ_ENABLE_WAYLAND=1 +MOZ_USE_XINPUT2=1 +MOZ_WEBRENDER=1 + +# Enable xdg-desktop-portal-wlr +XDG_CURRENT_DESKTOP=sway +XDG_SESSION_TYPE=wayland + +# Fix java on wayland +_JAVA_AWT_WM_NONREPARENTING=1 +_JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' + +# Enable qt5 theming and wayland support +QT_QPA_PLATFORMTHEME=qt5ct +QT_QPA_PLATFORM=wayland +QT_WAYLAND_DISABLE_WINDOWDECORATION=1 + +# Fix redshift on wlroots +WLR_DRM_NO_ATOMIC=1 diff --git a/home/.config/systemd/user/foot.service b/home/.config/systemd/user/foot.service new file mode 100644 index 00000000..31f0b070 --- /dev/null +++ b/home/.config/systemd/user/foot.service @@ -0,0 +1,10 @@ +[Unit] +Description=Wayland terminal emulator (server) +PartOf=graphical-session.target + +[Service] +Type=simple +ExecStart=/usr/bin/foot -s + +[Install] +WantedBy=sway-session.target diff --git a/home/.zprofile b/home/.zprofile index ed8b10ac..e69de29b 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1,5 +0,0 @@ -if cat /proc/cmdline | grep -q "video=eDP-1:d"; then - [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && kodi -else - [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && $HOME/.config/sway/scripts/run.sh > /dev/null 2>&1 -fi