From 8541d3ae8b63794156977c77faff92ce4ba3b7b6 Mon Sep 17 00:00:00 2001 From: Stephan Raabe Date: Thu, 12 Oct 2023 13:23:55 +0200 Subject: [PATCH] Updates --- 1-install.sh | 6 +----- 3-dotfiles.sh | 3 +-- gtk/.Xresources | 1 - gtk/.gtkrc-2.0 | 15 +-------------- gtk/.icons/default/index.theme | 5 ----- gtk/gtk-3.0/settings.ini | 16 ++-------------- gtk/gtk-4.0/settings.ini | 4 ++++ {hypr => gtk}/gtk.sh | 4 +--- hypr/conf/autostart.conf | 2 +- hypr/hyprland.conf | 6 +++--- scripts/filemanager.sh | 9 ++------- scripts/powermenu-hypr.sh | 3 ++- wlogout/README.txt | 8 ++++++++ 13 files changed, 26 insertions(+), 56 deletions(-) delete mode 100644 gtk/.Xresources delete mode 100644 gtk/.icons/default/index.theme create mode 100644 gtk/gtk-4.0/settings.ini rename {hypr => gtk}/gtk.sh (68%) create mode 100644 wlogout/README.txt diff --git a/1-install.sh b/1-install.sh index ddf9e5c..f71c180 100755 --- a/1-install.sh +++ b/1-install.sh @@ -92,9 +92,6 @@ packagesPacman=( "ttf-fira-code" "ttf-firacode-nerd" "figlet" - "lxappearance" - "breeze" - "breeze-gtk" "vlc" "exa" "python-pip" @@ -106,9 +103,9 @@ packagesPacman=( "tumbler" "xautolock" "blueman" - "nautilus" "sddm" "code" + "papirus-icon-theme" ); packagesYay=( @@ -116,7 +113,6 @@ packagesYay=( "pfetch" "bibata-cursor-theme" "trizen" - "kora-icon-theme" "sddm-sugar-dark" ); diff --git a/3-dotfiles.sh b/3-dotfiles.sh index 9bbbc6a..b682c0a 100755 --- a/3-dotfiles.sh +++ b/3-dotfiles.sh @@ -88,8 +88,7 @@ echo "" _installSymLink .gtkrc-2.0 ~/.gtkrc-2.0 ~/dotfiles/gtk/.gtkrc-2.0 ~/.gtkrc-2.0 _installSymLink gtk-3.0 ~/.config/gtk-3.0 ~/dotfiles/gtk/gtk-3.0/ ~/.config/ -_installSymLink .Xresouces ~/.Xresources ~/dotfiles/gtk/.Xresources ~/.Xresources -_installSymLink .icons ~/.icons ~/dotfiles/gtk/.icons/ ~/ +_installSymLink gtk-4.0 ~/.config/gtk-4.0 ~/dotfiles/gtk/gtk-4.0/ ~/.config/ echo "-------------------------------------" echo "-> Install Qtile dotfiles" diff --git a/gtk/.Xresources b/gtk/.Xresources deleted file mode 100644 index 6a1c856..0000000 --- a/gtk/.Xresources +++ /dev/null @@ -1 +0,0 @@ -Xcursor.theme: Bibata-Modern-Ice diff --git a/gtk/.gtkrc-2.0 b/gtk/.gtkrc-2.0 index 423c59a..6b83602 100644 --- a/gtk/.gtkrc-2.0 +++ b/gtk/.gtkrc-2.0 @@ -1,15 +1,2 @@ -gtk-theme-name="Breeze-Dark" -gtk-icon-theme-name="kora" -gtk-font-name="Cantarell 11" +gtk-icon-theme-name="Papirus-Dark" gtk-cursor-theme-name="Bibata-Modern-Ice" -gtk-cursor-theme-size=0 -gtk-toolbar-style=GTK_TOOLBAR_BOTH -gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR -gtk-button-images=1 -gtk-menu-images=1 -gtk-enable-event-sounds=1 -gtk-enable-input-feedback-sounds=1 -gtk-xft-antialias=1 -gtk-xft-hinting=1 -gtk-xft-hintstyle="hintfull" -gtk-application-prefer-dark-theme=true diff --git a/gtk/.icons/default/index.theme b/gtk/.icons/default/index.theme deleted file mode 100644 index e97583c..0000000 --- a/gtk/.icons/default/index.theme +++ /dev/null @@ -1,5 +0,0 @@ -# This file is written by LXAppearance. Do not edit. -[Icon Theme] -Name=Default -Comment=Default Cursor Theme -Inherits=Bibata-Modern-Ice diff --git a/gtk/gtk-3.0/settings.ini b/gtk/gtk-3.0/settings.ini index b6b0467..24f3624 100644 --- a/gtk/gtk-3.0/settings.ini +++ b/gtk/gtk-3.0/settings.ini @@ -1,16 +1,4 @@ [Settings] -gtk-theme-name="Breeze-Dark" -gtk-icon-theme-name="kora" -gtk-font-name=Cantarell 11 -gtk-cursor-theme-name="Bibata-Modern-Ice" -gtk-cursor-theme-size=0 -gtk-toolbar-style=GTK_TOOLBAR_ICONS -gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR -gtk-button-images=1 -gtk-menu-images=0 -gtk-enable-event-sounds=1 -gtk-enable-input-feedback-sounds=1 -gtk-xft-antialias=1 -gtk-xft-hinting=1 -gtk-xft-hintstyle=hintfull +gtk-icon-theme-name=Papirus-Dark +gtk-cursor-theme-name=Bibata-Modern-Ice gtk-application-prefer-dark-theme=true diff --git a/gtk/gtk-4.0/settings.ini b/gtk/gtk-4.0/settings.ini new file mode 100644 index 0000000..24f3624 --- /dev/null +++ b/gtk/gtk-4.0/settings.ini @@ -0,0 +1,4 @@ +[Settings] +gtk-icon-theme-name=Papirus-Dark +gtk-cursor-theme-name=Bibata-Modern-Ice +gtk-application-prefer-dark-theme=true diff --git a/hypr/gtk.sh b/gtk/gtk.sh similarity index 68% rename from hypr/gtk.sh rename to gtk/gtk.sh index c8a2204..d0afe47 100755 --- a/hypr/gtk.sh +++ b/gtk/gtk.sh @@ -1,8 +1,6 @@ #!/bin/sh gnome_schema="org.gnome.desktop.interface" - -gsettings set "$gnome_schema" gtk-theme "Breeze-Dark" -gsettings set "$gnome_schema" icon-theme "kora" +gsettings set "$gnome_schema" icon-theme "Papirus-Dark" gsettings set "$gnome_schema" cursor-theme "Bibata-Modern-Ice" gsettings set "$gnome_schema" font-name "Cantarell 11" gsettings set "$gnome_schema" color-scheme "prefer-dark" diff --git a/hypr/conf/autostart.conf b/hypr/conf/autostart.conf index 98ec317..8ada1f8 100644 --- a/hypr/conf/autostart.conf +++ b/hypr/conf/autostart.conf @@ -8,7 +8,7 @@ exec-once = swww init exec-once = dunst exec-once = ~/dotfiles/scripts/lockscreentime.sh exec-once = ~/dotfiles/scripts/updatewal-swww.sh -exec-once = ~/dotfiles/hypr/gtk.sh +exec-once = ~/dotfiles/gtk/gtk.sh exec-once = hyprctl setcursor Bibata-Modern-Ice 24 exec-once = ~/dotfiles/waybar/launch.sh exec-once = wl-paste --watch cliphist store diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 238836d..00d7dad 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -18,9 +18,9 @@ $keyboardlayout=de # Monitor Setup # See https://wiki.hyprland.org/Configuring/Monitors/ # ----------------------------------------------------- -monitor=,preferred,auto,1 -# monitor=,2560x1440@120,auto,1 -# monitor=,1920x1080@120,auto,1 +# monitor=,preferred,auto,1 +monitor=,2560x1440@120,auto,1 +# monitor=,1920x1080,auto,1 # ----------------------------------------------------- # Autostart & Environment diff --git a/scripts/filemanager.sh b/scripts/filemanager.sh index cfea587..030609c 100755 --- a/scripts/filemanager.sh +++ b/scripts/filemanager.sh @@ -9,10 +9,5 @@ # by Stephan Raabe (2023) # ----------------------------------------------------- -if [ -f "/usr/bin/nautilus" ]; then - echo "nautilus is installed." - nautilus --new-window -else - echo "nautilus not installed. Launching thunar instead." - thunar -fi; +thunar + diff --git a/scripts/powermenu-hypr.sh b/scripts/powermenu-hypr.sh index cc49d91..a4daf40 100755 --- a/scripts/powermenu-hypr.sh +++ b/scripts/powermenu-hypr.sh @@ -24,7 +24,8 @@ case $choice in $option1) swaylock ;; $option2) - hyprctl dispatch exit ;; + # loginctl terminate-user $USER # For command line based login + hyprctl dispatch exit ;; # For display manager login $option3) systemctl reboot ;; $option4) diff --git a/wlogout/README.txt b/wlogout/README.txt new file mode 100644 index 0000000..4ceecd7 --- /dev/null +++ b/wlogout/README.txt @@ -0,0 +1,8 @@ +Select Logout Command depending on your setup: + +Use for Display Manager e.g., sddm (DEFAULT) +sleep 1; hyprctl dispatch exit + +Use for Arch Linux text based login +sleep 1; loginctl terminate-user $USER +