config stash laptop

2025-09-19 03:32:21 +02:00
parent eda18e8286
commit 8d6ddde180
12 changed files with 266 additions and 36 deletions
--- a/.config/gtk-3.0/bookmarks
+++ b/.config/gtk-3.0/bookmarks
@@ -1,7 +1,6 @@
-file:///home/cnachtigall/Downloads Downloads
-file:///home/cnachtigall/Music Music
-file:///home/cnachtigall/Videos Videos
-file:///home/cnachtigall/blender
-file:///home/cnachtigall/Nextcloud/Documents Documents
-file:///home/cnachtigall/Nextcloud/Pictures Pictures
-file:///home/cnachtigall/Nextcloud/Projects Projects
+file:///home/vikingowl/Downloads Downloads
+file:///home/vikingowl/Music Music
+file:///home/vikingowl/Videos Videos
+file:///home/vikingowl/Nextcloud/Documents Documents
+file:///home/vikingowl/Nextcloud/Pictures Pictures
+file:///home/vikingowl/Nextcloud/Projects Projects
--- a/.config/hypr/conf.d/40-keybinds.conf
+++ b/.config/hypr/conf.d/40-keybinds.conf
@@ -83,8 +83,13 @@ bind = $mainMod CTRL, A, exec, $notcloseall
 #bind = ALT SHIFT, 4, exec, GRIMBLAST_EDITOR="satty -f" grimblast --notify edit area

 #testing stuff
+<<<<<<< HEAD
 bind = ALT SHIFT, 3, exec, GRIMBLAST_EDITOR="/home/cnachtigall/data/git/clone/Satty/target/debug/satty -f" grimblast --notify edit output
 bind = ALT SHIFT, 4, exec, GRIMBLAST_EDITOR="/home/cnachtigall/data/git/clone/Satty/target/debug/satty -f" grimblast --notify edit area
+=======
+bind = ALT SHIFT, 3, exec, GRIMBLAST_EDITOR="/home/vikingowl/git/clone/Satty/target/debug/satty -f" grimblast --notify edit output
+bind = ALT SHIFT, 4, exec, GRIMBLAST_EDITOR="/home/vikingowl/git/clone/Satty/target/debug/satty -f" grimblast --notify edit area
+>>>>>>> f130af1 (config stash laptop)

 # Move focus with mainMod + arrow keys
 bind = $mainMod, left, movefocus, l
--- a/.config/hypr/conf.d/50-autostart.conf
+++ b/.config/hypr/conf.d/50-autostart.conf
@@ -1,8 +1,17 @@
 # ~/.config/hypr/conf.d/50-autostart.conf

 exec-once = uwsm app -- swaync
+<<<<<<< HEAD
 exec-once = xsettingsd
 exec-once = hyprsunset -l 48.1:11.6
 exec-once = ~/.config/waybar/scripts/hyprsunset_daemon.sh
+=======
+exec-once = uwsm app -- waybar
+exec-once = xsettingsd
+exec-once = hyprsunset
+exec-once = xrdb -merge ~/.Xresources
+exec-once = uwsm finalize WAYLAND_DISPLAY DISPLAY GDK_SCALE GDK_DPI_SCALE QT_SCALE_FACTOR
+>>>>>>> f130af1 (config stash laptop)

+exec = hyprpaper -c $HOME/.config/hyprpaper.conf
 exec = swayosd-server
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -3,3 +3,6 @@
 source = ~/.config/hypr/monitors.conf # generated by nwg-displays
 source = ~/.config/hypr/workspaces.conf # generated by nwg-displays
 source = ~/.config/hypr/conf.d/*.conf
+
+env = GDK_SCALE, 1.6
+env = XCURSOR_SIZE, 22
--- a/.config/hypr/hyprlock.conf
+++ b/.config/hypr/hyprlock.conf
@@ -10,20 +10,10 @@ general {
 ##################

 background {
-  monitor = DP-2
-  path    = $HOME/.config/hypr/images/ultrawide.jpg
-}
-
-background {
-  monitor = DP-1
+  monitor = eDP-1
  path    = $HOME/.config/hypr/images/standard.jpg
 }

-background {
-  monitor = HDMI-A-1
-  path    = $HOME/.config/hypr/images/vertical.jpg
-}
-
 #############
 ### INPUT ###
 #############
--- a/.config/hypr/hyprpaper.conf
+++ b/.config/hypr/hyprpaper.conf
@@ -6,12 +6,8 @@ splash_offset = 2.0
 ipc = true

 # Preload your ultrawide as a quick fallback
-preload = $HOME/.config/hypr/images/ultrawide.jpg
 preload = $HOME/.config/hypr/images/standard.jpg
-preload = $HOME/.config/hypr/images/vertical.jpg

 # Per-monitor wallpaper assignments
-wallpaper = DP-2,    $HOME/.config/hypr/images/ultrawide.jpg
-wallpaper = DP-1,    $HOME/.config/hypr/images/standard.jpg
-wallpaper = HDMI-A-1,$HOME/.config/hypr/images/vertical.jpg
+wallpaper = eDP-1,    $HOME/.config/hypr/images/standard.jpg

--- a/.config/hypr/monitors.conf
+++ b/.config/hypr/monitors.conf
@@ -1,6 +1,13 @@
+<<<<<<< HEAD
 # Generated by nwg-displays on 2025-09-13 at 17:34:43. Do not edit manually.

 monitor = DP-1, 2560x1440@99.95, 1920x1584, 1, bitdepth, 10, cm, auto
 monitor = DP-2, 3440x1440@100.0, 1476x144, 1, bitdepth, 10, cm, auto
 monitor = HDMI-A-1, 1920x1080@60.0, 0x1584, 1
+=======
+# Generated by nwg-displays on 2025-09-09 at 00:25:22. Do not edit manually.
+
+#monitor=eDP-1,3000x2000@60.0,0x0,1.5999999999999996,bitdepth,10
+monitor = eDP-1, preferred, auto, 1.6, bitdepth, 10, cm, hdr
+>>>>>>> f130af1 (config stash laptop)
 monitor = , preferred, auto, 1
--- a/.config/hypr/workspaces.conf
+++ b/.config/hypr/workspaces.conf
@@ -1,12 +1,12 @@
-# Generated by nwg-displays on 2025-07-19 at 13:37:04. Do not edit manually.
+# Generated by nwg-displays on 2025-09-09 at 00:25:19. Do not edit manually.

-workspace=1,monitor:DP-1,default:true
-workspace=2,monitor:DP-1
-workspace=3,monitor:DP-1
-workspace=4,monitor:DP-1
-workspace=5,monitor:DP-2,default:true
-workspace=6,monitor:DP-2
-workspace=7,monitor:DP-2
-workspace=8,monitor:HDMI-A-1,default:true
-workspace=9,monitor:HDMI-A-1
-workspace=10,monitor:HDMI-A-1
+workspace=1,monitor:eDP-1,default:true
+workspace=2,monitor:eDP-1
+workspace=3,monitor:eDP-1
+workspace=4,monitor:eDP-1
+workspace=5,monitor:eDP-1
+workspace=6,monitor:eDP-1
+workspace=7,monitor:eDP-1
+workspace=8,monitor:eDP-1
+workspace=9,monitor:eDP-1
+workspace=10,monitor:eDP-1
--- a/.config/qt5ct/qt5ct.conf
+++ b/.config/qt5ct/qt5ct.conf
@@ -1,6 +1,6 @@
 [Appearance]
 %23color_scheme_path=/usr/share/qt5ct/colors/darker.conf
-color_scheme_path=/home/cnachtigall/.config/qt5ct/colors/midnight-ocean.conf
+color_scheme_path=/home/vikingowl/.config/qt5ct/colors/midnight-ocean.conf
 custom_palette=true
 icon_theme=BeautySolar
 standard_dialogs=gtk3
--- a/.config/qt6ct/qt6ct.conf
+++ b/.config/qt6ct/qt6ct.conf
@@ -1,5 +1,5 @@
 [Appearance]
-color_scheme_path=/home/cnachtigall/.config/qt6ct/colors/midnight-ocean.conf
+color_scheme_path=/home/vikingowl/.config/qt6ct/colors/midnight-ocean.conf
 custom_palette=true
 icon_theme=BeautySolar
 standard_dialogs=gtk3
--- a/.config/waybar/config.jsonc##hostname.viking-mate
+++ b/.config/waybar/config.jsonc##hostname.viking-mate
@@ -1,4 +1,140 @@
+<<<<<<< HEAD
 [
  { "include": ["base.jsonc", "conf.d/laptop.jsonc"] }
 ]

+=======
+{
+  "layer": "bottom",
+  "output": [
+    "eDP-1",
+  ],
+  "position": "bottom",
+  "mod": "dock",
+  "exclusive": true,
+  "gtk-layer-shell": true,
+  "passthrough": false,
+  "height": 32,
+  "modules-left": [
+    "hyprland/workspaces"
+  ],
+  "modules-center": [
+    "privacy"
+  ],
+  "modules-right": [
+    "cpu",
+    "memory",
+    "disk",
+    "network",
+    "pulseaudio",
+    "bluetooth",
+    "battery",
+    "custom/alhp",
+    "custom/razer-mouse-battery",
+    "tray",
+    "clock",
+  ],
+  "hyprland/workspaces": {
+    "icon-size": 28,
+    "spacing": 12,
+    "on-scroll-up": "hyprctl dispatch workspace r+1",
+    "on-scroll-down": "hyprctl dispatch workspace r-1",
+  },
+  "cpu": {
+    "interval": 5,
+    "format": "<span color=\"#4F84CC\"></span>  <span color=\"#CAD3E8\">{usage}%</span>",
+  },
+  "memory": {
+    "interval": 10,
+    "format": "<span color=\"#4F84CC\"></span>  <span color=\"#CAD3E8\">{percentage}%</span>",
+    "tooltip": true,
+  },
+  "disk": {
+    "interval": 30,
+    "format": "<span color=\"#4F84CC\">󰋊</span>  <span color=\"#CAD3E8\">{percentage_used}%</span>",
+    "tooltip": true,
+  },
+  "mpris": {
+    "format": "{player_icon} {dynamic}",
+    "format-paused": "{status_icon} <i>{dynamic}</i>",
+    "dynamic-len": 50,
+    "ellipsis": "…",
+    "player-icons": {
+      "default": "▶",
+      "mpv": "🎵",
+    },
+    "status-icons": {
+      "paused": "⏸",
+    },
+  },
+  "network": {
+    "format-wifi": "<span color=\"#4F84CC\"></span>  <span color=\"#CAD3E8\">{essid} ({signalStrength}%)</span>",
+    "format-ethernet": "<span color=\"#4F84CC\"></span>  <span color=\"#CAD3E8\">{ifname}</span>",
+    "format-disconnected": "<span color=\"#FFCC33\">󰌙  Disconnected</span>",
+    "tooltip": true,
+    "tooltip-format": "<span color=\"#CAD3E8\">{ifname} via {gwaddr}</span>",
+  },
+  "pulseaudio": {
+    "format": "<span color=\"#4F84CC\">{icon}</span>  <span color=\"#CAD3E8\">{volume}%</span>",
+    "format-muted": "<span color=\"#FFCC33\">  Muted</span>",
+    "scroll-step": 5,
+    "on-click": "pavucontrol",
+    "interval": 30,
+    "format-icons": {
+      // match these to the sink NAMES you see in `pactl list sinks`
+      "alsa_output.usb-SteelSeries_Arctis_7_-00.analog-stereo": "", // SteelSeries headset
+      "alsa_output.pci-0000_0a_00.4.iec958-stereo": "", // speaker icon for your soundbar
+      "bluez_output.50_5E_5C_2D_F3_B2.1": "", // Bluetooth earbud icon
+      "default": [
+        "",
+        ""
+      ], // fallback (low/hi)
+    },
+  },
+  "bluetooth": {
+    "format": "<span color=\"#4F84CC\"></span>  <span color=\"#CAD3E8\">{status}</span>",
+    "format-connected": "<span color=\"#4F84CC\"></span>  <span color=\"#CAD3E8\">{device_alias} ({device_battery_percentage}%)</span>",
+  },
+  "battery": {
+    "states": {
+      "good": 95,
+      "warning": 30,
+      "critical": 20,
+    },
+    "format": "<span color=\"#4F84CC\">{icon}</span>  <span color=\"#CAD3E8\">{capacity}%</span>",
+    "format-charging": "<span color=\"#4F84CC\"> {capacity}%</span>",
+  },
+  "custom/alhp": {
+    "exec": "$HOME/.config/waybar/scripts/alhp.sh",
+    "return-type": "json",
+    "interval": 60,
+    "format": "{text}",
+    "tooltip": true,
+  },
+  "custom/razer-mouse-battery": {
+    "exec": "$HOME/.config/waybar/scripts/razer_basilisk_v3_pro_battery_info.sh",
+    "return-type": "json",
+    "interval": 10,
+    "format": "{text}",
+    "tooltip": true,
+  },
+  "tray": {
+    "icon-size": 18,
+    "spacing": 4,
+  },
+  "clock": {
+    "format": "<span color=\"#CAD3E8\">{:%R | %d.%m.%Y}</span>",
+    "tooltip-format": "<tt><span color=\"#CAD3E8\"><small>{calendar}</small></span></tt>",
+    "calendar": {
+      "mode": "year",
+      "mode-mon-col": 3,
+      "weeks-pos": "right",
+    },
+    "actions": {
+      "on-click-right": "mode",
+      "on-scroll-up": "shift_up",
+      "on-scroll-down": "shift_down",
+    },
+  },
+}
+>>>>>>> f130af1 (config stash laptop)
--- a/.config/waybar/style.css##hostname.viking-mate
+++ b/.config/waybar/style.css##hostname.viking-mate
@@ -0,0 +1,85 @@
+/* Palette */
+@define-color bg_main          rgba(11, 27, 43, 0.85);
+@define-color bg_main_tooltip  rgba(11, 27, 43, 0.95);
+@define-color bg_hover         rgba(79, 132, 204, 0.3);
+@define-color bg_active        rgba(53, 107, 171, 0.7);
+@define-color border_main      rgba(79, 132, 204, 0.5);
+@define-color content_main     #CAD3E8;
+@define-color content_inactive rgba(202, 211, 232, 0.4);
+@define-color warning_color    #FFCC33;
+
+/* Reset & Font */
+* {
+  font-family: "Inconsolata Go Nerd Font";
+  font-size: 14px;
+  text-shadow: none;
+  box-shadow: none;
+  border-radius: 0;
+  margin: 0;
+  padding: 0;
+}
+
+/* Bar Background */
+window#waybar {
+  background: @bg_main;
+  color: @content_main;
+  border-top: 1px solid @border_main;
+}
+
+/* Tooltips */
+tooltip {
+  background: @bg_main_tooltip;
+  border: 1px solid @border_main;
+  border-radius: 4px;
+  padding: 4px 6px;
+}
+
+/* Module Spacing & Hover */
+.module {
+  padding: 0 6px;
+  margin: 0 2px;
+}
+.module:hover {
+  background: @bg_hover;
+}
+
+/* Separator Border */
+#cpu,
+#memory,
+#disk,
+#network,
+#pulseaudio,
+#bluetooth,
+#custom-alhp,
+#custom-razer-mouse-battery {
+  border-right: 1px solid @border_main;
+}
+
+/* Workspaces Buttons */
+#workspaces button {
+  padding: 4px 6px;
+  color: @content_inactive;
+}
+#workspaces button.active {
+  background: @bg_active;
+  color: @content_main;
+}
+#workspaces button.focused {
+  background: @bg_hover;
+  color: @content_main;
+}
+#workspaces button.urgent {
+  background: rgba(255, 204, 51, 0.35);
+  color: @warning_color;
+}
+
+/* Tray & Clock Padding */
+#tray,
+#clock {
+  padding: 0 6px;
+}
+
+/* Critical Battery Color */
+#battery.critical span {
+  color: @warning_color;
+}