niri: Use caelestia quickshell

nu: Add more m subcommands
helix: Add qml language
2025-12-07 15:11:56 +01:00 · 2025-12-06 16:23:01 +01:00 · 2025-12-06 16:22:31 +01:00 · 2025-11-18 17:44:25 +01:00
7 changed files with 377 additions and 30 deletions
--- a/tree/.config/caelestia/shell.json
+++ b/tree/.config/caelestia/shell.json
@ -0,0 +1,220 @@
 {
    "appearance": {
        "anim": {
            "durations": {
                "scale": 1
            }
        },
        "font": {
            "family": {
                "material": "Material Symbols Rounded",
                "mono": "CaskaydiaCove NF",
                "sans": "Rubik"
            },
            "size": {
                "scale": 1
            }
        },
        "padding": {
            "scale": 1
        },
        "rounding": {
            "scale": 1
        },
        "spacing": {
            "scale": 1
        },
        "transparency": {
            "enabled": false,
            "base": 0.85,
            "layers": 0.4
        }
    },
    "general": {
        "apps": {
            "terminal": [
                "foot"
            ],
            "audio": [
                "pavucontrol"
            ]
        }
    },
    "background": {
        "desktopClock": {
            "enabled": false
        },
        "enabled": true,
        "visualiser": {
            "enabled": true,
            "autoHide": true,
            "rounding": 1,
            "spacing": 1
        }
    },
    "bar": {
        "clock": {
            "showIcon": false
        },
        "dragThreshold": 20,
        "entries": [
            {
                "id": "logo",
                "enabled": true
            },
            {
                "id": "workspaces",
                "enabled": true
            },
            {
                "id": "spacer",
                "enabled": true
            },
            {
                "id": "activeWindow",
                "enabled": true
            },
            {
                "id": "spacer",
                "enabled": true
            },
            {
                "id": "tray",
                "enabled": true
            },
            {
                "id": "clock",
                "enabled": true
            },
            {
                "id": "statusIcons",
                "enabled": true
            },
            {
                "id": "idleInhibitor",
                "enabled": true
            },
            {
                "id": "power",
                "enabled": true
            }
        ],
        "persistent": false,
        "showOnHover": true,
        "status": {
            "showAudio": false,
            "showBattery": true,
            "showBluetooth": true,
            "showMicrophone": false,
            "showKbLayout": false,
            "showNetwork": true
        },
        "tray": {
            "background": true,
            "recolour": true
        },
        "workspaces": {
            "activeIndicator": true,
            "activeLabel": "󰮯",
            "activeTrail": false,
            "groupIconsByApp": true,
            "groupingRespectsLayout": true,
            "windowRighClickContext": true,
            "label": "◦",
            "occupiedBg": true,
            "occupiedLabel": "⊙",
            "showWindows": true,
            "shown": 4,
            "windowIconImage": false,
            "focusedWindowBlob": true,
            "windowIconGap": 0,
            "windowIconSize": 30
        }
    },
    "border": {
        "rounding": 25,
        "thickness": 10
    },
    "dashboard": {
        "mediaUpdateInterval": 500,
        "showOnHover": true
    },
    "launcher": {
        "actionPrefix": ">",
        "dragThreshold": 50,
        "vimKeybinds": false,
        "enableDangerousActions": false,
        "maxShown": 8,
        "maxWallpapers": 9,
        "specialPrefix": "@",
        "useFuzzy": {
            "apps": false,
            "actions": false,
            "schemes": false,
            "variants": false,
            "wallpapers": false
        },
        "showOnHover": false
    },
    "lock": {
        "recolourLogo": false
    },
    "notifs": {
        "actionOnClick": false,
        "clearThreshold": 0.3,
        "defaultExpireTimeout": 5000,
        "expandThreshold": 20,
        "expire": false
    },
    "osd": {
        "enabled": true,
        "enableBrightness": true,
        "enableMicrophone": true,
        "hideDelay": 2000
    },
    "paths": {
        "mediaGif": "root:/assets/bongocat.gif",
        "sessionGif": "root:/assets/kurukuru.gif",
        "wallpaperDir": "~/.config/wallpapers/"
    },
    "services": {
        "audioIncrement": 0.1,
        "defaultPlayer": "Spotify",
        "gpuType": "",
        "playerAliases": [
            {
                "from": "com.github.th_ch.youtube_music",
                "to": "YT Music"
            }
        ],
        "weatherLocation": "",
        "useFahrenheit": false,
        "useTwelveHourClock": false,
        "smartScheme": true,
        "visualiserBars": 45
    },
    "session": {
        "dragThreshold": 30,
        "vimKeybinds": true,
        "commands": {
            "logout": [
                "loginctl",
                "terminate-user",
                ""
            ],
            "shutdown": [
                "systemctl",
                "poweroff"
            ],
            "hibernate": [
                "systemctl",
                "hibernate"
            ],
            "reboot": [
                "systemctl",
                "reboot"
            ]
        }
    }
 }
--- a/tree/.config/helix/languages.toml
+++ b/tree/.config/helix/languages.toml
@ -1,3 +1,6 @@
 [[language]]
 name = "rust"
 diagnostic-severity = "info" # don't show hints
 [language-server.qmlls]
 command = "qmlls6"
--- a/tree/.config/wallpapers/ferris-stamp.png
+++ b/tree/.config/wallpapers/ferris-stamp.png
--- a/tree/.config/hypr/hyprlock.conf.tpl
+++ b/tree/.config/hypr/hyprlock.conf.tpl
@ -51,7 +51,7 @@ input-field {
 # ferris image in the center
 image {
 	monitor =
-	path = ~/.config/wallpapers/ferris-stamp.png
+	path = ~/.config/hypr/ferris-stamp.png
 	rounding = 0
 	size = 300
 	position = 0, 0
--- a/tree/.config/niri/config.kdl.tpl
+++ b/tree/.config/niri/config.kdl.tpl
@ -73,6 +73,18 @@ layout {
    gaps 12
 {% end %}
    // Struts shrink the area occupied by windows, similarly to layer-shell panels.
    // You can think of them as a kind of outer gaps. They are set in logical pixls.
    // Left and right struts will cause the next window to the side to always be visible.
    // Top and bottom struts will simply add outer gaps in addition to the area occupied by
    // layer-shell panels and regular gaps.
    struts {
        left -12
        right -12
        top -12
        bottom -12
    }
    // When to center a column when changing focus, options are:
    // - "never", default behavior, focusing an off-screen column will keep at the left
    //   or right edge of the screen.
@ -113,26 +125,11 @@ layout {
        // active-gradient from="#ffbb66" to="#ffc880" angle=45 relative-to="workspace-view"
        // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view"
    }
    // Struts shrink the area occupied by windows, similarly to layer-shell panels.
    // You can think of them as a kind of outer gaps. They are set in logical pixls.
    // Left and right struts will cause the next window to the side to always be visible.
    // Top and bottom struts will simply add outer gaps in addition to the area occupied by
    // layer-shell panels and regular gaps.
    struts {
        // left 64
        // right 64
        // top 64
        // bottom 64
    }
 }
 spawn-at-startup "hyprpaper"
 spawn-at-startup "eww" "daemon"
 spawn-at-startup "eww" "open" "bar0"
 spawn-at-startup "eww" "open" "bar1"
 spawn-at-startup "swayidle" "-w" // ~/.config/swayidle/config
-spawn-at-startup "swaync"        // ~/.config/swaync
+spawn-at-startup "qs" "-p" "/etc/quickshell/niri-caelestia-shell" 
 // Uncomment this line to ask the clients to omit their client-side decorations if possible.
 // If the client will specifically ask for CSD, the request will be honored.
@ -259,7 +256,7 @@ vec4 close_color(vec3 coords_geo, vec3 size_geo) {
 // https://github.com/YaLTeR/niri/wiki/Configuration:-Window-Rules
 window-rule {
-    geometry-corner-radius 16
+    geometry-corner-radius 22
    clip-to-geometry true
 }
@ -337,9 +334,11 @@ binds {
    // shows a list of important hotkeys.
    Mod+Shift+Plus { show-hotkey-overlay; }
-    Mod+Return { spawn "alacritty"; }
+    Mod+Return { spawn "ghostty"; }
-    Mod+D { spawn "fuzzel"; }
+    Mod+Plus { spawn "loginctl" "lock-session"; }
-    Mod+Plus { spawn "loginctl lock-session"; }
+
    // TODO: why do i have to use spawn-sh?
    Mod+D { spawn "qs" "-p" "/etc/quickshell/niri-caelestia-shell" "ipc" "call" "drawers" "toggle" "launcher"; }
    // You can also use a shell:
    // Mod+T { spawn "bash" "-c" "notify-send hello && exec alacritty"; }
--- a/tree/.face
+++ b/tree/.face
@ -0,0 +1,44 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
   width="120"
   height="120"
   viewBox="0 0 31.75 31.75"
   version="1.1"
   id="svg8"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:dc="http://purl.org/dc/elements/1.1/">
  <defs
     id="defs2" />
  <metadata
     id="metadata5">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <g
     id="layer1"
     style="display:inline">
    <path
       style="fill:#ffffff;stroke-width:0.177246"
       d="m 13.134179,31.651166 c -1.367874,-0.18043 -3.4872278,-0.85238 -4.780367,-1.51563 -1.871747,-0.96002 -4.179215,-3.22966 -5.0074297,-4.92534 -1.5914865,-3.25839 -1.6801158,-7.72336 -0.2278948,-11.48085 1.0247424,-2.65144 2.7098602,-4.5706201 5.4768881,-6.2376401 4.4640374,-2.6894 6.9208324,-4.59636 8.5218534,-6.61464 0.435944,-0.54955 0.851411,-0.9404 0.923263,-0.86855 0.34663,0.34663 0.709996,2.45556 0.596276,3.46071 l -0.118698,1.04918 0.543199,-0.3868 c 0.298763,-0.21273 0.754695,-0.66407 1.013185,-1.00297 0.258491,-0.3389 0.531184,-0.55268 0.605988,-0.47507 0.277608,0.28804 0.872923,2.3693 0.872923,3.05181 0,0.78189 -0.07309,0.70941 2.140938,2.12277 3.360595,2.14527 5.28622,5.2741001 5.845846,9.4985401 0.238089,1.79727 0.119928,4.12317 -0.289284,5.69424 -0.438918,1.68512 -1.295306,3.20011 -2.596637,4.59356 -2.715779,2.90803 -6.119638,4.1954 -10.928887,4.13338 -1.132683,-0.0146 -2.298705,-0.0581 -2.591161,-0.0967 z m 5.683631,-1.1265 c 5.074026,-0.89873 8.492767,-3.70496 9.49005,-7.7898 0.358508,-1.46844 0.317005,-5.28368 -0.07569,-6.95754 -0.594746,-2.53514 -2.005266,-4.78931 -3.64922,-5.8318801 -1.428352,-0.90583 -1.561881,-0.82384 -2.840659,1.7442101 -0.615739,1.23654 -1.777129,3.21756 -2.580868,4.40229 l -1.461342,2.15404 0.927607,0.3153 c 1.188141,0.40386 2.476979,1.20634 2.848748,1.77373 0.272049,0.4152 0.269021,0.4806 -0.04735,1.02231 -0.778356,1.33273 -2.272203,1.79512 -5.849412,1.81056 l -2.340153,0.0101 -2.489801,2.46697 c -2.6276133,2.60352 -2.8788341,3.03045 -2.0880964,3.54856 1.8126654,1.18771 7.0732674,1.8772 10.1561944,1.33115 z m 3.183004,-13.17071 c -0.205126,-0.14999 -0.329285,-0.4602 -0.329285,-0.8227 0,-0.96498 1.087198,-1.43355 1.715448,-0.73934 0.872429,0.96402 -0.338235,2.3283 -1.386163,1.56204 z m -3.186586,4.78402 c 1.133944,-0.30198 1.619925,-0.56299 1.85054,-0.9939 0.246861,-0.46126 -0.269147,-0.94676 -1.770094,-1.66543 -1.062457,-0.50872 -1.296906,-0.55176 -3.013183,-0.55311 -1.794444,-0.001 -1.910137,0.0225 -3.231141,0.66815 -1.860639,0.90936 -2.118197,1.48499 -0.948717,2.12031 1.182601,0.64245 5.357705,0.89133 7.112595,0.42398 z m -5.26747,-0.96936 c -1.113796,-0.13246 -1.303724,-0.23853 -1.149022,-0.64168 0.08921,-0.23246 0.582443,-0.27351 3.286452,-0.27351 1.749822,0 3.307658,0.0484 3.461858,0.10758 0.350902,0.13466 0.365077,0.53097 0.02367,0.66198 -0.432127,0.16582 -4.555272,0.2726 -5.622968,0.14563 z m -3.7845902,-3.81466 c 0.7343882,-0.537 0.2478022,-1.88618 -0.6802563,-1.88618 -0.5030742,0 -0.9992445,0.51278 -0.9992445,1.03268 0,0.90987 0.9453857,1.39029 1.6795008,0.8535 z"
       id="path865" />
    <path
       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
       d="m 7.5967544,-6.2400058 c 0,0 -0.041418,0.1031026 -0.02862,0.2093299 0.012798,0.1062273 0.084435,0.1741091 0.084435,0.1741091 l -0.083147,0.088222 c 0,0 -0.1053512,-0.138166 -0.073877,-0.2774823 0.031474,-0.1393166 0.1012092,-0.1941783 0.101209,-0.1941787 z"
       id="path1039" />
  </g>
  <g
     id="layer2"
     style="display:none" />
  <g
     id="layer3"
     style="display:none" />
 </svg>
--- a/tree/.local/nu/mullvad.nu
+++ b/tree/.local/nu/mullvad.nu
@ -63,9 +63,18 @@ def dns [
 # Build and run mullvad-daemon
 def "m daemon" [
    --release (-r)
-    --boringtun
+    # Force userspace wireguard
    --userwg
    # Use wireguard-go over GotaTun
    --wggo
    # Use stagemole
    --stagemole
    # Attach GDB
    --gdb
    # Add counters and such to nft rules
    --debug-fw
 ] {
    mut daemon_args = []
    mut cargo_flags = []
    mut envs = [
        MULLVAD_RESOURCE_DIR=./dist-assets/
@ -83,8 +92,16 @@ def "m daemon" [
        ]
    }
-    if $boringtun {
+    if $debug_fw {
-        $cargo_flags ++= [--features boringtun]
+        $envs ++= [TALPID_FIREWALL_DEBUG=1]
    }
    if $userwg {
        $envs ++= [TALPID_FORCE_USERSPACE_WIREGUARD=1]
    }
    if $wggo {
        $cargo_flags ++= [--features wireguard-go]
    }
    if (m daemon is-running --system) {
@ -104,17 +121,81 @@ def "m daemon" [
        return
    }
-
+    if $gdb {
-    let daemon_path = if $release {
+        $daemon_args ++= [gdb --args]
        $"($env.CARGO_TARGET_DIR)/release/mullvad-daemon"
    } else {
        $"($env.CARGO_TARGET_DIR)/debug/mullvad-daemon"
    }
    let daemon_path = if $release {
        $daemon_args ++= [$"($env.CARGO_TARGET_DIR)/release/mullvad-daemon"]
    } else {
        $daemon_args ++= [$"($env.CARGO_TARGET_DIR)/debug/mullvad-daemon"]
    }
    # increase verbosity
    $daemon_args ++= ["-vv"]
    cargo b ...$cargo_flags
-    sudo ...$envs $daemon_path -vv
+    sudo ...$envs ...$daemon_args
 }
 def "m android cli" [
    ...args
 ] {
    let socket_filename = "rpc-socket"
    sudo MULLVAD_RPC_SOCKET_PATH=(sudo fd $socket_filename ~/.local/share/waydroid) mullvad ...$args
 }
 def "m android start" [
 ] {
    print "starting net.mullvad.mullvadvpn"    
    adb shell am start -n net.mullvad.mullvadvpn/.ui.MainActivity;
    # TODO: the waydroid cli is bork in the nix flake
    # waydroid app launch net.mullvad.mullvadvpn
 }
 def "m android stop" [
 ] {
    let app_pid = (ps | where name =~ mullvadvpn | get -o pid.0)
    if $app_pid != null {
        print $"kill net.mullvad.mullvadvpn [($app_pid)]"
        sudo kill $app_pid
    } else {
        print "net.mullvad.mullvadvpn is not running"
    }
 }
 def "m android run" [
 ] {
    print "hack: making sure we're disconnected"
    do --ignore-errors { m android cli disconnect }
    print "compiling apk"
    ./gradlew installOssProdDebug
    m android start
 }
 def "m android reload-daemon" [
 ] {
    let daemon_path = (fd libmullvad_jni.so ~/.local/share/waydroid/ | lines | get -o 0)
    if $daemon_path == null {
        print "Can't find libmullvad_jni.so, hot-reload not available. Is the app installed?"
        exit
    }
    m android stop
    print "re-compiling libmullvad_jni.so"
    ./gradlew app:cargoBuildX86_64;
    print "Executing hot-swap!"
    sudo cp ~/.cargo/target/x86_64-linux-android/debug/libmullvad_jni.so $daemon_path;
    m android start
 }
 def "m e2e list" [
    ...args
 ] {
Author	SHA1	Message	Date
Joakim Hulthe	5e7c193a28	niri: Use caelestia quickshell	2025-12-07 15:11:56 +01:00
Joakim Hulthe	67f7129dac	nu: Add more m subcommands	2025-12-06 16:23:01 +01:00
Joakim Hulthe	333bd228d4	helix: Add qml language	2025-12-06 16:22:31 +01:00
Joakim Hulthe	5c7e24e645	mullvad: Add nu waydroid commands	2025-11-18 17:44:25 +01:00