From 0a7af4d2bbb2a7cb85d15ecd7314dc6a9297a471 Mon Sep 17 00:00:00 2001 From: Stephan Raabe Date: Thu, 14 Sep 2023 14:34:08 +0200 Subject: [PATCH] Updates --- .deploycheck | 8 ++++++++ 1-install.sh | 1 + CHANGELOG | 22 +++++++++++++++++----- hypr/gtk.sh | 3 +++ hypr/hyprland.conf | 4 +++- waybar/config | 1 + waybar/launch.sh | 2 +- waybar/modules.json | 15 +++++++++++---- waybar/myconfig | 3 ++- waybar/style.css | 6 ++++-- 10 files changed, 51 insertions(+), 14 deletions(-) create mode 100644 .deploycheck diff --git a/.deploycheck b/.deploycheck new file mode 100644 index 0000000..bd7c7b9 --- /dev/null +++ b/.deploycheck @@ -0,0 +1,8 @@ +------------------------------------------------------- +Checklist for changes on main branch after merging +------------------------------------------------------- + +hyprland.conf: Set monitor to ,preferred,auto,1 +hyprland.conf: Set keyboard to us +gtk/gtk-3.0: Remove bookmarks + diff --git a/1-install.sh b/1-install.sh index 73fcb7a..300947f 100755 --- a/1-install.sh +++ b/1-install.sh @@ -106,6 +106,7 @@ packagesPacman=( "tumbler" "xautolock" "blueman" + "nautilus" ); packagesYay=( diff --git a/CHANGELOG b/CHANGELOG index cb2c25f..968b406 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,18 @@ -Version 2.1 +Version 2.2 +https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.2 +-------------------------------------------------------- +- Login: Move issue into login directory +- Bugfix: /gtk/gtk-3.0/bookmarks removed from repository +- Hyprland: Prefer dark theme for gtk3 applications e.g., nautilus +- Hyprland: Add keybinding for nautilus SUPER, CTRL, F +- Installation: Add nautilus as default file manager +- Waybar: Add quickstart icon for nautilus +- Waybar: Style improvements -Bugfixes -Updates custom waybar mdule to check available packages for updates (pacman and aur) plus color theme for number of available packages (waybar/modules.json) -New installupdates script with Timeshift integration. Ask for name for the Timeshift before starting the updates (scripts/installupdates.sh) -Pywal colors for waybar now with relative link into ./cache/wal/ (waybar/style.css) +Version 2.1 +https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.1 +-------------------------------------------------------- +- Several bugfixes +- Updates custom waybar module to check available packages for updates (pacman and aur) plus color theme for number of available packages (waybar/modules.json) +- New installupdates script with Timeshift integration. Ask for name for the Timeshift before starting the updates (scripts/installupdates.sh) +- Waybar: Pywal colors for waybar now with relative link into ./cache/wal/ (waybar/style.css) diff --git a/hypr/gtk.sh b/hypr/gtk.sh index 967620f..9b26dbf 100755 --- a/hypr/gtk.sh +++ b/hypr/gtk.sh @@ -9,7 +9,10 @@ gtk_theme="$(grep 'gtk-theme-name' "$config" | sed 's/.*\s*=\s*//')" icon_theme="$(grep 'gtk-icon-theme-name' "$config" | sed 's/.*\s*=\s*//')" cursor_theme="$(grep 'gtk-cursor-theme-name' "$config" | sed 's/.*\s*=\s*//')" font_name="$(grep 'gtk-font-name' "$config" | sed 's/.*\s*=\s*//')" + gsettings set "$gnome_schema" gtk-theme "$gtk_theme" gsettings set "$gnome_schema" icon-theme "$icon_theme" gsettings set "$gnome_schema" cursor-theme "$cursor_theme" gsettings set "$gnome_schema" font-name "$font_name" + +gsettings set "$gnome_schema" color-scheme 'prefer-dark' diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 1421bd1..f7ada68 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -18,7 +18,8 @@ env = WLR_RENDERER_ALLOW_SOFTWARE, 1 # Monitor Setup # See https://wiki.hyprland.org/Configuring/Monitors/ # ----------------------------------------------------- -monitor=,preferred,auto,1 +monitor=,2560x1440@120,auto,1 +# monitor=,preferred,auto,1 # monitor=,1920x1080,auto,1 # ----------------------------------------------------- @@ -159,6 +160,7 @@ bind = $mainMod SHIFT, W, exec, ~/dotfiles/scripts/updatewal-swww.sh bind = $mainMod CTRL, W, exec, ~/dotfiles/scripts/wallpaper-swww.sh bind = $mainMod CTRL, RETURN, exec, ~/dotfiles/scripts/applauncher.sh bind = $mainMod SHIFT, B, exec, ~/dotfiles/waybar/launch.sh +bind = $mainMod CTRL, F, exec, nautilus bind = $mainMod, 1, workspace, 1 bind = $mainMod, 2, workspace, 2 diff --git a/waybar/config b/waybar/config index 61b193b..c7b880f 100644 --- a/waybar/config +++ b/waybar/config @@ -59,6 +59,7 @@ "group/quicklinks": { "orientation": "horizontal", "modules": [ + "custom/filemanager", "custom/brave", ] }, diff --git a/waybar/launch.sh b/waybar/launch.sh index efeacd6..7eb606b 100755 --- a/waybar/launch.sh +++ b/waybar/launch.sh @@ -16,7 +16,7 @@ killall waybar # ----------------------------------------------------- # Loading the configuration based on the username # ----------------------------------------------------- -if [[ $USER = "raabe2" ]] +if [[ $USER = "raabe" ]] then waybar -c ~/dotfiles/waybar/myconfig & -s ~/dotfiles/waybar/style.css else diff --git a/waybar/modules.json b/waybar/modules.json index a4989f8..fdcb856 100644 --- a/waybar/modules.json +++ b/waybar/modules.json @@ -77,6 +77,13 @@ "tooltip": false }, + // Filemanager Launcher + "custom/filemanager": { + "format": "", + "on-click": "nautilus", + "tooltip": false + }, + // Outlook Launcher "custom/outlook": { "format": "", @@ -100,7 +107,7 @@ // ChatGPT Launcher "custom/chatgpt": { - "format": "", + "format": "", "on-click": "brave --app=https://chat.openai.com", "tooltip": false }, @@ -112,10 +119,10 @@ "tooltip": false }, - // Looking Glass Launcher - "custom/lookingglass": { + // Windows VM + "custom/windowsvm": { "format": "", - "on-click": "~/dotfiles/scripts/looking-glass.sh", + "on-click": "~/private/launchvm.sh", "tooltip": false }, diff --git a/waybar/myconfig b/waybar/myconfig index 56fded8..29fe7c8 100644 --- a/waybar/myconfig +++ b/waybar/myconfig @@ -59,8 +59,9 @@ "group/quicklinks": { "orientation": "horizontal", "modules": [ + "custom/filemanager", "custom/chatgpt", - "custom/lookingglass" + "custom/windowsvm" ] }, diff --git a/waybar/style.css b/waybar/style.css index b3192ae..231555e 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -148,9 +148,11 @@ window#waybar.empty #window { * Custom Quicklinks * ----------------------------------------------------- */ -#custom-brave, #custom-outlook, #custom-teams, #custom-chatgpt, #custom-calculator, #custom-lookingglass { - margin-right:15px; +#custom-brave, #custom-outlook, #custom-filemanager, #custom-teams, #custom-chatgpt, #custom-calculator, #custom-windowsvm { + margin-right:20px; font-size:20px; + font-weight:bold; + opacity:0.8; } /* -----------------------------------------------------