change noctalia theming, refactor brightness script

dotfiles/shared/niri-shared.kdl

@@ -55,6 +55,7 @@ binds {
     Mod+V hotkey-overlay-title="Show clipboard helper" { spawn "noctalia" "msg" "panel-toggle" "clipboard"; }
     Mod+P hotkey-overlay-title="Show power info" { spawn "noctalia" "msg" "panel-toggle" "control-center" "power"; }
     Mod+W hotkey-overlay-title="Show wallpaper panel" { spawn "noctalia" "msg" "panel-toggle" "wallpaper"; }
+    Mod+Shift+W { spawn "noctalia" "msg" "panel-toggle" "noctalia/wallhaven:browser"; }
     Ctrl+Shift+Escape { spawn "noctalia" "msg" "panel-toggle" "control-center" "system"; }
     Mod+R hotkey-overlay-title="Open Remmina panel" { spawn "noctalia" "msg" "panel-toggle" "rylos/remmina:connections"; }
 
@@ -85,6 +86,8 @@ binds {
 
     Mod+Slash { spawn "niri-scratch-workspace-toggle"; }
     Mod+Shift+Slash { move-window-to-workspace "x" focus=false; }
+
+    Pause { spawn "noctalia" "msg" "media" "toggle"; }
 }
 workspace "x" {
     hidden true

dotfiles/takamaki/equibop/equicord-settings.json

@@ -4,7 +4,7 @@
         "authenticated": false,
         "settingsSync": false,
         "url": "https://cloud.equicord.org/",
-        "settingsSyncVersion": 1788703728040
+        "settingsSyncVersion": 1789498433782
     },
     "enableOnlineThemes": true,
     "enabledThemeLinks": [

dotfiles/takamaki/niri.kdl

@@ -70,10 +70,14 @@ binds {
     Mod+Shift+Control+Left { move-window-to-monitor-left; }
     Mod+Shift+Control+Right { move-window-to-monitor-right; }
 
-    Mod+XF86AudioRaiseVolume cooldown-ms=250 { spawn "increase-brightness" "/dev/i2c-10"; }
+    Mod+XF86AudioRaiseVolume cooldown-ms=250 { spawn "brightnessctl" "1" "+5"; }
-    Mod+XF86AudioLowerVolume cooldown-ms=250 { spawn "decrease-brightness" "/dev/i2c-10"; }
+    Mod+XF86AudioLowerVolume cooldown-ms=250 { spawn "brightnessctl" "1" "-5"; }
-    Mod+Shift+XF86AudioRaiseVolume cooldown-ms=250 { spawn "increase-brightness" "/dev/i2c-6"; }
+    Mod+Prior { spawn "brightnessctl" "1" "+5"; }
-    Mod+Shift+XF86AudioLowerVolume cooldown-ms=250 { spawn "decrease-brightness" "/dev/i2c-6"; }
+    Mod+Next { spawn "brightnessctl" "1" "-5"; }
+    Mod+Shift+XF86AudioRaiseVolume cooldown-ms=250 { spawn "brightnessctl" "2" "+5"; }
+    Mod+Shift+XF86AudioLowerVolume cooldown-ms=250 { spawn "brightnessctl" "2" "-5"; }
+    Mod+Shift+Prior { spawn "brightnessctl" "2" "+5"; }
+    Mod+Shift+Next { spawn "brightnessctl" "2" "-5"; }
 }
 window-rule {
     geometry-corner-radius 4
@@ -107,4 +111,5 @@ window-rule {
     default-window-height { fixed 750; }
 }
 
+
 include "noctalia.kdl"

dotfiles/takamaki/noctalia/settings.toml

@@ -1,9 +1,9 @@
 config_version = 13
 
 [backdrop]
-blur_intensity = 0.65999998524785042
+blur_intensity = 0.4999999888241291
 enabled = true
-tint_intensity = 0.44999998994171619
+tint_intensity = 0.29999999329447746
 
 [bar]
 order = [ "default" ]
@@ -12,24 +12,36 @@ order = [ "default" ]
     background_opacity = 0.79999998211860657
     border = "surface_variant"
     border_width = 0.5
+    capsule_group = []
     capsule_radius = 4
     capsule_thickness = 0.69999998807907104
+    center = []
     concave_edge_corners = false
     enabled = false
-    end = [ "notifications", "spacer_2", "tray" ]
+    end = []
     font_family = "SauceCodePro Nerd Font"
     margin_edge = 8
-    margin_ends = 8
     margin_opposite_edge = 8
-    position = "left"
+    padding = 10
-    radius = 8
+    position = "top"
     shadow = false
-    start = [ "workspaces", "spacer_3", "media" ]
+    start = []
     thickness = 44
-    widget_spacing = 12
+    widget_spacing = 18
 
         [bar.default.monitor.DP-2]
+        capsule_group = []
+        center = [ "active_window" ]
         enabled = true
+        end = [ "notifications", "tray", "clock" ]
+        start = [ "workspaces", "media" ]
+
+        [bar.default.monitor.HDMI-A-1]
+        center = [ "clock" ]
+        enabled = true
+        end = [ "bar", "mail", "notifications", "tray" ]
+        start = [ "workspaces", "media", "eyecare_widget_2" ]
+        thickness = 40
 
 [battery.device."/org/freedesktop/UPower/devices/battery_hidpp_battery_0"]
 warning_threshold = 25
@@ -37,6 +49,9 @@ warning_threshold = 25
 [brightness]
 enable_ddcutil = true
 
+[control_center]
+hidden_tabs = [ "monitor", "screen-time" ]
+
     [[control_center.shortcuts]]
     type = "wifi"
 
@@ -50,6 +65,7 @@ type = "notification"
     type = "power_profile"
 
 [desktop_widgets]
+enabled = false
 schema_version = 2
 widget_order = []
 
@@ -67,7 +83,7 @@ border = "surface_variant"
 border_width = 0.5
 concave_edge_corners = false
 cross_axis_padding = 4
-enabled = true
+enabled = false
 inactive_opacity = 0.89999997988343239
 item_spacing = 0
 magnification_scale = 1.1000000014901161
@@ -82,15 +98,19 @@ pinned = [
     "enteauth",
     "com.protonvpn.www"
 ]
-position = "right"
+position = "bottom"
+radius_bottom_left = 8
 radius_bottom_right = 8
-radius_top_right = 8
+radius_top_right = 16
 reserve_space = false
 shadow = false
 show_dots = true
 show_running = false
 smart_auto_hide = true
 
+[hooks]
+started = ""
+
 [idle]
 behavior_order = [ "screen-off" ]
 pre_action_fade_seconds = 30
@@ -98,19 +118,27 @@ pre_action_fade_seconds = 30
     [idle.behavior.screen-off]
     action = "screen_off"
     enabled = true
-    timeout = 600.0
+    locked_timeout = 60.0
+    timeout = 300.0
 
 [location]
 address = "Redditch, England"
 
 [lockscreen]
-enabled = false
+blur_intensity = 0.14999999664723873
 fingerprint = false
+monitors = [ "DP-2" ]
+tint_intensity = 0.19999999552965164
 
 [lockscreen_widgets]
 enabled = false
 schema_version = 2
-widget_order = [ "lockscreen-login-box@HDMI-A-1", "lockscreen-login-box@DP-2", "lockscreen-login-box@HDMI-A-2" ]
+widget_order = [
+    "lockscreen-login-box@winit",
+    "lockscreen-login-box@HDMI-A-1",
+    "lockscreen-login-box@DP-2",
+    "lockscreen-login-box@HDMI-A-2"
+]
 
     [lockscreen_widgets.grid]
     cell_size = 16
@@ -198,6 +226,33 @@ widget_order = [ "lockscreen-login-box@HDMI-A-1", "lockscreen-login-box@DP-2", "
         show_unlock_hint = true
         show_weather = true
 
+    [lockscreen_widgets.widget."lockscreen-login-box@winit"]
+    box_height = 196.0
+    box_width = 810.0
+    cx = 640.0
+    cy = 1166.0
+    output = "winit"
+    placement_height = 1348.0
+    placement_width = 1280.0
+    rotation = 0.0
+    type = "login_box"
+
+        [lockscreen_widgets.widget."lockscreen-login-box@winit".settings]
+        background_color = "surface_variant"
+        background_opacity = 0.88
+        background_radius = 12.0
+        center_password_text = false
+        input_opacity = 1.0
+        input_radius = 6.0
+        layout = "regular"
+        show_caps_lock = true
+        show_keyboard_layout = true
+        show_login_button = true
+        show_media = true
+        show_session_buttons = true
+        show_unlock_hint = true
+        show_weather = true
+
 [nightlight]
 enabled = true
 temperature_day = 6000
@@ -209,6 +264,9 @@ background_opacity = 0.99999997764825821
 [osd]
 background_opacity = 0.99999997764825821
 
+[plugins]
+enabled = [ "radimous/prismlauncher-instances", "icefish/phone-connect", "noctalia/wallhaven" ]
+
 [shell]
 app_icon_color = "on_surface_variant"
 corner_radius_scale = 0.85000001266598701
@@ -220,15 +278,18 @@ popup_shadows = false
     speed = 1.4000000208616257
 
     [shell.launcher]
-    app_grid = true
+    categories = false
+    show_app_origin_indicator = false
 
     [shell.panel]
     clipboard_placement = "attached"
-    launcher_placement = "attached"
+    session_placement = "floating"
-    shadow = false
+    session_position = "center"
+    shadow = true
+    transparency_mode = "glass"
 
     [[shell.session.actions]]
-    action = "logout"
+    action = "reboot"
     countdown_seconds = 0.0
     enabled = true
     shortcut = "1"
@@ -239,73 +300,114 @@ popup_shadows = false
     command = "~/.local/bin/switch-os"
     countdown_seconds = 0.0
     enabled = true
-    glyph = "brand-windows-filled"
+    glyph = "brand-windows"
     label = "Windows"
     shortcut = "2"
     variant = "default"
 
-    [[shell.session.actions]]
-    action = "reboot"
-    countdown_seconds = 0.0
-    enabled = true
-    shortcut = "3"
-    variant = "default"
-
     [[shell.session.actions]]
     action = "shutdown"
     countdown_seconds = 0.0
     enabled = true
-    shortcut = "4"
+    shortcut = "3"
-    variant = "destructive"
+    variant = "primary"
 
 [theme]
 builtin = "Nord"
-community_palette = "Peche"
+community_palette = "Everforest"
 mode = "dark"
-source = "builtin"
+source = "wallpaper"
-wallpaper_scheme = "m3-content"
+wallpaper_scheme = "muted"
 
     [theme.templates]
     builtin_ids = [ "gtk3", "gtk4", "kcolorscheme", "kitty", "niri", "qt" ]
+    community_ids = [ "spicetify", "prismlauncher", "papirus-icons" ]
+
+[wallpaper]
+directory = "/home/grey/Pictures/Wallpapers"
 
     [wallpaper.default]
-path = "/home/grey/Pictures/Wallpapers/2560x1440.png"
+    path = "/home/grey/Pictures/Wallpapers/wallhaven-ly385p.png"
 
     [wallpaper.last]
-path = "/home/grey/Pictures/Wallpapers/2560x1440.png"
+    path = "/home/grey/Pictures/Wallpapers/wallhaven-ly385p.png"
 
     [wallpaper.monitors.DP-2]
-path = "/home/grey/Pictures/Wallpapers/2560x1440.png"
+    path = "/home/grey/Pictures/Wallpapers/wallhaven-ly385p.png"
 
     [wallpaper.monitors.HDMI-A-2]
     path = "/home/grey/Pictures/Wallpapers/2560x1440.png"
 
+    [[wallpaper.favorite]]
+    palette_source = "wallpaper"
+    path = "/home/grey/Pictures/Wallpapers/wallhaven-3qwzpy.png"
+    theme_mode = "dark"
+    wallpaper_scheme = "m3-content"
+
+    [[wallpaper.favorite]]
+    community_palette = "Everforest"
+    palette_source = "community"
+    path = "/home/grey/Pictures/Wallpapers/everforest.webp"
+    theme_mode = "dark"
+
+    [[wallpaper.favorite]]
+    builtin_palette = "Nord"
+    palette_source = "builtin"
+    path = "/home/grey/Pictures/Wallpapers/2560x1440.png"
+    theme_mode = "dark"
+
+    [[wallpaper.favorite]]
+    palette_source = "wallpaper"
+    path = "/home/grey/Pictures/Wallpapers/wallhaven-ly385p.png"
+    theme_mode = "dark"
+    wallpaper_scheme = "muted"
+
 [widget.active_window]
-display = "text_only"
+anchor = true
+display = "icon_and_text"
+title_scroll = "on_hover"
+
+[widget.bar]
+font_scale = 1.25
+type = "icefish/phone-connect:bar"
+
+    [widget.bar.actions]
+    middle = "none"
 
 [widget.clock]
 capsule = true
-capsule_fill = "tertiary"
+capsule_fill = "primary"
-capsule_foreground = "on_tertiary"
+capsule_foreground = "surface"
-capsule_padding = 4
+capsule_padding = 6
-scale = 1.1000000000000001
+capsule_radius = 4
+font_scale = 1.1000000000000001
+
+[widget.eyecare_widget_2]
+type = "apex077/eyecare:eyecare-widget"
+
+[widget.mail]
+font_scale = 1.05
+type = "mdj2812/thunderbird-companion:mail"
 
 [widget.media]
 art_size = 32
 hide_when_no_media = true
+max_length = 200
+title_scroll = "on_hover"
 
 [widget.notifications]
 hide_when_no_unread = true
 scale = 1.1000000000000001
 
-[widget.spacer_2]
-type = "spacer"
-
-[widget.spacer_3]
-type = "spacer"
-
 [widget.sysmon]
 stat = "gpu_usage"
 
+[widget.tray]
+hidden = [ "DNF App Center" ]
+
 [widget.workspaces]
-style = "minimal"
+active_pill_size = 2.5
+label_source = "name"
+labels_only_when_occupied = true
+max_label_chars = 2
+style = "regular"

modules/features/applications/cli/fastfetch.nix

@@ -11,7 +11,19 @@ in {
 
   flake.homeModules.global = { pkgs, lib, config, ... }: {
     imports = [ (inputs.helpers.mkStandardFeature.homeModule { inherit config optionName; } {
-      programs.zsh.initContent = lib.mkOrder 1500 "fastfetch";
+      programs.zsh.initContent = lib.mkOrder 1500 ''
+        SESSION_TYPE=local
+        if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then
+          SESSION_TYPE=remote/ssh
+        else
+          case $(ps -o comm= -p "$PPID") in
+            sshd|*/sshd) SESSION_TYPE=remote/ssh;;
+          esac
+        fi
+        if [ "$SESSION_TYPE" != "remote/ssh" ]; then
+          fastfetch
+        fi
+      '';
       programs.fastfetch.enable = true;
     }) ];
   };

modules/global/home.nix

@@ -18,6 +18,8 @@
       packages = with pkgs; [
         speedtest-go
         bitwarden-cli
+        nixd
+        nixfmt
       ] ++ config.features.applications.extraPackages
       ++ (if config.info.isStandalone then [
         pkgs.home-manager

modules/global/nixos.nix

@@ -59,8 +59,6 @@
       busybox
       ethtool
       hyperfine
-      nixd
-      nixfmt
     ] ++ config.features.applications.extraPackages;
 
     programs = {

modules/hosts/takamaki/home/kitty.nix

@@ -9,6 +9,7 @@
 
       extraConfig = ''
         include ${config.xdg.configHome}/kitty/themes/noctalia.conf
+        include ${config.xdg.configHome}/kitty/current-theme.conf
       '';
     };
   };

modules/hosts/takamaki/takamaki.nix

@@ -64,7 +64,6 @@
             enable = true;
             spicetify = {
               enable = true;
-              theme = "comfy";
             };
           };
           thunderbird.enable = true;
@@ -75,26 +74,11 @@
           nix-init
         ];
 
-        shellScripts = let 
+        shellScripts = {
-          mkBrightnessScript = direction: scriptName: ''
-            LOOP_COUNTER=0
-            DEVICE=$1
-            PRETTY_NAME=$(sudo ddccontrol dev:$DEVICE 2>&1 >/dev/null | grep -oP "/usr/share/ddccontrol-db/monitor/\K.+\.xml" | sed 's/.xml//')
-            WRITTEN="foo"
-            CONTROL="bar"
-            while [[ "$WRITTEN" != "$CONTROL" ]] && [ $LOOP_COUNTER -lt 3 ]; do
-              RESULT=$(sudo ddccontrol -r 0x10 -W ${direction}5 dev:$DEVICE 2> /dev/null)
-              WRITTEN=$(echo $RESULT | grep -oP "Writing.+\(\K\d{1,3}\)" | sed 's/)//')
-              CONTROL=$(echo $RESULT | grep -oP "Control.+\+/\K\d{1,3}/100" | sed 's/\/100//')
-              LOOP_COUNTER=$(($LOOP_COUNTER + 1))
-            done
-
-            notify-send -e -a "${scriptName}" "Set brightness to $WRITTEN for display $PRETTY_NAME"
-          '';
-        in {
           switch-os = ''
-            sudo efibootmgr --bootnext 0000
+            if sudo efibootmgr --bootnext 0000 >/dev/null; then
               sudo reboot
+            fi
           '';
 
           universal-reboot = ''
@@ -117,9 +101,36 @@
             fi
           '';
 
-          increase-brightness = mkBrightnessScript "+" "increase-brightness script";
+          brightnessctl = ''
+            LOOP_COUNTER=0
             
-          decrease-brightness = mkBrightnessScript "-" "decrease-brightness script";
+            if [ "$1" == "1" ]; then
+              DEVICE="/dev/i2c-10"
+            elif [ "$1" == "2" ]; then
+              DEVICE="/dev/i2c-6"
+            else
+              DEVICE=$1
+            fi
+
+            MODE_TEST=$(echo "$2" | grep -oP '^\D')
+            if [ "$MODE_TEST" == "+" ] || [ "$MODE_TEST" == "-" ]; then
+              MODE="-W"
+            else
+              MODE="-w"
+            fi
+
+            PRETTY_NAME=$(sudo ddccontrol dev:$DEVICE 2>&1 >/dev/null | grep -oP "/usr/share/ddccontrol-db/monitor/\K.+\.xml" | sed 's/.xml//')
+            WRITTEN="foo"
+            CONTROL="bar"
+            while [[ "$WRITTEN" != "$CONTROL" ]] && [ $LOOP_COUNTER -lt 3 ]; do
+              RESULT=$(sudo ddccontrol -r 0x10 $MODE $2 dev:$DEVICE 2> /dev/null)
+              WRITTEN=$(echo $RESULT | grep -oP "Writing.+\(\K\d{1,3}\)" | sed 's/)//')
+              CONTROL=$(echo $RESULT | grep -oP "Control.+\+/\K\d{1,3}/100" | sed 's/\/100//')
+              LOOP_COUNTER=$(($LOOP_COUNTER + 1))
+            done
+
+            notify-send -e -a "brightnessctl script" "Set brightness to $WRITTEN for display $PRETTY_NAME"
+          '';
         };
       };
     };