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():
-                xontrib load $xontrib
+            for xontrib in get_xontribs():
+                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"];
-          monospace = ["Fairfax SM"];
-          serif = ["Fairfax SM"];
+          sansSerif = ["Fira Sans"];
+          monospace = ["Fira Mono"];
+          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"
+  ];
+}