Merge branch 'main' into hypr-caelestia

.gitignore

@@ -3,7 +3,6 @@ hypr/.config/hypr/env.conf
 hypr/.config/hypr/env.sh
 hypr/.config/hypr/monitor_setup.lua
 # Noctalia template output (shell-owned, regenerated on palette change)
-hypr/.config/hypr/noctalia.lua
 hypr/.config/kitty/themes/noctalia.conf
 # Caelestia runtime output (shell-owned, regenerated on scheme change)
 hypr/.config/hypr/scheme/

hypr/.config/hypr/modules/keybinds.lua

@@ -4,6 +4,7 @@ local command = require("modules.shell_commands")
 
 -- Example binds, see https://wiki.hypr.land/Configuring/Binds/ for more
 hl.bind(var.mainMod .. " + RETURN", hl.dsp.exec_cmd(var.terminal), { description = "Open terminal (kitty)" })
+hl.bind(var.mainMod .. " + ALT + RETURN", hl.dsp.exec_cmd(var.terminal_tmux), { description = "Open terminal (kitty)" })
 hl.bind(var.mainMod .. " + Q", hl.dsp.window.close(), { description = "Close focused window" })
 hl.bind(
 	var.mainMod .. " + ESCAPE",

hypr/.config/hypr/modules/variables.lua

@@ -9,12 +9,15 @@ local theme = dofile(os.getenv("HOME") .. "/.config/themes/current/theme.lua")
 -- local var_menu = "noctalia msg panel-toggle launcher"
 -- local var_screenshot_folder = "~/Bilder/Screenshots/"
 
+local terminal = "kitty"
+
 return {
     color_active_border = theme.border_active,
     color_inactive_border = theme.border_inactive,
     color_decoration_shadow = theme.shadow,
     mainMod = "SUPER",
-    terminal = "kitty",
+    terminal = terminal,
+    terminal_tmux = terminal .. " -e tmux",
     fileManager = "dolphin",
     screenshot_folder = "~/Bilder/Screenshots/",
 }

hypr/.config/hypr/modules/windows_and_workspaces.lua

@@ -62,7 +62,7 @@ hl.window_rule({
 	match = {
 		class = ".*(kitty|dolphin).*",
 	},
-	opacity = "0.80 0.70",
+	opacity = "0.90 0.80",
 })
 -- Noctalia shell surfaces: blur bars/panels/dock/notifications and let
 -- Noctalia run its own animations (no Hyprland layer animation on top).

hypr/.config/hypr/noctalia.lua

@@ -0,0 +1,54 @@
+-- Generated by Noctalia
+
+local primary = "rgb(cba6f7)"
+local surface = "rgb(1e1e2e)"
+local on_surface = "rgb(cdd6f4)"
+local secondary = "rgb(fab387)"
+local on_secondary = "rgb(11111b)"
+local error = "rgb(f38ba8)"
+local on_error = "rgb(11111b)"
+
+local function apply_theme()
+    hl.config({
+        general = {
+            col = {
+                active_border = primary,
+                inactive_border = surface,
+            },
+        },
+        group = {
+            col = {
+                border_active = secondary,
+                border_inactive = surface,
+                border_locked_active = error,
+                border_locked_inactive = surface,
+            },
+
+            groupbar = {
+                col = {
+                    active = secondary,
+                    inactive = surface,
+                    locked_active = error,
+                    locked_inactive = surface,
+                },
+                text_color = on_secondary,
+                text_color_inactive = on_surface,
+                text_color_locked_active = on_error,
+                text_color_locked_inactive = on_surface,
+            },
+        },
+    })
+end
+
+return {
+    colors = {
+        primary = primary,
+        surface = surface,
+        on_surface = on_surface,
+        secondary = secondary,
+        on_secondary = on_secondary,
+        error = error,
+        on_error = on_error,
+    },
+    apply_theme = apply_theme
+}

hypr/.config/hypr/scripts/ensure-env.sh

@@ -1,20 +0,0 @@
-#!/usr/bin/env sh
-
-
-set -eu # Exit immediately if a command exits with a non-zero status, and treat unset variables as an error.
-
-CONF_SOURCE="$HOME/.config/hypr/env.conf.template"
-CONF_TARGET="$HOME/.config/hypr/env.conf"
-SH_SOURCE="$HOME/.config/hypr/env.sh.template"
-SH_TARGET="$HOME/.config/hypr/env.sh"
-
-
-if [ ! -f "$CONF_TARGET" ]; then
-  cp "$CONF_SOURCE" "$CONF_TARGET"
-  echo "Created $CONF_TARGET from template $CONF_SOURCE"
-fi
-
-if [ ! -f "$SH_TARGET" ]; then
-  cp "$SH_SOURCE" "$SH_TARGET"
-  echo "Created $SH_TARGET from template $SH_SOURCE"
-fi

setup/hypr/setup.sh

@@ -14,9 +14,6 @@ run_hypr_scripts() {
     local scripts_dir
     scripts_dir="$(repo_root)/hypr/.config/hypr/scripts"
 
-    echo "==> Fuehre ensure-env.sh aus ..."
-    bash "$scripts_dir/ensure-env.sh"
-
     echo "==> Fuehre portal-host-override.sh aus ..."
     bash "$scripts_dir/portal-host-override.sh"
 

term/.config/fish/config.fish

@@ -141,3 +141,10 @@ export HSA_OVERRIDE_GFX_VERSION=11.0.0
 export HIP_VISIBLE_DEVICES=0
 
 fish_add_path -m $HOME/.local/bin
+
+
+# My shortcuts
+alias fdh="fd -H"
+alias fdhi="fd -HI"
+alias rgh="rg --hidden"
+alias rghi="rg --hidden --no-ignore"

term/.config/starship.toml

@@ -1,4 +1,5 @@
 "$schema" = 'https://starship.rs/config-schema.json'
+palette = "noctalia"
 
 format = """
 [](red)\
@@ -29,7 +30,6 @@ $character"""
 
 right_format = "$cmd_duration"
 
-palette = 'catppuccin_mocha'
 
 [os]
 disabled = false
@@ -202,3 +202,46 @@ base = "#1e1e2e"
 mantle = "#181825"
 crust = "#11111b"
 
+# >>> NOCTALIA STARSHIP PALETTE >>>
+# Noctalia Starship Palette
+# Generated by Noctalia - do not edit manually
+
+[palettes.noctalia]
+# Standard colors
+blue      = "#89b4fa"
+red       = "#f38ba8"
+green     = "#a6e3a1"
+yellow    = "#f9e2af"
+cyan      = "#94e2d5"
+magenta   = "#f5c2e7"
+white     = "#a6adc8"
+black     = "#45475a"
+
+# Extended palette (Catppuccin-compatible names)
+rosewater = "#ebd391"
+flamingo  = "#f37799"
+pink      = "#f2aede"
+mauve     = "#f5c2e7"
+maroon    = "#f37799"
+peach     = "#ebd391"
+teal      = "#94e2d5"
+sky       = "#6bd7ca"
+sapphire  = "#74a8fc"
+lavender  = "#f2aede"
+
+# Text shades
+text      = "#cdd6f4"
+subtext1  = "#a6adc8"
+subtext0  = "#585b70"
+
+# Surface shades
+overlay2  = "#585b70"
+overlay1  = "#585b70"
+overlay0  = "#45475a"
+surface2  = "#45475a"
+surface1  = "#45475a"
+surface0  = "#1e1e2e"
+base      = "#1e1e2e"
+mantle    = "#1e1e2e"
+crust     = "#1e1e2e"
+# <<< NOCTALIA STARSHIP PALETTE <<<