chore: update flake.lock file

computers/default.nix

@@ -5,7 +5,7 @@
 }: {
   flake = {
     nixosConfigurations = lib.mkComputers {
-      toothless = {
+      waddledee = {
         system = "x86_64-linux";
         user = "artur";
         extraModules = [

computers/shared/default.nix

@@ -12,5 +12,6 @@
     ./direnv.nix
     ./xonsh.nix
     ./aliases.nix
+    ./libvirt.nix
   ];
 }

computers/shared/libvirt.nix

@@ -0,0 +1,22 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  cfg = config.alqueva.libvirt;
+in {
+  options.alqueva.libvirt = {
+    enable = lib.mkEnableOption "libvirt";
+  };
+
+  config = lib.mkIf cfg.enable {
+    virtualisation.libvirtd = {
+      enable = true;
+      qemu.package = pkgs.qemu_kvm;
+    };
+
+    programs.virt-manager.enable = true;
+    networking.nftables.enable = true;
+  };
+}

computers/shared/xonsh.nix

@@ -18,8 +18,8 @@ in {
           "from xonsh.xontribs import get_xontribs\n"
           + lib.concatStringsSep "\n" (builtins.attrValues (builtins.mapAttrs (n: v: "aliases['${n}'] = '${v}'\n") config.environment.shellAliases))
           + ''
-            for $xontrib in get_xontribs():
+            for xontrib in get_xontribs():
-                xontrib load $xontrib
+                xontrib load @(xontrib)
 
             execx($(zoxide init xonsh --cmd j), 'exec', __xonsh__.ctx, filename='zoxide')
           '';
@@ -38,19 +38,6 @@ in {
                   hash = "sha256-PhhdZ3iLPDEIG9uDeR5ctJ9zz2+YORHBhbsiLrJckyA=";
                 };
               })
-            (let
-              name = "xontrib-prompt-bar";
-              version = "0.5.8";
-            in
-              ps.buildPythonPackage {
-                inherit name version;
-                src = fetchFromGitHub {
-                  owner = "anki-code";
-                  repo = name;
-                  rev = version;
-                  hash = "sha256-n80XDApfoUJQORSzIY1FACLeL++HKmIxcz4MAeQ3CZ0=";
-                };
-              })
           ];
         };
         enable = true;

computers/waddledee/configs/foot/foot.ini

@@ -0,0 +1,25 @@
+pad=15x15
+font=monospace:size=15
+
+[cursor]
+color=191724 e0def4 
+
+[colors]
+background=191724
+foreground=e0def4
+regular0=26233a
+regular1=eb6f92
+regular2=31748f
+regular3=f6c177
+regular4=9ccfd8
+regular5=c4a7e7
+regular6=ebbcba
+regular7=e0def4
+bright0=6e6a86
+bright1=eb6f92
+bright2=31748f
+bright3=f6c177
+bright4=9ccfd8
+bright5=c4a7e7
+bright6=ebbcba
+bright7=e0def4

computers/waddledee/configs/fuzzel/fuzzel.ini

@@ -0,0 +1,28 @@
+[main]
+font=monospace:size=15
+use-bold=yes
+icons-enabled=no
+match-mode=fuzzy
+anchor=center
+lines=8
+horizontal-pad=15
+vertical-pad=15
+
+[colors]
+background=191724ff
+text=e0def4ff
+match=ebbcbaff
+selection=403d52ff
+selection-text=e0def4ff
+selection-match=ebbcbaff
+border=524f67ff
+prompt=6e6a86ff
+placeholder=6e6a86ff
+input=e0def4ff
+
+[border]
+width=2
+
+[key-bindings]
+cancel=Control+[
+execute=Control+m

computers/waddledee/configs/kanshi/config

@@ -0,0 +1,3 @@
+profile {
+        output HDMI-A-1 mode 1920x1080@100Hz
+}

computers/waddledee/configs/river/init

@@ -0,0 +1,89 @@
+#!/bin/sh
+
+riverctl spawn kanshi
+riverctl spawn "swaybg -i /tmp/wallpapers/rose_pine/04.png -m fill"
+
+riverctl spawn "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
+riverctl spawn "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=river"
+
+riverctl map normal Super+Shift Return spawn foot
+riverctl map normal Super R spawn fuzzel
+riverctl map normal Super Q close
+riverctl map normal Super+Shift E exit
+riverctl map normal Super J focus-view next
+riverctl map normal Super K focus-view previous
+riverctl map normal Super+Shift J swap next
+riverctl map normal Super+Shift K swap previous
+riverctl map normal Super Period focus-output next
+riverctl map normal Super Comma focus-output previous
+riverctl map normal Super+Shift Period send-to-output next
+riverctl map normal Super+Shift Comma send-to-output previous
+riverctl map normal Super Return zoom
+riverctl map normal Super H send-layout-cmd rivertile "main-ratio -0.05"
+riverctl map normal Super L send-layout-cmd rivertile "main-ratio +0.05"
+riverctl map normal Super+Shift H send-layout-cmd rivertile "main-count +1"
+riverctl map normal Super+Shift L send-layout-cmd rivertile "main-count -1"
+riverctl map normal Super+Alt H move left 100
+riverctl map normal Super+Alt J move down 100
+riverctl map normal Super+Alt K move up 100
+riverctl map normal Super+Alt L move right 100
+riverctl map normal Super+Alt+Control H snap left
+riverctl map normal Super+Alt+Control J snap down
+riverctl map normal Super+Alt+Control K snap up
+riverctl map normal Super+Alt+Control L snap right
+riverctl map normal Super+Alt+Shift H resize horizontal -100
+riverctl map normal Super+Alt+Shift J resize vertical 100
+riverctl map normal Super+Alt+Shift K resize vertical -100
+riverctl map normal Super+Alt+Shift L resize horizontal 100
+riverctl map-pointer normal Super BTN_LEFT move-view
+riverctl map-pointer normal Super BTN_RIGHT resize-view
+riverctl map-pointer normal Super BTN_MIDDLE toggle-float
+
+for i in $(seq 1 9)
+do
+    tags=$((1 << ($i - 1)))
+    riverctl map normal Super $i set-focused-tags $tags
+    riverctl map normal Super+Shift $i set-view-tags $tags
+    riverctl map normal Super+Control $i toggle-focused-tags $tags
+    riverctl map normal Super+Shift+Control $i toggle-view-tags $tags
+done
+
+all_tags=$(((1 << 32) - 1))
+riverctl map normal Super 0 set-focused-tags $all_tags
+riverctl map normal Super+Shift 0 set-view-tags $all_tags
+riverctl map normal Super Space toggle-float
+riverctl map normal Super F toggle-fullscreen
+riverctl map normal Super Up    send-layout-cmd rivertile "main-location top"
+riverctl map normal Super Right send-layout-cmd rivertile "main-location right"
+riverctl map normal Super Down  send-layout-cmd rivertile "main-location bottom"
+riverctl map normal Super Left  send-layout-cmd rivertile "main-location left"
+riverctl declare-mode passthrough
+riverctl map normal Super F11 enter-mode passthrough
+riverctl map passthrough Super F11 enter-mode normal
+
+for mode in normal locked
+do
+    riverctl map $mode None XF86Eject spawn 'eject -T'
+    riverctl map $mode None XF86AudioRaiseVolume  spawn 'pamixer -i 5'
+    riverctl map $mode None XF86AudioLowerVolume  spawn 'pamixer -d 5'
+    riverctl map $mode None XF86AudioMute         spawn 'pamixer --toggle-mute'
+    riverctl map $mode None XF86AudioMedia spawn 'playerctl play-pause'
+    riverctl map $mode None XF86AudioPlay  spawn 'playerctl play-pause'
+    riverctl map $mode None XF86AudioPrev  spawn 'playerctl previous'
+    riverctl map $mode None XF86AudioNext  spawn 'playerctl next'
+    riverctl map $mode None XF86MonBrightnessUp   spawn 'brightnessctl set +5%'
+    riverctl map $mode None XF86MonBrightnessDown spawn 'brightnessctl set 5%-'
+done
+
+riverctl background-color 0x000000
+riverctl border-color-focused 0x9ccfd8
+riverctl border-color-unfocused 0x524f67
+
+riverctl set-repeat 50 300
+
+riverctl rule-add ssd
+
+riverctl xcursor-theme "BreezeX-RosePine-Linux"
+
+riverctl default-layout rivertile
+rivertile -view-padding 6 -outer-padding 6 &

computers/waddledee/default.nix

@@ -2,6 +2,8 @@
   imports = [
     ./hardware-configuration.nix
     ./disks.nix
+    ./river.nix
+    ./theme.nix
   ];
 
   config = {
@@ -20,17 +22,14 @@
         layout = "us";
         options = "eurosign:e,ctrl:nocaps";
       };
-      desktopManager.plasma6 = {
+
-        enable = true;
-        enableQt5Integration = false;
-      };
       libinput.enable = true;
       openssh.enable = true;
     };
 
     hardware.graphics = {
       enable = true;
-      enable32Bit = true;
+      enable32Bit = false;
     };
 
     environment.systemPackages = builtins.attrValues {
@@ -45,7 +44,8 @@
         nicotine-plus
         mpv
         imv
-        wl-clipboard
+        lunarvim
+        amberol
         ;
     };
 
@@ -54,29 +54,33 @@
         enable = true;
         ncmpcpp = true;
       };
+
       fonts = {
         names = {
-          sansSerif = ["Fairfax SM"];
+          sansSerif = ["Fira Sans"];
-          monospace = ["Fairfax SM"];
+          monospace = ["Fira Mono"];
-          serif = ["Fairfax SM"];
+          serif = ["Poly"];
         };
+
         packages = [
           (pkgs.nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
-          pkgs.fairfax
           pkgs.font-awesome
+          pkgs.fira
+          pkgs.poly
         ];
+
         enable = true;
       };
-      sddm.enable = true;
+
-      emacs.enable = true;
-      git.enable = true;
       qutebrowser.enable = true;
       pipewire.enable = true;
       openssh.enable = true;
+      libvirt.enable = true;
       direnv.enable = true;
+      emacs.enable = true;
+      git.enable = true;
     };
 
-    programs.neovim.enable = true;
     networking.networkmanager.enable = true;
     time.timeZone = "Europe/London";
     i18n.defaultLocale = "en_GB.UTF-8";

computers/waddledee/river.nix

@@ -0,0 +1,58 @@
+{
+  inputs,
+  pkgs,
+  config,
+  ...
+}: {
+  config = {
+    programs.river = {
+      enable = true;
+      extraPackages = builtins.attrValues {
+        inherit
+          (pkgs)
+          grim
+          slurp
+          wf-recorder
+          wl-clipboard
+          foot
+          fuzzel
+          swaybg
+          kanshi
+          ;
+      };
+    };
+
+    xdg.portal = {
+      config = {
+        common.default = ["gtk"];
+        river.default = ["wlr"];
+      };
+
+      extraPortals = [
+        pkgs.xdg-desktop-portal-gtk
+      ];
+
+      enable = true;
+      wlr.enable = true;
+    };
+
+    environment.sessionVariables = {
+      NIXOS_OZONE_WL = "1";
+      QT_QPA_PLATFORM = "wayland";
+    };
+
+    systemd = {
+      tmpfiles.rules = [
+        "L+ /tmp/wallpapers/ - - - - ${inputs.wallpkgs.packages.${pkgs.system}.rose_pine}/share/wallpapers"
+      ];
+      user.tmpfiles.users.artur.rules = let
+        hcfg = "%h/.config";
+      in [
+        "L+ ${hcfg}/kanshi/ - - - - ${./configs/kanshi}"
+        "L+ ${hcfg}/fuzzel/ - - - - ${./configs/fuzzel}"
+        "L+ ${hcfg}/river/ - - - - ${./configs/river}"
+        "L+ ${hcfg}/foot/ - - - - ${./configs/foot}"
+      ];
+    };
+  };
+}

computers/waddledee/theme.nix

@@ -0,0 +1,42 @@
+{
+  pkgs,
+  lib,
+  ...
+}: let
+  gtkTheme = pkgs.rose-pine-gtk-theme;
+in {
+  programs.dconf = {
+    profiles.user.databases = [
+      {
+        settings = {
+          "org/gnome/desktop/interface" = {
+            color-scheme = "prefer-dark";
+            cursor-size = lib.gvariant.mkUint32 24;
+            cursor-theme = "BreezeX-RosePine-Linux";
+            gtk-theme = "Rose-pine";
+            icon-theme = "Rose-pine";
+          };
+        };
+      }
+    ];
+    enable = true;
+  };
+
+  qt = {
+    enable = true;
+    style = "kvantum";
+  };
+
+  environment.systemPackages = builtins.attrValues {
+    inherit
+      (pkgs)
+      rose-pine-cursor
+      rose-pine-icon-theme
+      ;
+    inherit gtkTheme;
+  };
+
+  systemd.user.tmpfiles.users.artur.rules = [
+    "L+ %h/.config/gtk-4.0/gtk.css - - - - ${gtkTheme}/share/themes/rose-pine/gtk-4.0/gtk.css"
+  ];
+}

flake.lock

@@ -1,25 +1,5 @@
 {
   "nodes": {
-    "astal": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1730210962,
-        "narHash": "sha256-qQ5Inu3T/cKteV46wTvw+ONWi32pbDZ7DIC59N561nk=",
-        "owner": "aylur",
-        "repo": "astal",
-        "rev": "8705ab494f448c508c43c4272b501a3f3bdbac70",
-        "type": "github"
-      },
-      "original": {
-        "owner": "aylur",
-        "repo": "astal",
-        "type": "github"
-      }
-    },
     "disko": {
       "inputs": {
         "nixpkgs": "nixpkgs"
@@ -41,11 +21,31 @@
     "emacs": {
       "inputs": {
         "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs_4",
+        "nixpkgs-stable": "nixpkgs-stable_2"
+      },
+      "locked": {
+        "lastModified": 1730513067,
+        "narHash": "sha256-0MHc5yR4qmQK4O8MzraisT3gnv907fn813Qb2J134CU=",
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "6afb2183cef03dcfce47c3bf22b2d44ded54ace0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "type": "github"
+      }
+    },
+    "emacs_2": {
+      "inputs": {
+        "flake-utils": "flake-utils_3",
         "nixpkgs": [
           "pankomacs",
           "nixpkgs"
         ],
-        "nixpkgs-stable": "nixpkgs-stable_2"
+        "nixpkgs-stable": "nixpkgs-stable_3"
       },
       "locked": {
         "lastModified": 1724951607,
@@ -61,6 +61,29 @@
         "type": "github"
       }
     },
+    "fenix": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs-f2k",
+          "nixpkgs-fmt",
+          "nixpkgs"
+        ],
+        "rust-analyzer-src": "rust-analyzer-src"
+      },
+      "locked": {
+        "lastModified": 1637475807,
+        "narHash": "sha256-E3nzOvlzZXwyo8Stp5upKsTCDcqUTYAFj4EC060A31c=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "960e7fef45692a4fffc6df6d6b613b0399bbdfd5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -84,11 +107,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1727826117,
+        "lastModified": 1730504689,
-        "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
+        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
+        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
         "type": "github"
       },
       "original": {
@@ -101,6 +124,39 @@
       "inputs": {
         "systems": "systems"
       },
+      "locked": {
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "locked": {
+        "lastModified": 1637014545,
+        "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_2"
+      },
       "locked": {
         "lastModified": 1710146030,
         "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
@@ -123,11 +179,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1729104314,
+        "lastModified": 1730302582,
-        "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
+        "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
+        "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf",
         "type": "github"
       },
       "original": {
@@ -173,6 +229,62 @@
         "type": "github"
       }
     },
+    "nixpkgs-f2k": {
+      "inputs": {
+        "emacs": "emacs",
+        "nixpkgs": "nixpkgs_5",
+        "nixpkgs-fmt": "nixpkgs-fmt",
+        "parts": "parts"
+      },
+      "locked": {
+        "lastModified": 1730515778,
+        "narHash": "sha256-hUFauDDcElIHo9l+jmSnnl+Zh6dNgAVPO06YFfnmm0M=",
+        "owner": "moni-dz",
+        "repo": "nixpkgs-f2k",
+        "rev": "43acb8a488a618f01f1dc46c984acbbad6989085",
+        "type": "github"
+      },
+      "original": {
+        "owner": "moni-dz",
+        "repo": "nixpkgs-f2k",
+        "type": "github"
+      }
+    },
+    "nixpkgs-fmt": {
+      "inputs": {
+        "fenix": "fenix",
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixpkgs-f2k",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1721822211,
+        "narHash": "sha256-zacOgNv3qM3AbSG3p5PT/Bfc4c7NoIqoLII8/jIUsOQ=",
+        "owner": "nix-community",
+        "repo": "nixpkgs-fmt",
+        "rev": "bdb15b4c7e0cb49ae091dd43113d0a938afae02c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs-fmt",
+        "type": "github"
+      }
+    },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1730504152,
+        "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
+      }
+    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1720386169,
@@ -190,6 +302,22 @@
       }
     },
     "nixpkgs-stable_2": {
+      "locked": {
+        "lastModified": 1730327045,
+        "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "080166c15633801df010977d9d7474b4a6c549d7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable_3": {
       "locked": {
         "lastModified": 1724727824,
         "narHash": "sha256-0XH9MJk54imJm+RHOLTUJ7e+ponLW00tw5ke4MTVa1Y=",
@@ -223,11 +351,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1729880355,
+        "lastModified": 1730200266,
-        "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
+        "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
+        "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
         "type": "github"
       },
       "original": {
@@ -238,6 +366,38 @@
       }
     },
     "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1730200266,
+        "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1730513553,
+        "narHash": "sha256-ZzI3i+mB2k4DWnEv8LXeQk70Bmbwmy0Mkpks8O8EhIE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "edd7f434421aa1d00795cd77cdb404aa8839f00d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1724748588,
         "narHash": "sha256-NlpGA4+AIf1dKNq76ps90rxowlFXUsV9x7vK/mN37JM=",
@@ -253,7 +413,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1725103162,
         "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
@@ -271,25 +431,44 @@
     },
     "pankomacs": {
       "inputs": {
-        "emacs": "emacs",
+        "emacs": "emacs_2",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_6",
-        "parts": "parts"
+        "parts": "parts_2"
       },
       "locked": {
-        "lastModified": 1729519091,
+        "lastModified": 1730354179,
-        "narHash": "sha256-fGkNTncOHLQZGcblqUPdoXyeEXuDDNWUa4K3e51n98E=",
+        "narHash": "sha256-IjKyB4Cu+evV8zEvaBSoo5ERf9/a+w2EB/l6LfdUftY=",
-        "ref": "refs/heads/main",
+        "ref": "main",
-        "rev": "ba6a74607fc16833e18239232e8f10fcc8c78314",
+        "rev": "16f34a9ac005287ba66839cdc639210bc0dd7f66",
-        "revCount": 68,
+        "revCount": 72,
         "type": "git",
         "url": "https://codeberg.org/amadaluzia/pankomacs.git"
       },
       "original": {
+        "ref": "main",
         "type": "git",
         "url": "https://codeberg.org/amadaluzia/pankomacs.git"
       }
     },
     "parts": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1730504689,
+        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "parts_2": {
       "inputs": {
         "nixpkgs-lib": [
           "pankomacs",
@@ -310,38 +489,34 @@
         "type": "github"
       }
     },
-    "quickshell": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1730157521,
-        "narHash": "sha256-xyodl47NDih2SEYbRkAvv6lPbjjA/E9B0TlCLnGIFa8=",
-        "ref": "refs/heads/master",
-        "rev": "4e48c6eefb399abfcdefbe046a6a642bdcfcc1a6",
-        "revCount": 358,
-        "type": "git",
-        "url": "https://git.outfoxxed.me/quickshell/quickshell"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.outfoxxed.me/quickshell/quickshell"
-      }
-    },
     "root": {
       "inputs": {
-        "astal": "astal",
         "disko": "disko",
         "flake-parts": "flake-parts",
         "git-hooks-nix": "git-hooks-nix",
         "nixpkgs": "nixpkgs_3",
+        "nixpkgs-f2k": "nixpkgs-f2k",
         "pankomacs": "pankomacs",
-        "quickshell": "quickshell",
         "wallpkgs": "wallpkgs"
       }
     },
+    "rust-analyzer-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1637439871,
+        "narHash": "sha256-2awQ/obzl7zqYgLwbQL0zT58gN8Xq7n+81GcMiS595I=",
+        "owner": "rust-analyzer",
+        "repo": "rust-analyzer",
+        "rev": "4566414789310acb2617543f4b50beab4bb48e06",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-analyzer",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
+      }
+    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -372,17 +547,32 @@
         "type": "github"
       }
     },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "wallpkgs": {
       "inputs": {
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_7",
-        "systems": "systems_2"
+        "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1728261155,
+        "lastModified": 1730262671,
-        "narHash": "sha256-bDnPyjl8/EsMPQE2dweWiOkpJ7zYI8LhrVEGx0luquk=",
+        "narHash": "sha256-UkB5NVODOqZA1yXmyhE+bXv+qqQ8xr5LIDCXVGomwlo=",
         "owner": "notashelf",
         "repo": "wallpkgs",
-        "rev": "81459dfc37c4420b7908a90a333d2643f24bec33",
+        "rev": "d1d49188ab88db39c94c45b949eaa29a9dade108",
         "type": "github"
       },
       "original": {

flake.nix

@@ -28,18 +28,16 @@
       owner = "notashelf";
       repo = "wallpkgs";
     };
-    astal = {
+    nixpkgs-f2k = {
       type = "github";
-      owner = "aylur";
+      owner = "moni-dz";
-      repo = "astal";
+      repo = "nixpkgs-f2k";
-      inputs.nixpkgs.follows = "nixpkgs";
     };
-    quickshell = {
+    pankomacs = {
       type = "git";
-      url = "https://git.outfoxxed.me/quickshell/quickshell";
+      url = "https://codeberg.org/amadaluzia/pankomacs.git";
-      inputs.nixpkgs.follows = "nixpkgs";
+      ref = "main";
     };
-    pankomacs.url = "git+https://codeberg.org/amadaluzia/pankomacs.git";
   };
   outputs = inputs @ {
     nixpkgs,