From e7c6a8ad41f49178069e8879ad2db89f25bc2237 Mon Sep 17 00:00:00 2001 From: Thies Lennart Alff Date: Mon, 16 Oct 2023 09:14:26 +0200 Subject: [PATCH] update --- .config/logseq-flags.conf | 2 + .config/sway/config | 10 +++++ .config/sway/config.d/autostart.conf | 2 + .config/sway/config.d/windows.conf | 1 + .config/swaylock/config | 4 ++ create_links.sh | 21 +++++++++ install_pacman | 2 +- pkglist | 65 ++++++++++++++++++++++++++++ pkglist.txt | 35 --------------- pkglist_aur | 5 +++ pkglist_aur.txt | 1 - 11 files changed, 111 insertions(+), 37 deletions(-) create mode 100644 .config/logseq-flags.conf create mode 100644 .config/sway/config.d/autostart.conf create mode 100644 .config/sway/config.d/windows.conf create mode 100644 .config/swaylock/config create mode 100644 pkglist delete mode 100644 pkglist.txt create mode 100644 pkglist_aur delete mode 100644 pkglist_aur.txt diff --git a/.config/logseq-flags.conf b/.config/logseq-flags.conf new file mode 100644 index 0000000..1aa75ce --- /dev/null +++ b/.config/logseq-flags.conf @@ -0,0 +1,2 @@ +--enable-features=UseOzonePlatform,WaylandWindowDecorations +--ozone-platform=wayland diff --git a/.config/sway/config b/.config/sway/config index e860f81..49d9e9f 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -3,10 +3,18 @@ set $term kitty set $menu kickoff set $lock swaylock +include ~/.config/sway/config.d/* + # scale internal display output eDP-1 scale 1.5 output * scale 1.25 +# notification daemon +exec mako + +# polkit +exec /usr/bin/lxqt-policykit-agent + focus_follows_mouse no default_border pixel 2 @@ -14,6 +22,7 @@ default_floating_border pixel 2 gaps inner 10 gaps outer 5 +# enable gnome keyring exec dbus-update-activation-environment --all exec eval $(gnome-keyring-daemon --start) exec export SSH_AUTH_SOCK @@ -39,6 +48,7 @@ mode "$mode_exit" { bindsym o exec --no-startup-id i3-msg exit, mode "default" bindsym r exec --no-startup-id reboot, mode "default" bindsym s exec --no-startup-id systemctl poweroff -i, mode "default" + bindsym e exec swaymsg exit, mode "default" bindsym Escape mode "default" bindsym Return mode "default" } diff --git a/.config/sway/config.d/autostart.conf b/.config/sway/config.d/autostart.conf new file mode 100644 index 0000000..496945f --- /dev/null +++ b/.config/sway/config.d/autostart.conf @@ -0,0 +1,2 @@ +exec 'sleep 2; nextcloud' +exec slack --ozone-platform-hint=auto diff --git a/.config/sway/config.d/windows.conf b/.config/sway/config.d/windows.conf new file mode 100644 index 0000000..dbb2162 --- /dev/null +++ b/.config/sway/config.d/windows.conf @@ -0,0 +1 @@ +for_window [app_id="lxqt-policykit-agent"] floating enable diff --git a/.config/swaylock/config b/.config/swaylock/config new file mode 100644 index 0000000..8b86fe3 --- /dev/null +++ b/.config/swaylock/config @@ -0,0 +1,4 @@ +font=Sans +indicator-radius=240 +indicator-thicknes=10 + diff --git a/create_links.sh b/create_links.sh index f64674c..d7a96ec 100755 --- a/create_links.sh +++ b/create_links.sh @@ -44,3 +44,24 @@ do fi ln -sv $file $dest done + +files=($(find "$REPO_DIR/.config" -maxdepth 1 -type f)) +for file in ${files[@]} +do + base=$(basename -- "$file") + dest="$HOME/.config/$base" + if [ -L "$dest" ];then + if [ ! -e "$dest" ];then + echo "Remove broken link: $dest" + rm "$dest$" + else + echo "Already installed: $dest" + continue + fi + elif [ -e "$dest" ]; then + echo "Already exists: $dest" + echo "Backing up..." + mv "$dest" "$BACKUP_DIR/" + fi + ln -sv "$file" "$dest" +done diff --git a/install_pacman b/install_pacman index ca2f439..65f2e34 100755 --- a/install_pacman +++ b/install_pacman @@ -1,3 +1,3 @@ #!/usr/bin/bash -grep -v "^#" pkglist.txt | sudo pacman -S --needed - +grep -v "^#" pkglist | sudo pacman -S --needed - diff --git a/pkglist b/pkglist new file mode 100644 index 0000000..7c1bd0f --- /dev/null +++ b/pkglist @@ -0,0 +1,65 @@ +# vim: set ft=ini +sway +swayidle +swaylock +waybar +neovim +python-neovim +zsh + +# notification daemon +mako +# required for mozilla to send notifications +libnotify + +nextcloud-client +flatpak + +# we want to run qt apps under wayland +qt5-wayland +qt6-wayland + +# things needed for neovim +ripgrep +unzip +wget +tar +gzip +python-pip +nodejs +npm +fd + +# screen sharing +xdg-desktop-portal +xdg-desktop-portal-wlr + +# screenshots +slurp +grim + +# clipboard. generally needed +wl-clipboard + +# required for sway +polkit +# for graphical authentication +lxqt-policykit + +# my favourite system font +noto-fonts +noto-fonts-emoji +ttf-fira-code +# required for waybar symbols +ttf-font-awesome + +# create gnome keyring +seahorse +htop + +keepassxc + +# xwayland for x apps +xorg-xwayland +# daemon for disk control +udisks2 diff --git a/pkglist.txt b/pkglist.txt deleted file mode 100644 index 393eff0..0000000 --- a/pkglist.txt +++ /dev/null @@ -1,35 +0,0 @@ -# vim: set ft=ini -sway -waybar -neovim -python-neovim -zsh - -# things needed for neovim -ripgrep -unzip -wget -tar -gzip -python-pip -nodejs -fd - -# screen sharing -xdg-desktop-portal -xdg-desktop-portal-wlr - -# screenshots -slurp -grim - -# clipboard. generally needed -wl-clipboard - -# required for sway -polkit - -# my favourite system font -noto-fonts -noto-fonts-emoji -ttf-fira-code diff --git a/pkglist_aur b/pkglist_aur new file mode 100644 index 0000000..424fe32 --- /dev/null +++ b/pkglist_aur @@ -0,0 +1,5 @@ +# vim: set ft=ini +ranger-git +# needs to be started with slack --ozone-platform-hint=auto +slack-desktop-wayland +logseq-desktop-bin diff --git a/pkglist_aur.txt b/pkglist_aur.txt deleted file mode 100644 index cbc0160..0000000 --- a/pkglist_aur.txt +++ /dev/null @@ -1 +0,0 @@ -ranger-git