Working on porting to new ags version

2025-07-09 16:09:53 +02:00
33 changed files with 648 additions and 1151 deletions
--- a/flake.lock
+++ b/flake.lock
@ -6,11 +6,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1756679577,
-        "narHash": "sha256-pkfftqE2CxVN6nKDZvlNdBxIkb/x5ch4wVfwZMYNGCM=",
+        "lastModified": 1744557573,
+        "narHash": "sha256-XAyj0iDuI51BytJ1PwN53uLpzTDdznPDQFG4RwihlTQ=",
        "owner": "aylur",
        "repo": "ags",
-        "rev": "04d51ac4082af3ec47e8a803417a1a55b75151d7",
+        "rev": "3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6",
        "type": "github"
      },
      "original": {
@ -27,11 +27,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1756474652,
-        "narHash": "sha256-iiBU6itpEqE0spXeNJ3uJTfioSyKYjt5bNepykpDXTE=",
+        "lastModified": 1742571008,
+        "narHash": "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q=",
        "owner": "aylur",
        "repo": "astal",
-        "rev": "20bd8318e4136fbd3d4eb2d64dbabc3acbc915dd",
+        "rev": "dc0e5d37abe9424c53dcbd2506a4886ffee6296e",
        "type": "github"
      },
      "original": {
@ -129,11 +129,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1756788591,
-        "narHash": "sha256-LOrOfPWpJU/ADWDyVwPv9XNuYPq5KJtmAmSzplpccmE=",
+        "lastModified": 1750304462,
+        "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "f3d3b4592a73fb64b5423234c01985ea73976596",
+        "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c",
        "type": "github"
      },
      "original": {
@ -165,11 +165,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1756542300,
-        "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=",
+        "lastModified": 1743583204,
+        "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa",
+        "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434",
        "type": "github"
      },
      "original": {
@ -197,11 +197,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1756542300,
-        "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=",
+        "lastModified": 1750134718,
+        "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa",
+        "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c",
        "type": "github"
      },
      "original": {
@ -213,11 +213,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1756542300,
-        "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=",
+        "lastModified": 1750134718,
+        "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa",
+        "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c",
        "type": "github"
      },
      "original": {
@ -246,14 +246,15 @@
    "nur": {
      "inputs": {
        "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_4",
+        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1756791666,
-        "narHash": "sha256-PSwg6aIlR2+ACQ+1CV76kiXdl/E21fQG6/7xCoOcbCY=",
+        "lastModified": 1750323839,
+        "narHash": "sha256-r2Izw07xe5JEWLjQLI4Y3C/Sw2VNBGNmnZTVWtOyzlg=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "678bf16a5f1a7e2df5b75d4c62da44bc67921462",
+        "rev": "7f1902da6a047ccffbbb809b98205d08cd5df509",
        "type": "github"
      },
      "original": {
@ -273,6 +274,27 @@
        "worktimer": "worktimer"
      }
    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733222881,
+        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
    "worktimer": {
      "inputs": {
        "flake-parts": "flake-parts_3",
--- a/flake.nix
+++ b/flake.nix
@ -31,7 +31,7 @@
                ]; }
                {
                    networking.hostName = host;
-                    time.timeZone = "Asia/Bangkok";
+                    time.timeZone = "Europe/Brussels";
                    nix.settings = {
                        substituters = [
                            "https://nix-community.cachix.org"
@ -91,7 +91,5 @@
                Asturia = { user = "user"; };
            };
        in
-            {
-            nixosConfigurations = nixpkgs.lib.mapAttrs mkSystem systems;
-        };
+            { nixosConfigurations = nixpkgs.lib.mapAttrs mkSystem systems; };
 }
--- a/home/Aloria.nix
+++ b/home/Aloria.nix
@ -3,10 +3,13 @@ let
    fzgo_paths = {
        files = [
            "/home/user/.dotfiles"
+            "/home/server/.cache/fzgo/entries/f/|home|user|Workspace"
        ];
        dirs = [
            "/home/user/.dotfiles"
-            "/Storage/TrackBox"
+            "/home/server/.cache/fzgo/entries/d/|home|user|Workspace"
+            "/home/server/.cache/fzgo/entries/d/|home|server|Storage|Thomas"
+            "/home/server/.cache/fzgo/entries/d/|home|server|Storage|Shared"
        ];
    };
 in
@ -19,8 +22,7 @@ in
    programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Aloria/id_ed25519";

    home.packages = with pkgs; [
-        # jetbrains.pycharm-professional
-        zed-editor
+        jetbrains.pycharm-professional
        distrobox
        gnome-disk-utility
        moonlight-qt
@ -43,9 +45,9 @@ in

    wayland.windowManager.hyprland.settings = {
        monitor = [
-            "eDP-1,2880x1800@120.00Hz,0x284,1.2,vrr,1"
-            "DP-1,1920x1080,6240x500,1"
-            "HDMI-A-1,3840x2160@60.00Hz,2400x0,1"
+            "eDP-1,2880x1800@120.00Hz,0x0,1.2"
+            "DP-1,3840x2160@60.00Hz,0x-2160,1"
+            "HDMI-A-1,3840x2160@60.00Hz,0x-2160,1"
        ];
        bind = [
            ", XF86PowerOff, exec, ${pkgs.rofi}/bin/rofi -show power-menu -modi power-menu:${
--- a/home/Arendia.nix
+++ b/home/Arendia.nix
@ -3,10 +3,13 @@ let
    fzgo_paths = {
        files = [
            "/home/user/.dotfiles"
+            "/home/server/.cache/fzgo/entries/f/|home|user|Workspace"
        ];
        dirs = [
            "/home/user/.dotfiles"
-            "/Storage/TrackBox/"
+            "/home/server/.cache/fzgo/entries/d/|home|user|Workspace"
+            "/home/server/.cache/fzgo/entries/d/|home|server|Storage|Thomas"
+            "/home/server/.cache/fzgo/entries/d/|home|server|Storage|Shared"
        ];
    };
 in
--- a/home/Mallorea.nix
+++ b/home/Mallorea.nix
@ -23,30 +23,30 @@ let
                ${pkgs.notmuch}/bin/notmuch new
            '');
        };
-        # sync_vault = {
-        #     when = "*-*-* 02:00:00";
-        #     script = toString (pkgs.writeShellScript "script" ''
-        #         source $HOME/.secrets/Backup/env.sh
-        #         for _ in {1..2}; do
-        #             OUTPUT=$(echo "$ZFS_PASSPHRASE" | ssh 10.4.0.1 zfs load-key Vault/Thomas/Encrypted  2>&1);
-        #             if [ "$OUTPUT" == "Key load error: Key already loaded for 'Vault/Thomas/Encrypted'." ]; then
-        #                 echo "Key successfully loaded, starting syncoid"
-        #                 syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Thomas/Workspace 10.4.0.1:Vault/Thomas/Encrypted/Storage/Workspace
-        #                 syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Thomas 10.4.0.1:Vault/Thomas/Encrypted/Storage/T
-        #                 syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Emily 10.4.0.1:Vault/Thomas/Encrypted/Storage/N
-        #                 syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Yolande 10.4.0.1:Vault/Thomas/Encrypted/Storage/Y
-        #                 syncoid --no-privilege-elevation --no-sync-snap tank/Containers 10.4.0.1:Vault/Thomas/Encrypted/Containers
-        #                 ssh 10.4.0.1 zfs unload-key Vault/Thomas/Encrypted
-        #                 ${pkgs.curl}/bin/curl https://uptime.thomasave.be/api/push/s39pIIrB0R
-        #                 exit 0
-        #             fi
-        #         done
-        #
-        #         echo "Found output instead: $OUTPUT"
-        #         echo "Failed to load key: $OUTPUT" | sendmail
-        #         exit 1
-        #         '');
-        #         };
+        sync_vault = {
+            when = "*-*-* 02:00:00";
+            script = toString (pkgs.writeShellScript "script" ''
+                source $HOME/.secrets/Backup/env.sh
+                for _ in {1..2}; do
+                    OUTPUT=$(echo "$ZFS_PASSPHRASE" | ssh 10.4.0.1 zfs load-key Vault/Thomas/Encrypted  2>&1);
+                    if [ "$OUTPUT" == "Key load error: Key already loaded for 'Vault/Thomas/Encrypted'." ]; then
+                        echo "Key successfully loaded, starting syncoid"
+                        syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Thomas/Workspace 10.4.0.1:Vault/Thomas/Encrypted/Storage/Workspace
+                        syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Thomas 10.4.0.1:Vault/Thomas/Encrypted/Storage/T
+                        syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Emily 10.4.0.1:Vault/Thomas/Encrypted/Storage/N
+                        syncoid --no-privilege-elevation --no-sync-snap tank/Storage/Yolande 10.4.0.1:Vault/Thomas/Encrypted/Storage/Y
+                        syncoid --no-privilege-elevation --no-sync-snap tank/Containers 10.4.0.1:Vault/Thomas/Encrypted/Containers
+                        ssh 10.4.0.1 zfs unload-key Vault/Thomas/Encrypted
+                        ${pkgs.curl}/bin/curl https://uptime.thomasave.be/api/push/s39pIIrB0R
+                        exit 0
+                    fi
+                done
+
+                echo "Found output instead: $OUTPUT"
+                echo "Failed to load key: $OUTPUT" | sendmail
+                exit 1
+                '');
+                };
        backup = {
            when = "*-*-* 04:00:00";
            script = toString (pkgs.writeShellScript "script" ''
--- a/home/ags/default.nix
+++ b/home/ags/default.nix
@ -2,6 +2,7 @@
 {
    # add the home manager module
    imports = [ inputs.ags.homeManagerModules.default ];
+
    programs.ags = {
        enable = true;

@ -10,7 +11,6 @@
        extraPackages = with inputs.ags.packages.${pkgs.system}; [
            pkgs.gtksourceview
            pkgs.accountsservice
-            pkgs.libadwaita

            battery
            hyprland
--- a/home/ags/files/Bar.tsx
+++ b/home/ags/files/Bar.tsx
@ -1,48 +1,37 @@
-import { Astal, Gdk, Gtk } from "ags/gtk4";
-import app from "ags/gtk4/app";
-import { createBinding, createState, For, With, Accessor } from "ags";
-import { createPoll } from "ags/time";
+import { Astal, Gdk } from "ags/gtk4";
+import app from "ags/gtk4/app"
+import Gtk from "gi://Gtk?version=4.0"
+import { createBinding, createState } from "ags"
 import Tray from "gi://AstalTray";
-import { execAsync } from "ags/process";
+import { execAsync } from "ags/process"
 import Hyprland from "gi://AstalHyprland";
 import { getIconName } from "./utils";
-import Wp from "gi://AstalWp";
-import Battery from "gi://AstalBattery";
-import GLib from "gi://GLib";
+import Wp from "gi://AstalWp"
+import Battery from "gi://AstalBattery"

-const battery = Battery.get_default();
-const sensorsAvailable = await execAsync(["sensors"])
-    .then(() => true)
-    .catch(() => false);
+const battery = Battery.get_default()
+const sensorsAvailable = await execAsync(['sensors']).then(() => true).catch(() => false);
 const wirePlumber = Wp.get_default();

 function SysTray(): JSX.Element {
    const tray = Tray.get_default();
-    let items = createBinding(tray, "items");
-    const init = (btn: Gtk.MenuButton, item: Tray.TrayItem) => {
-        btn.menuModel = item.menuModel;
-        btn.insert_action_group("dbusmenu", item.actionGroup);
-        item.connect("notify::action-group", () => {
-            btn.insert_action_group("dbusmenu", item.actionGroup);
-        });
-    };
    return (
        <box>
-            <For each={items}>
-                {(item: Tray.TrayItem) => {
+            {createBinding(tray, "items").as((items) =>
+                items.map((item) => {
                    if (item.iconThemePath) app.add_icons(item.iconThemePath);
                    return (
                        <menubutton
-                            $={(self) => init(self, item)}
                            class="systray"
                            tooltipMarkup={createBinding(item, "tooltipMarkup")}
-                            menuModel={createBinding(item, "menuModel")}
-                        >
-                            <image gicon={item.gicon} class="systray-item" />
+                            usePopover={false}
+                            actionGroup={createBinding(item, "actionGroup").as(ag => ["dbusmenu", ag])}
+                            menuModel={createBinding(item, "menuModel")}>
+                            {/* <icon gicon={createBinding(item, "gicon")} class="systray-item" /> */}
                        </menubutton>
                    );
-                }}
-            </For>
+                }),
+            )}
        </box>
    );
 }
@ -64,75 +53,83 @@ function Center(): JSX.Element {
 }

 function Date({ format = "%Y-%m-%d" }): JSX.Element {
-    const time = createPoll<string>(
-        "",
-        60000,
-        () => GLib.DateTime.new_now_local().format(format)!,
-    );
-    return (
-        <button
+    const time = createState<string>("").poll(60000, () =>
+        GLib.DateTime.new_now_local().format(format)!)
+    return <button
        class="item"
-            label={time}
-            onClicked={() => execAsync(["gnome-calendar"])}
+        onDestroy={() => time.drop()}
+        label={time()}
+        onClicked={() => execAsync(['gnome-calendar'])}
    />
-    );
 }

 function Time({ format = "%H:%M:%S" }): JSX.Element {
-    const time = createPoll<string>(
-        "",
-        1000,
-        () => GLib.DateTime.new_now_local().format(format)!,
-    );
-    return <label class="item blue" label={time} />;
+    const time = createState<string>("").poll(1000, () =>
+        GLib.DateTime.new_now_local().format(format)!)
+    return <label
+        class="item blue"
+        onDestroy={() => time.drop()}
+        label={time()}
+    />
 }

 function Temp(): JSX.Element {
-    let [label, _setlabel] = createState<string>("N/A");
+    let label = createState<string>("N/A");
    if (sensorsAvailable) {
-        label = createPoll<string>("", 3000, "sensors", (out) => {
-            const match = out
-                .split("\n")
-                .find((line) => line.includes("Tctl") || line.includes("Package"))
-                ?.match(/[0-9.]*°C/);
+        label = createState<string>("").poll(5000, 'sensors', out => {
+            const match = out.split('\n').find(line => line.includes('Tctl') || line.includes('Package'))?.match(/[0-9.]*°C/);
            return match ? match[0] : "N/A";
-        });
+        })
    }
-    return <label class="item blue" label={label} />;
+    return <label
+        class="item blue"
+        onDestroy={() => label.drop()}
+        label={label()}
+    />
 }

 function Memory(): JSX.Element {
-    const memory = createPoll<string>("", 2000, "free", (out) => {
-        const line = out.split("\n").find((line) => line.includes("Mem:"));
+    const memory = createState<string>("").poll(2000, "free", out => {
+        const line = out.split('\n').find(line => line.includes('Mem:'));
        if (!line) return "N/A";
        const split = line.split(/\s+/).map(Number);
        return (split[2] / 1000000).toFixed(2) + "GB";
    });
-    return <label class="item blue" label={memory} />;
+    return <label
+        class="item blue"
+        onDestroy={() => memory.drop()}
+        label={memory()}
+    />
 }

 function ClockSpeed(): JSX.Element {
-    const command =
-        'bash -c "cat /proc/cpuinfo | grep \\"MHz\\" | awk \'{print \\$4}\' | sort -n | tail -1 | awk \'{printf \\"%.2fGHz\\", \\$1/1000}\'"';
-    const speed = createPoll<string>("", 1000, command, (out) => out);
-    return <label class="item" label={speed} />;
+    const command = 'bash -c "cat /proc/cpuinfo | grep \\"MHz\\" | awk \'{print \\$4}\' | sort -n | tail -1 | awk \'{printf \\"%.2fGHz\\", \\$1/1000}\'"';
+    const speed = createState<string>("").poll(5000, command)
+    return <label
+        class="item"
+        onDestroy={() => speed.drop()}
+        label={speed()}
+    />
 }

 function CPU(): JSX.Element {
-    const usage = createPoll<string>("", 2000, "top -b -n 1", (out) => {
-        const line = out.split("\n").find((line) => line.includes("Cpu(s)"));
+    const usage = createState<string>("").poll(2000, "top -b -n 1", out => {
+        const line = out.split("\n").find(line => line.includes('Cpu(s)'));
        if (!line) return "N/A";
-        return line.split(/\s+/)[1].replace(",", ".").toString() + "%";
+        return line.split(/\s+/)[1].replace(',', '.').toString() + "%";
    });
-    return (
-        <box class="item">
-            <image iconName="speedometer" css="margin-right: 0.7em;" />
-            <label label={usage} />
+    return <box class="item">
+        {/* <icon icon="speedometer" css="margin-right: 0.7em;" /> */}
+        <label
+            onDestroy={() => usage.drop()}
+            label={usage()}
+        />
    </box>
-    );
 }

-function Right() {
+
+
+function Right(): JSX.Element {
    return (
        <box class="right" hexpand halign={Gtk.Align.END} spacing={6}>
            <Icons />
@ -147,46 +144,31 @@ function Right() {
    );
 }

-function BatteryIcon(): JSX.Element {
-    if (battery.get_state() == 0) return <box />;
-    let batteryPercentage = createBinding(battery, "percentage");
-    return (
-        <button
-            class="battery-item"
-            onClicked={() => execAsync(["gnome-power-statistics"])}
-        >
-            <box>
-                <With value={batteryPercentage}>
-                    {(percentage) => {
-                        const thresholds = [...Array(11).keys()].map((i) => i * 10);
-                        const icon = thresholds.find(
-                            (threshold) => threshold >= percentage * 100,
-                        );
-                        const charging_name =
-                            battery.percentage >= 0.99 ? "charged" : "charging";
-                        return (
-                            <image
-                                iconName={
-                                    battery.charging
-                                        ? `battery-level-${icon}-${charging_name}-symbolic`
-                                        : `battery-level-${icon}-symbolic`
-                                }
-                            />
-                        );
-                    }}
-                </With>
-            </box>
-        </button>
-    );
-}
+// function BatteryIcon(): JSX.Element {
+//     if (battery.get_state() == 0) return <box />;
+//     return <button class="battery-item" onClicked={() => execAsync(['gnome-power-statistics'])}>
+//         <box>
+//             {
+//                 createBinding(battery, "percentage").as((percentage) => {
+//                     const thresholds = [...Array(11).keys()].map(i => i * 10);
+//                     const icon = thresholds.find(threshold => threshold >= percentage * 100)
+//                     const charging_name = battery.percentage >= 0.99 ? "charged" : "charging"
+//                     return <icon
+//                         icon={battery.charging ? `battery-level-${icon}-${charging_name}-symbolic` : `battery-level-${icon}-symbolic`}
+//                     />
+//                 })
+//             }
+//         </box>
+//     </button>
+// }

 function Icons() {
    return (
        <box class="item icon-group">
            <SysTray />
-            <BatteryIcon />
+            {/* <BatteryIcon /> */}
        </box>
-    );
+    )
 }

 function Volume(): JSX.Element {
@ -194,173 +176,120 @@ function Volume(): JSX.Element {

    const audio = wirePlumber.audio;
    const icon = createBinding(audio.default_speaker, "volume").as((volume) => {
-        const vol = volume * 100;
+        const vol = volume * 100
        const icon = [
-            [101, "overamplified"],
-            [67, "high"],
-            [34, "medium"],
-            [1, "low"],
-            [0, "muted"],
-        ].find(([threshold]) => Number(threshold) <= vol)?.[1];
-        return `audio-volume-${icon}-symbolic`;
+            [101, 'overamplified'],
+            [67, 'high'],
+            [34, 'medium'],
+            [1, 'low'],
+            [0, 'muted'],
+        ].find(([threshold]) => Number(threshold) <= vol)?.[1]
+        return `audio-volume-${icon}-symbolic`
    });
    const css = createBinding(audio.default_speaker, "mute").as((mute) => {
-        return mute ? "margin-left:0;" : "margin-left: 0.7em;";
+        return mute ? "margin-left:0;" : "margin-left: 0.7em;"
    });
-    let volume = createBinding(audio.default_speaker, "volume");
-    let mute = createBinding(audio.default_speaker, "mute");
    return (
-        <button
-            class="item blue"
-            onClicked={() =>
-                (audio.default_speaker.mute = !audio.default_speaker.mute)
+        <button class="item blue" onClicked={() => audio.default_speaker.mute = !audio.default_speaker.mute}>
+            <box>
+                {/* <icon icon={icon} /> */}
+                {
+                    createBinding(audio.default_speaker, "volume").as((volume) => <box>
+                        {
+                            createBinding(audio.default_speaker, "mute").as((mute) => <box>
+                                {
+                                    <label label={mute ? "" : `${Math.floor(volume * 100)}%`} css={css} />
+                                }
+                            </box>)
+                        }
+                    </box>)
                }
-        >
-            <box>
-                <image iconName={icon} />
-                <With value={volume}>
-                    {(vol) => (
-                        <box>
-                            <With value={mute}>
-                                {(muted) => {
-                                    return (
-                                        <label
-                                            label={muted ? "" : `${Math.floor(vol * 100)}%`}
-                                            css={css}
-                                        />
-                                    );
-                                }}
-                            </With>
-                        </box>
-                    )}
-                </With>
            </box>
        </button>
    );
 }

+
 function Workspaces(): JSX.Element {
    const hyprland = Hyprland.get_default();
-    let workspaces = createBinding(hyprland, "workspaces");
    return (
        <box class="workspaces">
-            <With value={workspaces}>
-                {(wss: Array<Hyprland.Workspace>) => (
+            {createBinding(hyprland, "workspaces").as((wss) =>
                <box>
-                        <With value={createBinding(hyprland, "focusedMonitor")}>
-                            {(fm: Hyprland.Monitor) => {
-                                let filtered_wss = new Accessor(() =>
-                                    wss
-                                        .sort((a, b) => a.id - b.id)
-                                        .filter(
-                                            (ws) =>
-                                                ws &&
-                                                ws.get_monitor() &&
-                                                ws.get_monitor().get_id() === fm.get_id(),
-                                        ),
-                                );
-                                return (
-                                    <box>
-                                        <For each={filtered_wss}>
-                                            {(ws: Hyprland.Workspace, _index) => (
+                    {createBinding(hyprland, "focusedMonitor").as((fm) =>
+                        wss.sort((a, b) => a.id - b.id)
+                            .filter(ws => ws && ws.get_monitor() && ws.get_monitor().get_id() === fm.get_id())
+                            .map((ws) => (
                                <button
-                                                    class={createBinding(hyprland, "focusedWorkspace").as(
-                                                        (fw) => (ws === fw ? "focused" : ""),
-                                                    )}
+                                    class={createBinding(hyprland, "focusedWorkspace").as((fw) => ws === fw ? "focused" : "",)}
                                    onClicked={() => ws.focus()}
                                >
                                    {`${ws.id}`.slice(-1)}
                                </button>
-                                            )}
-                                        </For>
-                                    </box>
-                                );
-                            }}
-                        </With>
+                            )))}
                </box>
            )}
-            </With>
        </box>
    );
 }

 function shorten(title: string) {
-    return title.length > 40 ? title.slice(0, 20) + "..." : title;
+    return title.length > 40 ? title.slice(0, 20) + "..." : title
 }

 function Clients(): JSX.Element {
    const hyprland = Hyprland.get_default();
-    let clients = createBinding(hyprland, "clients");
    return (
        <box>
-            <With value={createBinding(hyprland, "focusedWorkspace")}>
-                {(fw: Hyprland.Workspace) => (
+            {
+                createBinding(hyprland, "focusedWorkspace").as(fw => (
                    <box class="clients">
-                        <With value={clients}>
-                            {(cls: Array<Hyprland.Client>) => {
-                                let filtered_clients = new Accessor(() =>
+                        {
+                            createBinding(hyprland, "clients").as(cls =>
                                cls
                                    .sort((a, b) => a.pid - b.pid)
-                                        .filter((cl) => !cl.title.includes("rofi"))
-                                        .filter(
-                                            (cl) => fw && cl.get_workspace().get_id() === fw.get_id(),
-                                        ),
-                                );
-
-                                return (
-                                    <box>
-                                        <For each={filtered_clients}>
-                                            {(cl: Hyprland.Client, _index) => (
+                                    .filter(cl => !cl.title.includes("rofi"))
+                                    .filter(cl => fw && cl.get_workspace().get_id() === fw.get_id())
+                                    .map(cl => (
                                        <box
-                                                    class={createBinding(hyprland, "focusedClient").as(
-                                                        (a) =>
-                                                            a && a.address === cl.address
-                                                                ? "focused"
-                                                                : "unfocused",
-                                                    )}
+                                            class={createBinding(hyprland, "focusedClient").as(a => a && a.address === cl.address ? "focused" : "unfocused")}
                                        >
-                                                    <image iconName={getIconName(cl)} class="app-icon" />
-                                                    <label
-                                                        label={createBinding(cl, "title").as((title) =>
-                                                            shorten(title),
-                                                        )}
-                                                    />
+                                            {/* <icon */}
+                                            {/*     icon={getIconName(cl)} */}
+                                            {/*     class="app-icon" */}
+                                            {/* /> */}
+                                            <label label={createBinding(cl, 'title').as(title => shorten(title))} />
                                        </box>
-                                            )}
-                                        </For>
+                                    )
+                                    )
+                            )
+
+                        }
                    </box>
-                                );
-                            }}
-                        </With>
-                    </box>
-                )}
-            </With>
+                )
+                )
+            }
        </box>
    );
 }

-export default function Bar(gdkmonitor: Gdk.Monitor, scaleFactor: number = 1) {
-    console.log("Creating Bar on monitor:", gdkmonitor);
-    return (
-        <window
-            visible
-            gdkmonitor={gdkmonitor}
-            css={"font-size: " + scaleFactor + "em;"}
-            exclusivity={Astal.Exclusivity.EXCLUSIVE}
-            anchor={
-                Astal.WindowAnchor.TOP |
-                Astal.WindowAnchor.LEFT |
-                Astal.WindowAnchor.RIGHT
-            }
-            application={app}
-            class="Bar"
-            name="top-bar"
-        >
-            <centerbox class="window-box">
-                <Left $type="start" />
-                <Center $type="center" />
-                <Right $type="end" />
+export default function Bar(gdkmonitor: Gdk.Monitor, scaleFactor: number = 1): Gtk.Window {
+    return new Gtk.Window({
+        gdkmonitor,
+        css: "font-size: " + scaleFactor + "em;",
+        exclusivity: Astal.Exclusivity.EXCLUSIVE,
+        anchor: Astal.WindowAnchor.TOP | Astal.WindowAnchor.LEFT | Astal.WindowAnchor.RIGHT,
+        application: app,
+        class: "Bar",
+        name: "top-bar",
+        s: self => self.connect("destroy", () => {
+            print("Detroying bar");
+            app.remove_window(self);
+        }),
+        child: <centerbox class="window-box">
+            <Left />
+            <Center />
+            <Right />
        </centerbox>
-        </window>
-    );
+    })
 }
--- a/home/ags/files/app.ts
+++ b/home/ags/files/app.ts
@ -1,40 +1,42 @@
-import app from "ags/gtk4/app";
-import style from "./style.scss";
-import Bar from "./Bar";
+import app from "ags/gtk4/app"
+import style from "./style.scss"
+import Bar from "./Bar"
 import Hyprland from "gi://AstalHyprland";
-import NotificationPopups from "./notifications/NotificationPopups";
+import NotificationPopups from "./notifications/NotificationPopups"
+import Gtk from "gi://Gtk?version=4.0";
+import { Gdk } from "ags/gtk4";

 const hyprland = Hyprland.get_default();

 function find_main_monitor(): Hyprland.Monitor {
-    let monitors = hyprland.get_monitors();
+    let monitors = hyprland.get_monitors()
    for (let j = 0; j < monitors.length; j++) {
        for (const monitor of ["eDP", "DP", "HDMI-A"]) {
            for (let i = 0; i < monitors.length; i++) {
-                console.log(
-                    "Checking monitor:",
-                    monitors[i].get_name(),
-                    "against",
-                    monitor + "-" + j,
-                );
+                console.log("Checking monitor:", monitors[i].get_name(), "against", monitor + "-" + j)
                if (monitors[i].get_name() == monitor + "-" + j) {
-                    return monitors[i];
+                    return monitors[i]
                }
            }
        }
    }
-    return monitors[0];
+    return monitors[0]
 }

 function register_windows(monitor: Hyprland.Monitor) {
-    let gtkMonitor = app.get_monitors()[0];
-    let scale = monitor.get_width() >= 3000 ? 1.2 : 1;
-    Bar(gtkMonitor, scale);
-    NotificationPopups();
+    let gtkMonitors = app.get_monitors()[0].get_display().get_monitors()
+    let gtkMonitor = gtkMonitors.get_item(0)
+    if (!gtkMonitor) {
+        console.error("No GTK monitor found for the Hyprland monitor:", monitor.get_name());
+        return;
+    }
+    let scale = (monitor.get_width() >= 3000) ? 1.2 : 1
+    Bar(gtkMonitor, scale)
+    NotificationPopups(gtkMonitor)
 }

 function switch_to_best_monitor() {
-    let mainMonitor = find_main_monitor();
+    let mainMonitor = find_main_monitor()
    for (var wd of app.get_windows()) {
        wd.destroy();
    }
@ -42,19 +44,17 @@ function switch_to_best_monitor() {
 }

 hyprland.connect("monitor-added", (_, _monitor: Hyprland.Monitor) => {
-    switch_to_best_monitor();
-});
+    switch_to_best_monitor()
+})

 hyprland.connect("monitor-removed", () => {
-    switch_to_best_monitor();
-});
-
-console.log("Trying to find the best monitor");
+    switch_to_best_monitor()
+})

 app.start({
    css: style,
    iconTheme: "Papirus",
    main() {
-        switch_to_best_monitor();
+        switch_to_best_monitor()
    },
-});
+})
--- a/home/ags/files/notifications/Notification.scss
+++ b/home/ags/files/notifications/Notification.scss
@ -5,7 +5,7 @@
 }

 // https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gtk/theme/Adwaita/_colors-public.scss
-$fg-color: #{"@theme_bg_color"};
+$fg-color: #{"@theme_fg_color"};
 $bg-color: #1f2430;
 $error: red;

@ -13,63 +13,78 @@ window.NotificationPopups {
    all: unset;
 }

-.Notification {
-  border-radius: 13px;
-  background-color: $bg-color;
-  margin: 0.5rem 1rem 0.5rem 1rem;
-  box-shadow: 2px 3px 8px 0 gtkalpha(black, 0.4);
-  border: 1pt solid gtkalpha($fg-color, 0.03);
+eventbox.Notification {

-  &.critical {
-    border: 1pt solid gtkalpha($error, 0.4);
+    &:first-child>box {
+        margin-top: 1rem;
+    }
+
+    &:last-child>box {
+        margin-bottom: 1rem;
+    }
+
+    // eventboxes can not take margins so we style its inner box instead
+    >box {
+        min-width: 400px;
+        border-radius: 13px;
+        background-color: #1f2430;
+        margin: .5rem 1rem .5rem 1rem;
+        box-shadow: 2px 3px 8px 0 gtkalpha(black, .4);
+        border: 1pt solid gtkalpha($fg-color, .03);
+    }
+
+    &.critical>box {
+        border: 1pt solid gtkalpha($error, .4);

        .header {
+
            .app-name {
-        color: gtkalpha($error, 0.8);
+                color: gtkalpha($error, .8);
+
            }

            .app-icon {
-        color: gtkalpha($error, 0.6);
+                color: gtkalpha($error, .6);
            }
        }
    }

    .header {
-    padding: 0.5rem;
+        padding: .5rem;
        color: gtkalpha($fg-color, 0.5);

        .app-icon {
-      margin: 0 0.4rem;
+            margin: 0 .4rem;
        }

        .app-name {
-      margin-right: 0.3rem;
+            margin-right: .3rem;
            font-weight: bold;

            &:first-child {
-        margin-left: 0.4rem;
+                margin-left: .4rem;
            }
        }

        .time {
-      margin: 0 0.4rem;
+            margin: 0 .4rem;
        }

        button {
-      padding: 0.2rem;
+            padding: .2rem;
            min-width: 0;
            min-height: 0;
        }
    }

    separator {
-    margin: 0 0.4rem;
-    background-color: gtkalpha($fg-color, 0.1);
+        margin: 0 .4rem;
+        background-color: gtkalpha($fg-color, .1);
    }

    .content {
        margin: 1rem;
-    margin-top: 0.5rem;
+        margin-top: .5rem;

        .summary {
            font-size: 1.2em;
@ -81,8 +96,8 @@ window.NotificationPopups {
        }

        .image {
-      border: 1px solid gtkalpha($fg-color, 0.02);
-      margin-right: 0.5rem;
+            border: 1px solid gtkalpha($fg-color, .02);
+            margin-right: .5rem;
            border-radius: 9px;
            min-width: 100px;
            min-height: 100px;
@ -96,7 +111,7 @@ window.NotificationPopups {
        margin-top: 0;

        button {
-      margin: 0 0.3rem;
+            margin: 0 .3rem;

            &:first-child {
                margin-left: 0;
--- a/home/ags/files/notifications/Notification.tsx
+++ b/home/ags/files/notifications/Notification.tsx
@ -1,126 +1,107 @@
-import { Gtk, Gdk } from "ags/gtk4";
-import Adw from "gi://Adw";
-import GLib from "gi://GLib";
-import AstalNotifd from "gi://AstalNotifd";
-import Pango from "gi://Pango";
-import { timeout } from "ags/time";
+import { Gtk, Astal } from "ags/gtk4"
+import { EventBox } from "ags"
+import Notifd from "gi://AstalNotifd"
+import GLib from "gi://GLib"

-function isIcon(icon?: string | null) {
-    const iconTheme = Gtk.IconTheme.get_for_display(Gdk.Display.get_default()!);
-    return icon && iconTheme.has_icon(icon);
-}
+const isIcon = (icon: string) =>
+    !!Astal.Icon.lookup_icon(icon)

-function fileExists(path: string) {
-    return GLib.file_test(path, GLib.FileTest.EXISTS);
-}
+const fileExists = (path: string) =>
+    GLib.file_test(path, GLib.FileTest.EXISTS)

-function time(time: number, format = "%H:%M") {
-    return GLib.DateTime.new_from_unix_local(time).format(format)!;
-}
+const time = (time: number, format = "%H:%M") => GLib.DateTime
+    .new_from_unix_local(time)
+    .format(format)!

-function urgency(n: AstalNotifd.Notification) {
-    const { LOW, NORMAL, CRITICAL } = AstalNotifd.Urgency;
+const urgency = (n: Notifd.Notification) => {
+    const { LOW, NORMAL, CRITICAL } = Notifd.Urgency
+    // match operator when?
    switch (n.urgency) {
-        case LOW:
-            return "low";
-        case CRITICAL:
-            return "critical";
+        case LOW: return "low"
+        case CRITICAL: return "critical"
        case NORMAL:
-        default:
-            return "normal";
+        default: return "normal"
    }
 }

-export default function Notification({
-    notification: n,
-    onHoverLost,
-}: {
-    notification: AstalNotifd.Notification;
-    onHoverLost: () => void;
-}) {
-    const timer = timeout(3000, () => {
-        onHoverLost();
-    });
-    return (
-        <Adw.Clamp maximumSize={400}>
-            <box
-                widthRequest={400}
+type Props = {
+    setup(self: EventBox): void
+    onHoverLost(self: EventBox): void
+    notification: Notifd.Notification
+}
+
+export default function Notification(props: Props) {
+    const { notification: n, onHoverLost, setup } = props
+    const { START, CENTER, END } = Gtk.Align
+
+    return <eventbox
        class={`Notification ${urgency(n)}`}
-                orientation={Gtk.Orientation.VERTICAL}
-            >
-                <Gtk.EventControllerMotion
-                    onEnter={() => timer.cancel()}
-                    onLeave={onHoverLost}
-                />
+        setup={setup}
+        onHoverLost={onHoverLost}>
+        <box vertical>
            <box class="header">
-                    {(n.appIcon || isIcon(n.desktopEntry)) && (
-                        <image
+                {(n.appIcon || n.desktopEntry) && <icon
                    class="app-icon"
                    visible={Boolean(n.appIcon || n.desktopEntry)}
-                            iconName={n.appIcon || n.desktopEntry}
-                        />
-                    )}
+                    icon={n.appIcon || n.desktopEntry}
+                />}
                <label
                    class="app-name"
-                        halign={Gtk.Align.START}
-                        ellipsize={Pango.EllipsizeMode.END}
+                    halign={START}
+                    truncate
                    label={n.appName || "Unknown"}
                />
                <label
                    class="time"
                    hexpand
-                        halign={Gtk.Align.END}
+                    halign={END}
                    label={time(n.time)}
                />
                <button onClicked={() => n.dismiss()}>
-                        <image iconName="window-close-symbolic" />
+                    <icon icon="window-close-symbolic" />
                </button>
            </box>
            <Gtk.Separator visible />
            <box class="content">
-                    {n.image && fileExists(n.image) && (
-                        <image valign={Gtk.Align.START} class="image" file={n.image} />
-                    )}
-                    {n.image && isIcon(n.image) && (
-                        <box valign={Gtk.Align.START} class="icon-image">
-                            <image
-                                iconName={n.image}
-                                halign={Gtk.Align.CENTER}
-                                valign={Gtk.Align.CENTER}
-                            />
-                        </box>
-                    )}
-                    <box orientation={Gtk.Orientation.VERTICAL}>
+                {n.image && fileExists(n.image) && <box
+                    valign={START}
+                    class="image"
+                    css={`background-image: url('${n.image}')`}
+                />}
+                {n.image && isIcon(n.image) && <box
+                    expand={false}
+                    valign={START}
+                    class="icon-image">
+                    <icon icon={n.image} expand halign={CENTER} valign={CENTER} />
+                </box>}
+                <box vertical>
                    <label
                        class="summary"
-                            halign={Gtk.Align.START}
+                        halign={START}
                        xalign={0}
                        label={n.summary}
-                            ellipsize={Pango.EllipsizeMode.END}
+                        truncate
                    />
-                        {n.body && (
-                            <label
+                    {n.body && <label
                        class="body"
                        wrap
                        useMarkup
-                                halign={Gtk.Align.START}
+                        halign={START}
                        xalign={0}
-                                justify={Gtk.Justification.FILL}
+                        justifyFill
                        label={n.body}
-                            />
-                        )}
+                    />}
                </box>
            </box>
-                {n.actions.length > 0 && (
-                    <box class="actions">
-                        {n.actions.map(({ label, id }) => (
-                            <button hexpand onClicked={() => n.invoke(id)}>
-                                <label label={label} halign={Gtk.Align.CENTER} hexpand />
+            {n.get_actions().length > 0 && <box class="actions">
+                {n.get_actions().map(({ label, id }) => (
+                    <button
+                        hexpand
+                        onClicked={() => n.invoke(id)}>
+                        <label label={label} halign={CENTER} hexpand />
                    </button>
                ))}
+            </box>}
        </box>
-                )}
-            </box>
-        </Adw.Clamp>
-    );
+    </eventbox>
 }
--- a/home/ags/files/notifications/NotificationPopups.tsx
+++ b/home/ags/files/notifications/NotificationPopups.tsx
@ -1,65 +1,107 @@
-import app from "ags/gtk4/app";
-import { Astal, Gtk } from "ags/gtk4";
-import AstalNotifd from "gi://AstalNotifd";
-import Notification from "./Notification";
-import { createBinding, For, createState, onCleanup } from "ags";
+import { Astal, Gtk, Gdk } from "ags/gtk4"
+import Notifd from "gi://AstalNotifd"
+import Notification from "./Notification"
+import { type Subscribable } from "astal/binding"
+import { timeout } from "ags/time"
+import { createBinding, createState } from "ags"
+import GLib from "gi://GLib"

-export default function NotificationPopups() {
-    const monitors = createBinding(app, "monitors");
+// see comment below in constructor
+const TIMEOUT_DELAY = 5000

-    const notifd = AstalNotifd.get_default();
+// The purpose if this class is to replace Variable<Array<Widget>>
+// with a Map<number, Widget> type in order to track notification widgets
+// by their id, while making it conviniently bindable as an array
+class NotifiationMap implements Subscribable {
+    // the underlying map to keep track of id widget pairs
+    private map: Map<number, Gtk.Widget> = new Map()

-    const [notifications, setNotifications] = createState(
-        new Array<AstalNotifd.Notification>(),
-    );
+    // it makes sense to use a Variable under the hood and use its
+    // reactivity implementation instead of keeping track of subscribers ourselves
+    private var: Array<Gtk.Widget> = createState([])

-    const notifiedHandler = notifd.connect("notified", (_, id, replaced) => {
-        const notification = notifd.get_notification(id);
-
-        if (replaced && notifications.get().some((n) => n.id === id)) {
-            setNotifications((ns) => ns.map((n) => (n.id === id ? notification : n)));
-        } else {
-            setNotifications((ns) => [notification, ...ns]);
+    // notify subscribers to rerender when state changes
+    private notifiy() {
+        this.var.set([...this.map.values()].reverse())
    }
-    });

-    const resolvedHandler = notifd.connect("resolved", (_, id) => {
-        setNotifications((ns) => ns.filter((n) => n.id !== id));
-    });
+    private constructor() {
+        const notifd = Notifd.get_default()

-    // technically, we don't need to cleanup because in this example this is a root component
-    // and this cleanup function is only called when the program exits, but exiting will cleanup either way
-    // but it's here to remind you that you should not forget to cleanup signal connections
-    onCleanup(() => {
-        notifd.disconnect(notifiedHandler);
-        notifd.disconnect(resolvedHandler);
-    });
+        /**
+         * uncomment this if you want to
+         * ignore timeout by senders and enforce our own timeout
+         * note that if the notification has any actions
+         * they might not work, since the sender already treats them as resolved
+         */
+        // notifd.ignoreTimeout = true

-    return (
-        <For each={monitors} cleanup={(win) => (win as Gtk.Window).destroy()}>
-            {(monitor) => (
-                <window
-                    class="NotificationPopups"
-                    gdkmonitor={monitor}
-                    visible={notifications((ns) => ns.length > 0)}
-                    anchor={Astal.WindowAnchor.TOP | Astal.WindowAnchor.RIGHT}
-                >
-                    <box orientation={Gtk.Orientation.VERTICAL}>
-                        <For each={notifications}>
-                            {(notification) => (
-                                <Notification
-                                    notification={notification}
-                                    onHoverLost={() =>
-                                        setNotifications((ns) =>
-                                            ns.filter((n) => n.id !== notification.id),
-                                        )
+        notifd.connect("notified", (_, id) => {
+            this.set(id, Notification({
+                notification: notifd.get_notification(id)!,
+
+                // once hovering over the notification is done
+                // destroy the widget without calling notification.dismiss()
+                // so that it acts as a "popup" and we can still display it
+                // in a notification center like widget
+                // but clicking on the close button will close it
+                onHoverLost: () => this.delete(id),
+
+                // notifd by default does not close notifications
+                // until user input or the timeout specified by sender
+                // which we set to ignore above
+                setup: () => timeout(TIMEOUT_DELAY, () => {
+                    /**
+                     * uncomment this if you want to "hide" the notifications
+                     * after TIMEOUT_DELAY
+                     */
+                    this.delete(id)
+                })
+            }))
+        })
+
+        // notifications can be closed by the outside before
+        // any user input, which have to be handled too
+        notifd.connect("resolved", (_, id) => {
+            this.delete(id)
+        })
    }
-                                />
-                            )}
-                        </For>
+
+    private set(key: number, value: Gtk.Widget) {
+        // in case of replacecment destroy previous widget
+        this.map.get(key)?.destroy()
+        this.map.set(key, value)
+        this.notifiy()
+    }
+
+    private delete(key: number) {
+        this.map.get(key)?.destroy()
+        this.map.delete(key)
+        this.notifiy()
+    }
+
+    // needed by the Subscribable interface
+    get() {
+        return this.var.get()
+    }
+
+    // needed by the Subscribable interface
+    subscribe(callback: (list: Array<Gtk.Widget>) => void) {
+        return this.var.subscribe(callback)
+    }
+}
+
+export default function NotificationPopups(gdkmonitor: Gdk.Monitor) {
+    const { TOP, RIGHT } = Astal.WindowAnchor
+    const notifs = new NotifiationMap()
+
+    return <window
+        className="NotificationPopups"
+        gdkmonitor={gdkmonitor}
+        exclusivity={Astal.Exclusivity.EXCLUSIVE}
+        anchor={TOP | RIGHT}>
+        <box vertical>
+            {createBinding(notifs)}
        </box>
    </window>
-            )}
-        </For>
-    );
 }
--- a/home/ags/files/style.scss
+++ b/home/ags/files/style.scss
@ -17,7 +17,7 @@ window.Bar {
    margin-top: 0.2em;
  }

-  .clients box box {
+  .clients box {
    margin-right: 0.3em;
  }

@ -27,13 +27,11 @@ window.Bar {
    border-radius: 0.3em;
    background: #1f2430;
  }
-
  .battery-item:hover {
    background: #023269;
  }

-  .item,
-  .clients box box {
+  .item, .clients box {
    background: #1f2430;
    padding-left: 0.7em;
    padding-right: 0.7em;
@ -51,14 +49,12 @@ window.Bar {

  button {
    background: #1f2430;
-    border: none;
+    border:none;
    padding: 0.2em;
    border-radius: 0.3em;
-    font-weight: normal;
  }

-  .focused,
-  .clients box.focused {
+  .focused, .clients box.focused {
    background: #023269;
  }

--- a/home/git/default.nix
+++ b/home/git/default.nix
@ -34,7 +34,6 @@
        settings = {
            os = {
                editPreset = "nvim";
-                autoStageResolvedConflicts = false;
            };
        };
    };
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@ -145,16 +145,13 @@ in {
                "WLR_RENDERER_ALLOW_SOFTWARE,1"
            ];
            debug = { disable_logs = false; };
-            windowrule = [
+            windowrulev2 = [
                "float, title:^(rofi)(.*)$"
                "center, title:^(rofi)(.*)$"
                "noborder, title:^(rofi)(.*)$"
                "stayfocused, title:^()$,class:^(steam)$"
                "minsize 1 1, title:^()$,class:^(steam)$"
                "stayfocused, title:^()$,class:^(steam)$"
-                "workspace 8, class:thunderbird"
-                "workspace 9, class:spotify"
-                "workspace 10, class:Slack"
                "bordersize 0, floating:0, onworkspace:w[tv1]"
                "rounding 0, floating:0, onworkspace:w[tv1]"
                "bordersize 0, floating:0, onworkspace:f[1]"
--- a/home/kitty/default.nix
+++ b/home/kitty/default.nix
@ -1,4 +1,4 @@
-{ lib, ... }:
+{ config, pkgs, lib, ... }:

 {
    programs.kitty = {
@ -6,7 +6,7 @@
        shellIntegration.enableZshIntegration = true;
        font = {
            name = "'ZedMono Nerd Font' style='Extended Light' features=+ss05";
-            size = lib.mkDefault 13;
+            size = lib.mkDefault 14;

        };
        keybindings = {
@ -15,11 +15,8 @@
            "kitty_mod+enter" = "nop";
            "kitty_mod+equal" = "change_font_size current +1.0";
            "kitty_mod+minus" = "change_font_size current -1.0";
-            "ctrl+shift+c" = "copy_to_clipboard";
-            "ctrl+shift+v" = "paste_from_clipboard";
        };
        settings = {
-            kitty_mod= "ctrl+alt";
            cursor_shape = "block";
            cursor_beam_thickness = 1;
            scrollback_lines = 100000;
--- a/home/mpv/files/mpv.conf
+++ b/home/mpv/files/mpv.conf
@ -8,7 +8,7 @@ video-sync=display-resample
 interpolation
 tscale=oversample
 vo=gpu-next
-hwdec=auto
+gpu-api=opengl
 force-window=yes
 keep-open=yes

--- a/home/scripts/files/backup.sh
+++ b/home/scripts/files/backup.sh
@ -56,7 +56,6 @@ echo -e '\n\n\n'
 echo "Running git.thomasave.be Backups"
 borg create -s --progress \
    --exclude /home/server/Containers/git.thomasave.be/gitea/gitea/sessions \
-    --exclude /home/server/Containers/git.thomasave.be/runner-data/.cache \
    --exclude /home/server/Containers/git.thomasave.be/gitea/gitea/jwt \
    --exclude /home/server/Containers/git.thomasave.be/gitea/ssh \
    10.4.0.1:Storage/Thomas/Borg/Containers/git.thomasave.be::'{hostname}-{now}' \
@ -93,7 +92,6 @@ borg create -s --progress \
 echo -e '\n\n\n'
 echo "Running Workspace Backups"
 borg create -s --progress \
-    --exclude /home/server/Workspace/TrackBox/Resources \
    10.4.0.1:Storage/Thomas/Borg/Workspace::'{hostname}-{now}' \
    /home/server/Workspace/
 borg prune --keep-daily 7 --keep-weekly 4 --keep-monthly -1 --save-space 10.4.0.1:Storage/Thomas/Borg/Workspace
@ -135,6 +133,23 @@ borg create -s --progress \
 borg prune --keep-daily 7 --keep-weekly 4 --keep-monthly -1 --save-space 10.4.0.1:Storage/Thomas/Borg/Thomas
 borg compact 10.4.0.1:Storage/Thomas/Borg/Thomas

+
+echo -e '\n\n\n'
+echo "Running Niels Backups"
+borg create -s --progress \
+    --exclude /home/server/Storage/Niels/Backups \
+    10.4.0.1:Storage/Thomas/Borg/Niels::'{now:%Y-%m-%d}' \
+    /home/server/Storage/Niels/
+borg prune --keep-daily 7 --keep-weekly 4 --keep-monthly 12 --save-space 10.4.0.1:Storage/Thomas/Borg/Niels
+borg compact 10.4.0.1:Storage/Thomas/Borg/Niels
+
+
+# echo -e '\n\n\n'
+# echo "Running Experiment Backups"
+# borg create -s --progress \
+#     10.4.0.1:Storage/Thomas/Borg/Containers/exp.thomasave.be::'{hostname}-{now}' \
+#     /home/server/Workspace/Experiments/Backend/data/
+
 ##########################################
 #  Perpare Cloud Backup                  #
 ##########################################
@ -172,7 +187,7 @@ ssh vault /home/server/Storage/Thomas/Scripts/Mount/borg_lock.sh
 #  Backups to Oracle Cloud               #
 ##########################################

-echo "Running Oracle Cloud Backup, containing Vaultwarden, robbertave.com, git.thomasave.be, Boaty, Stats, and Caddy."
+echo "Running Oracle Cloud Backup, containing Vaultwarden, robbertave.com, git.thomasave.be, Boaty, Stats, Caddy, and Niels."

 borg create -s --progress \
    --exclude /home/server/Containers/pw.thomasave.be/data/icon_cache \
@ -182,6 +197,7 @@ borg create -s --progress \
    --exclude /home/server/Containers/git.thomasave.be/gitea/gitea/jwt \
    --exclude /home/server/Containers/stats.thomasave.be/logs \
    --exclude /home/server/Containers/Caddy/Data\
+    --exclude /home/server/Storage/Niels/Backups \
    ubuntu@10.0.0.6:~/Backups/Borg::'{hostname}-{now}' \
    /home/server/Containers/pw.thomasave.be\
    /home/server/Containers/robbertave.com\
@ -191,3 +207,4 @@ borg create -s --progress \
    /home/server/Containers/Caddy \
    /home/server/Containers/cal.thomasave.be\
    /home/server/Containers/stats.thomasave.be \
+    /home/server/Storage/Niels \
--- a/home/ssh/default.nix
+++ b/home/ssh/default.nix
@ -3,7 +3,6 @@
 {
    programs.ssh = {
        enable = true;
-        enableDefaultConfig = false;
        includes = [ "gpulab_hosts_config" ];
        matchBlocks = {
            "*" = {
--- a/home/utils/common.nix
+++ b/home/utils/common.nix
@ -10,7 +10,6 @@
        ../lf
        ../tmux
        ../yazi
-        ../zellij
    ];

    home.stateVersion = "24.11";
@ -18,13 +17,16 @@
    programs.home-manager.enable = true;
    home.packages = with pkgs; [
        htop
-        ghostscript
        waypipe
        inputs.worktimer.packages.${pkgs.system}.default
        usbutils
-        gocryptfs
-        sshfs
    ];
+    programs.nh = {
+        enable = true;
+        clean.enable = true;
+        flake = "/home/user/.dotfiles";
+    };
+
    home.sessionVariables = {
        XDG_CONFIG_HOME = "${config.xdg.configHome}";
        XDG_CACHE_HOME = "${config.xdg.cacheHome}";
--- a/home/utils/desktop.nix
+++ b/home/utils/desktop.nix
@ -35,6 +35,7 @@
        zip
        heroic
        cmake
+        jellyfin-media-player
        chromium
        nmap
        arp-scan
@ -46,7 +47,6 @@
        yubioath-flutter
        obsidian
        nautilus
-        appimage-run
    ];

    services.kdeconnect = {
@ -88,7 +88,6 @@
        defaultApplications = {
            "x-scheme-handler/mailto" = "userapp-Thunderbird-7GETV2.desktop";
            "x-scheme-handler/mid" = "userapp-Thunderbird-7GETV2.desktop";
-            "x-scheme-handler/tonsite" = "org.telegram.desktop.desktop";
            "message/rfc822" = "userapp-Thunderbird-7GETV2.desktop";
            "application/pdf" = "org.gnome.Evince.desktop";
            "x-scheme-handler/tg" = "org.telegram.desktop.desktop";
@ -101,7 +100,6 @@
            "x-scheme-handler/tg" = "org.telegram.desktop.desktop";
            "x-scheme-handler/mailto" = "userapp-Thunderbird-7GETV2.desktop";
            "x-scheme-handler/mid" = "userapp-Thunderbird-7GETV2.desktop";
-            "x-scheme-handler/tonsite" = "org.telegram.desktop.desktop";
            "image/jpeg" = "org.gnome.Loupe.desktop";
            "image/png" = "org.gnome.Loupe.desktop";
        };
--- a/home/yazi/default.nix
+++ b/home/yazi/default.nix
@ -1,4 +1,4 @@
-{...}:
+{ inputs, config, pkgs, ... }:

 {
    programs.yazi = {
@ -9,20 +9,5 @@
                sort_by = "natural";
            };
        };
-
-    keymap = {
-      mgr.normal = [
-        { on = [ "j" ]; run = "down";                desc = "Move cursor down"; }
-        { on = [ "k" ]; run = "up";                  desc = "Move cursor up"; }
-        { on = [ "h" ]; run = "back";                desc = "Go back to parent directory"; }
-        { on = [ "l" ]; run = "forward";             desc = "Enter directory / open file"; }
-        { on = [ "q" ]; run = "quit";                desc = "Quit yazi"; }
-        { on = [ " " ]; run = "select";              desc = "Select the current file"; }
-        { on = [ "v" ]; run = "visual_mode";         desc = "Enter visual mode"; }
-        { on = [ "y" ]; run = "yank";                desc = "Yank selection"; }
-        { on = [ "p" ]; run = "paste";               desc = "Paste files"; }
-        { on = [ "d" ]; run = "remove --permanently"; desc = "Delete permanently"; }
-      ];
-    };
    };
 }
--- a/home/zellij/default.nix
+++ b/home/zellij/default.nix
@ -1,10 +0,0 @@
-{ config, ... }:
-{
-    programs.zellij = {
-        enable = true;
-    };
-    home.file."${config.xdg.configHome}/zellij" = {
-        source = ./files;
-        recursive = true;
-    };
-}
--- a/home/zellij/files/config.kdl
+++ b/home/zellij/files/config.kdl
@ -1,451 +0,0 @@
-ui {
-    pane_frames {
-        hide_session_name true
-    }
-}
-
-keybinds clear-defaults=true {
-    locked {
-        bind "Ctrl a" { SwitchToMode "normal"; }
-        bind "Ctrl H" { MoveFocus "left"; }
-        bind "Ctrl J" { MoveFocus "down"; }
-        bind "Ctrl K" { MoveFocus "up"; }
-        bind "Ctrl L" { MoveFocus "right"; }
-    }
-    normal {
-        bind "-" { NewPane "down"; SwitchToMode "locked"; }
-        bind "|" { NewPane "right"; SwitchToMode "locked"; }
-        bind "c" { NewTab; SwitchToMode "locked"; }
-        bind "d" { Detach; }
-        bind "n" { GoToNextTab; SwitchToMode "locked"; }
-    }
-    pane {
-        bind "left" { MoveFocus "left"; }
-        bind "down" { MoveFocus "down"; }
-        bind "up" { MoveFocus "up"; }
-        bind "right" { MoveFocus "right"; }
-        bind "c" { SwitchToMode "renamepane"; PaneNameInput 0; }
-        bind "d" { NewPane "down"; SwitchToMode "locked"; }
-        bind "e" { TogglePaneEmbedOrFloating; SwitchToMode "locked"; }
-        bind "f" { ToggleFocusFullscreen; SwitchToMode "locked"; }
-        bind "h" { MoveFocus "left"; }
-        bind "i" { TogglePanePinned; SwitchToMode "locked"; }
-        bind "j" { MoveFocus "down"; }
-        bind "k" { MoveFocus "up"; }
-        bind "l" { MoveFocus "right"; }
-        bind "n" { NewPane; SwitchToMode "locked"; }
-        bind "p" { SwitchToMode "normal"; }
-        bind "r" { NewPane "right"; SwitchToMode "locked"; }
-        bind "w" { ToggleFloatingPanes; SwitchToMode "locked"; }
-        bind "x" { CloseFocus; SwitchToMode "locked"; }
-        bind "z" { TogglePaneFrames; SwitchToMode "locked"; }
-        bind "tab" { SwitchFocus; }
-    }
-    tab {
-        bind "left" { GoToPreviousTab; }
-        bind "down" { GoToNextTab; }
-        bind "up" { GoToPreviousTab; }
-        bind "right" { GoToNextTab; }
-        bind "1" { GoToTab 1; SwitchToMode "locked"; }
-        bind "2" { GoToTab 2; SwitchToMode "locked"; }
-        bind "3" { GoToTab 3; SwitchToMode "locked"; }
-        bind "4" { GoToTab 4; SwitchToMode "locked"; }
-        bind "5" { GoToTab 5; SwitchToMode "locked"; }
-        bind "6" { GoToTab 6; SwitchToMode "locked"; }
-        bind "7" { GoToTab 7; SwitchToMode "locked"; }
-        bind "8" { GoToTab 8; SwitchToMode "locked"; }
-        bind "9" { GoToTab 9; SwitchToMode "locked"; }
-        bind "[" { BreakPaneLeft; SwitchToMode "locked"; }
-        bind "]" { BreakPaneRight; SwitchToMode "locked"; }
-        bind "b" { BreakPane; SwitchToMode "locked"; }
-        bind "h" { GoToPreviousTab; }
-        bind "j" { GoToNextTab; }
-        bind "k" { GoToPreviousTab; }
-        bind "l" { GoToNextTab; }
-        bind "n" { NewTab; SwitchToMode "locked"; }
-        bind "r" { SwitchToMode "renametab"; TabNameInput 0; }
-        bind "s" { ToggleActiveSyncTab; SwitchToMode "locked"; }
-        bind "t" { SwitchToMode "normal"; }
-        bind "x" { CloseTab; SwitchToMode "locked"; }
-        bind "tab" { ToggleTab; }
-    }
-    resize {
-        bind "left" { Resize "Increase left"; }
-        bind "down" { Resize "Increase down"; }
-        bind "up" { Resize "Increase up"; }
-        bind "right" { Resize "Increase right"; }
-        bind "+" { Resize "Increase"; }
-        bind "-" { Resize "Decrease"; }
-        bind "=" { Resize "Increase"; }
-        bind "H" { Resize "Decrease left"; }
-        bind "J" { Resize "Decrease down"; }
-        bind "K" { Resize "Decrease up"; }
-        bind "L" { Resize "Decrease right"; }
-        bind "h" { Resize "Increase left"; }
-        bind "j" { Resize "Increase down"; }
-        bind "k" { Resize "Increase up"; }
-        bind "l" { Resize "Increase right"; }
-        bind "r" { SwitchToMode "normal"; }
-    }
-    move {
-        bind "left" { MovePane "left"; }
-        bind "down" { MovePane "down"; }
-        bind "up" { MovePane "up"; }
-        bind "right" { MovePane "right"; }
-        bind "h" { MovePane "left"; }
-        bind "j" { MovePane "down"; }
-        bind "k" { MovePane "up"; }
-        bind "l" { MovePane "right"; }
-        bind "m" { SwitchToMode "normal"; }
-        bind "n" { MovePane; }
-        bind "p" { MovePaneBackwards; }
-        bind "tab" { MovePane; }
-    }
-    scroll {
-        bind "Alt left" { MoveFocusOrTab "left"; SwitchToMode "locked"; }
-        bind "Alt down" { MoveFocus "down"; SwitchToMode "locked"; }
-        bind "Alt up" { MoveFocus "up"; SwitchToMode "locked"; }
-        bind "Alt right" { MoveFocusOrTab "right"; SwitchToMode "locked"; }
-        bind "e" { EditScrollback; SwitchToMode "locked"; }
-        bind "f" { SwitchToMode "entersearch"; SearchInput 0; }
-        bind "Alt h" { MoveFocusOrTab "left"; SwitchToMode "locked"; }
-        bind "Alt j" { MoveFocus "down"; SwitchToMode "locked"; }
-        bind "Alt k" { MoveFocus "up"; SwitchToMode "locked"; }
-        bind "Alt l" { MoveFocusOrTab "right"; SwitchToMode "locked"; }
-        bind "s" { SwitchToMode "normal"; }
-    }
-    search {
-        bind "c" { SearchToggleOption "CaseSensitivity"; }
-        bind "n" { Search "down"; }
-        bind "o" { SearchToggleOption "WholeWord"; }
-        bind "p" { Search "up"; }
-        bind "w" { SearchToggleOption "Wrap"; }
-    }
-    session {
-        bind "a" {
-            LaunchOrFocusPlugin "zellij:about" {
-                floating true
-                move_to_focused_tab true
-            }
-            SwitchToMode "locked"
-        }
-        bind "c" {
-            LaunchOrFocusPlugin "configuration" {
-                floating true
-                move_to_focused_tab true
-            }
-            SwitchToMode "locked"
-        }
-        bind "d" { Detach; }
-        bind "o" { SwitchToMode "normal"; }
-        bind "p" {
-            LaunchOrFocusPlugin "plugin-manager" {
-                floating true
-                move_to_focused_tab true
-            }
-            SwitchToMode "locked"
-        }
-        bind "w" {
-            LaunchOrFocusPlugin "session-manager" {
-                floating true
-                move_to_focused_tab true
-            }
-            SwitchToMode "locked"
-        }
-    }
-    shared_among "normal" "locked" {
-        bind "Alt left" { MoveFocusOrTab "left"; }
-        bind "Alt down" { MoveFocus "down"; }
-        bind "Alt up" { MoveFocus "up"; }
-        bind "Alt right" { MoveFocusOrTab "right"; }
-        bind "Alt +" { Resize "Increase"; }
-        bind "Alt -" { Resize "Decrease"; }
-        bind "Alt =" { Resize "Increase"; }
-        bind "Alt [" { PreviousSwapLayout; }
-        bind "Alt ]" { NextSwapLayout; }
-        bind "Alt f" { ToggleFloatingPanes; }
-        bind "Alt h" { MoveFocusOrTab "left"; }
-        bind "Alt i" { MoveTab "left"; }
-        bind "Alt j" { MoveFocus "down"; }
-        bind "Alt k" { MoveFocus "up"; }
-        bind "Alt l" { MoveFocusOrTab "right"; }
-        bind "Alt n" { NewPane; }
-        bind "Alt o" { MoveTab "right"; }
-    }
-    shared_except "locked" "renametab" "renamepane" {
-        bind "Ctrl g" { SwitchToMode "locked"; }
-        bind "Ctrl q" { Quit; }
-    }
-    shared_except "locked" "entersearch" {
-        bind "enter" { SwitchToMode "locked"; }
-    }
-    shared_except "locked" "entersearch" "renametab" "renamepane" {
-        bind "esc" { SwitchToMode "locked"; }
-    }
-    shared_except "locked" "entersearch" "renametab" "renamepane" "move" {
-        bind "m" { SwitchToMode "move"; }
-    }
-    shared_except "locked" "entersearch" "search" "renametab" "renamepane" "session" {
-        bind "o" { SwitchToMode "session"; }
-    }
-    shared_except "locked" "tab" "entersearch" "renametab" "renamepane" {
-        bind "t" { SwitchToMode "tab"; }
-    }
-    shared_except "locked" "tab" "scroll" "entersearch" "renametab" "renamepane" {
-        bind "s" { SwitchToMode "scroll"; }
-    }
-    shared_among "normal" "resize" "tab" "scroll" "prompt" "tmux" {
-        bind "p" { SwitchToMode "pane"; }
-    }
-    shared_except "locked" "resize" "pane" "tab" "entersearch" "renametab" "renamepane" {
-        bind "r" { SwitchToMode "resize"; }
-    }
-    shared_among "scroll" "search" {
-        bind "PageDown" { PageScrollDown; }
-        bind "PageUp" { PageScrollUp; }
-        bind "left" { PageScrollUp; }
-        bind "down" { ScrollDown; }
-        bind "up" { ScrollUp; }
-        bind "right" { PageScrollDown; }
-        bind "Ctrl b" { PageScrollUp; }
-        bind "Ctrl c" { ScrollToBottom; SwitchToMode "locked"; }
-        bind "d" { HalfPageScrollDown; }
-        bind "Ctrl f" { PageScrollDown; }
-        bind "h" { PageScrollUp; }
-        bind "j" { ScrollDown; }
-        bind "k" { ScrollUp; }
-        bind "l" { PageScrollDown; }
-        bind "u" { HalfPageScrollUp; }
-    }
-    entersearch {
-        bind "Ctrl c" { SwitchToMode "scroll"; }
-        bind "esc" { SwitchToMode "scroll"; }
-        bind "enter" { SwitchToMode "search"; }
-    }
-    renametab {
-        bind "esc" { UndoRenameTab; SwitchToMode "tab"; }
-    }
-    shared_among "renametab" "renamepane" {
-        bind "Ctrl c" { SwitchToMode "locked"; }
-    }
-    renamepane {
-        bind "esc" { UndoRenamePane; SwitchToMode "pane"; }
-    }
-}
-
-// Plugin aliases - can be used to change the implementation of Zellij
-// changing these requires a restart to take effect
-plugins {
-    about location="zellij:about"
-    compact-bar location="zellij:compact-bar"
-    configuration location="zellij:configuration"
-    filepicker location="zellij:strider" {
-        cwd "/"
-    }
-    plugin-manager location="zellij:plugin-manager"
-    session-manager location="zellij:session-manager"
-    status-bar location="zellij:status-bar"
-    strider location="zellij:strider"
-    tab-bar location="zellij:tab-bar"
-    welcome-screen location="zellij:session-manager" {
-        welcome_screen true
-    }
-}
-
-// Plugins to load in the background when a new session starts
-// eg. "file:/path/to/my-plugin.wasm"
-// eg. "https://example.com/my-plugin.wasm"
-load_plugins {
-}
-
-// Use a simplified UI without special fonts (arrow glyphs)
-// Options:
-//   - true
-//   - false (Default)
-//
-// simplified_ui true
-
-// Choose the theme that is specified in the themes section.
-// Default: default
-//
-theme "tokyo-night-dark"
-
-// Choose the base input mode of zellij.
-// Default: normal
-//
-default_mode "locked"
-
-// Choose the path to the default shell that zellij will use for opening new panes
-// Default: $SHELL
-//
-// default_shell "fish"
-
-// Choose the path to override cwd that zellij will use for opening new panes
-//
-// default_cwd "/tmp"
-
-// The name of the default layout to load on startup
-// Default: "default"
-//
-default_layout "compact"
-
-// The folder in which Zellij will look for layouts
-// (Requires restart)
-//
-// layout_dir "/tmp"
-
-// The folder in which Zellij will look for themes
-// (Requires restart)
-//
-// theme_dir "/tmp"
-
-// Toggle enabling the mouse mode.
-// On certain configurations, or terminals this could
-// potentially interfere with copying text.
-// Options:
-//   - true (default)
-//   - false
-//
-mouse_mode true
-
-// Toggle having pane frames around the panes
-// Options:
-//   - true (default, enabled)
-//   - false
-//
-pane_frames false
-
-// When attaching to an existing session with other users,
-// should the session be mirrored (true)
-// or should each user have their own cursor (false)
-// (Requires restart)
-// Default: false
-//
-// mirror_session true
-
-// Choose what to do when zellij receives SIGTERM, SIGINT, SIGQUIT or SIGHUP
-// eg. when terminal window with an active zellij session is closed
-// (Requires restart)
-// Options:
-//   - detach (Default)
-//   - quit
-//
-// on_force_close "quit"
-
-// Configure the scroll back buffer size
-// This is the number of lines zellij stores for each pane in the scroll back
-// buffer. Excess number of lines are discarded in a FIFO fashion.
-// (Requires restart)
-// Valid values: positive integers
-// Default value: 10000
-//
-// scroll_buffer_size 10000
-
-// Provide a command to execute when copying text. The text will be piped to
-// the stdin of the program to perform the copy. This can be used with
-// terminal emulators which do not support the OSC 52 ANSI control sequence
-// that will be used by default if this option is not set.
-// Examples:
-//
-// copy_command "xclip -selection clipboard" // x11
-copy_command "wl-copy"                    // wayland
-// copy_command "pbcopy"                     // osx
-//
-// copy_command "pbcopy"
-
-// Choose the destination for copied text
-// Allows using the primary selection buffer (on x11/wayland) instead of the system clipboard.
-// Does not apply when using copy_command.
-// Options:
-//   - system (default)
-//   - primary
-//
-// copy_clipboard "primary"
-
-// Enable automatic copying (and clearing) of selection when releasing mouse
-// Default: true
-//
-// copy_on_select true
-
-// Path to the default editor to use to edit pane scrollbuffer
-// Default: $EDITOR or $VISUAL
-// scrollback_editor "/usr/bin/vim"
-
-// A fixed name to always give the Zellij session.
-// Consider also setting `attach_to_session true,`
-// otherwise this will error if such a session exists.
-// Default: <RANDOM>
-//
-// session_name "My singleton session"
-
-// When `session_name` is provided, attaches to that session
-// if it is already running or creates it otherwise.
-// Default: false
-//
-// attach_to_session true
-
-// Toggle between having Zellij lay out panes according to a predefined set of layouts whenever possible
-// Options:
-//   - true (default)
-//   - false
-//
-// auto_layout false
-
-// Whether sessions should be serialized to the cache folder (including their tabs/panes, cwds and running commands) so that they can later be resurrected
-// Options:
-//   - true (default)
-//   - false
-//
-// session_serialization false
-
-// Whether pane viewports are serialized along with the session, default is false
-// Options:
-//   - true
-//   - false (default)
-//
-// serialize_pane_viewport false
-
-// Scrollback lines to serialize along with the pane viewport when serializing sessions, 0
-// defaults to the scrollback size. If this number is higher than the scrollback size, it will
-// also default to the scrollback size. This does nothing if `serialize_pane_viewport` is not true.
-//
-// scrollback_lines_to_serialize 10000
-
-// Enable or disable the rendering of styled and colored underlines (undercurl).
-// May need to be disabled for certain unsupported terminals
-// (Requires restart)
-// Default: true
-//
-// styled_underlines false
-
-// How often in seconds sessions are serialized
-//
-// serialization_interval 10000
-
-// Enable or disable writing of session metadata to disk (if disabled, other sessions might not know
-// metadata info on this session)
-// (Requires restart)
-// Default: false
-//
-// disable_session_metadata false
-
-// Enable or disable support for the enhanced Kitty Keyboard Protocol (the host terminal must also support it)
-// (Requires restart)
-// Default: true (if the host terminal supports it)
-//
-support_kitty_keyboard_protocol true
-
-// Whether to stack panes when resizing beyond a certain size
-// Default: true
-//
-// stacked_resize false
-
-// Whether to show tips on startup
-// Default: true
-//
-show_startup_tips false
-
-// Whether to show release notes on first version run
-// Default: true
-//
-// show_release_notes false
--- a/hosts/Aloria/default.nix
+++ b/hosts/Aloria/default.nix
@ -17,9 +17,7 @@ in {

    zramSwap.enable = true;
    services.upower.enable = true;
-    services.logind.settings.Login = {
-        HandlePowerKey = "suspend";
-    };
+    services.logind.extraConfig = ''HandlePowerKey=ignore'';
    services.throttled.enable = true;
    services.thinkfan.enable = true;

--- a/hosts/Arendia/default.nix
+++ b/hosts/Arendia/default.nix
@ -26,9 +26,7 @@ in {
    zramSwap.enable = true;
    services.upower.enable = true;
    services.thermald.enable = true;
-    services.logind.settings.Login = {
-        HandlePowerKey = "suspend";
-    };
+    services.logind.extraConfig = ''HandlePowerKey=ignore'';
    services.throttled = {
        enable = true;
    };
@ -42,7 +40,6 @@ in {
        };
        Settings = {
            AutoConnect = true;
-            Country = "ES";
        };
        General = {
            EnableNetworkConfiguration = true;
@ -122,5 +119,4 @@ in {
    ];
    fonts.fontDir.enable = true;
    services.flatpak.enable = true;
-    boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
 }
--- a/hosts/Common/default.nix
+++ b/hosts/Common/default.nix
@ -14,10 +14,7 @@
    boot.loader.systemd-boot.netbootxyz.enable = true;
    boot.loader.timeout = 1;
    boot.loader.efi.canTouchEfiVariables = true;
-    systemd.settings.Manager.DefaultTimeoutStopSec = "10s";
-    systemd.settings.Manager.DefaultTimeoutStartSec = "10s";
-    systemd.settings.Manager.DefaultTimeoutAbortSec = "10s";
-    systemd.settings.Manager.DefaultDeviceTimeoutSec = "10s";
+    systemd.extraConfig = "DefaultTimeoutStopSec=10s";
    systemd.services.systemd-user-sessions.enable = false;
    boot.tmp.cleanOnBoot = true;

@ -78,8 +75,8 @@
    };

    services.resolved = {
-        enable = pkgs.lib.mkDefault true;
+        enable = true;
        fallbackDns = [ "1.1.1.1" "1.0.0.1" ];
    };
-    networking.nameservers = pkgs.lib.mkDefault ["1.1.1.1" "1.0.0.1"];
+    networking.nameservers = ["1.1.1.1" "1.0.0.1"];
 }
--- a/hosts/Common/nfs.nix
+++ b/hosts/Common/nfs.nix
@ -9,7 +9,7 @@ let
        "soft"
        "bg"
        "intr"
-        # "x-systemd.automount"
+        "x-systemd.automount"
        "x-systemd.idle-timeout=600"
        "x-systemd.device-timeout=2s"
        "x-systemd.mount-timeout=2s"
@ -61,4 +61,10 @@ in {
        device = "/home/server/Storage/Thomas/Videos";
        options = bind_options;
    };
+    systemd.extraConfig = ''
+      DefaultTimeoutStartSec=15s
+      DefaultTimeoutStopSec=15s
+      DefaultTimeoutAbortSec=15s
+      DefaultDeviceTimeoutSec=15s
+    '';
 }
--- a/hosts/Common/zfs.nix
+++ b/hosts/Common/zfs.nix
@ -1,4 +1,4 @@
-{ ... }:
+{ inputs, config, pkgs, ... }:
 {
    boot.initrd.supportedFilesystems = [ "zfs" ];
    boot.supportedFilesystems = [ "zfs" ];
@ -18,17 +18,6 @@
                autoprune = true;
                autosnap = true;
            };
-            "rpool/storage" = {
-                frequently = 8;
-                yearly = 0;
-                monthly = 0;
-                weekly = 0;
-                daily = 0;
-                hourly = 0;
-                frequent_period = 15;
-                autoprune = true;
-                autosnap = true;
-            };
        };
    };
 }
--- a/hosts/Kell/default.nix
+++ b/hosts/Kell/default.nix
@ -38,9 +38,7 @@ in {
        acceleration = "rocm";
    };
    # nixpkgs.config.cudaSupport = true;
-    services.logind.settings.Login = {
-        HandlePowerKey = "suspend";
-    };
+    services.logind.extraConfig = ''HandlePowerKey=suspend'';

    # Virtualization
    virtualisation.libvirtd.enable = true;
--- a/hosts/Mallorea/flake.lock
+++ b/hosts/Mallorea/flake.lock
@ -68,11 +68,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1753181343,
-        "narHash": "sha256-CLQfNtUqirNVSYoW/kYbvL4PeeNasmZonaPnjO3+1YQ=",
+        "lastModified": 1740208222,
+        "narHash": "sha256-FqgPcK5BK+Mc4cGBCGz555UsVd/TQK9FvmuamBWu+ZY=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "0cdfcdbb525b77b951c889b6131047bc374f48fe",
+        "rev": "f4a07823a298deff0efb0db30f9318511de7c232",
        "type": "github"
      },
      "original": {
@ -99,11 +99,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1752950548,
-        "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=",
+        "lastModified": 1739866667,
+        "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "c87b95e25065c028d31a94f06a62927d18763fdf",
+        "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
        "type": "github"
      },
      "original": {
--- a/hosts/Riva/default.nix
+++ b/hosts/Riva/default.nix
@ -45,12 +45,4 @@
        device = "/home/server/Workspace";
        options = ["bind"];
    };
-    services.resolved = {
-        enable = false;
-    };
-    networking.nameservers = ["192.168.1.2"];
-    programs.steam = {
-        enable = true;
-        gamescopeSession.enable = true;
-    };
 }