flake update

noctalia: add pwvucontrol
flake update
2026-01-30 12:33:24 +01:00 · 2026-01-30 12:28:43 +01:00 · 2026-01-23 13:00:48 +01:00 · 2026-01-11 09:08:48 +01:00 · 2026-01-05 08:28:33 +01:00 · 2025-12-29 20:33:48 +01:00
19 changed files with 1055 additions and 408 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+*.jpg filter=lfs diff=lfs merge=lfs -text
+*.svg filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
--- a/flake.lock
+++ b/flake.lock
@@ -25,11 +25,11 @@
    },
    "crane": {
      "locked": {
-        "lastModified": 1765739568,
-        "narHash": "sha256-gQYx35Of4UDKUjAYvmxjUEh/DdszYeTtT6MDin4loGE=",
+        "lastModified": 1769287525,
+        "narHash": "sha256-gABuYA6BzoRMLuPaeO5p7SLrpd4qExgkwEmYaYQY4bM=",
        "owner": "ipetkov",
        "repo": "crane",
-        "rev": "67d2baff0f9f677af35db61b32b5df6863bcc075",
+        "rev": "0314e365877a85c9e5758f9ea77a9972afbb4c21",
        "type": "github"
      },
      "original": {
@@ -63,15 +63,15 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1761588595,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
-        "owner": "edolstra",
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
        "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
        "type": "github"
      },
      "original": {
-        "owner": "edolstra",
+        "owner": "NixOS",
        "repo": "flake-compat",
        "type": "github"
      }
@@ -126,11 +126,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1766387499,
-        "narHash": "sha256-AjK3/UKDzeXFeYNLVBaJ3+HLE9he1g5UrlNd4/BM3eA=",
+        "lastModified": 1769723138,
+        "narHash": "sha256-kgkwjs33YfJasADIrHjHcTIDs3wNX0xzJhnUP+oldEw=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "527ad07e6625302b648ed3b28c34b62a79bd103e",
+        "rev": "175532b6275b34598a0ceb1aef4b9b4006dd4073",
        "type": "github"
      },
      "original": {
@@ -146,11 +146,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1766292113,
-        "narHash": "sha256-sWTtmkQujRpjWYCnZc8LWdDiCzrRlSBPrGovkZpLkBI=",
+        "lastModified": 1769580047,
+        "narHash": "sha256-tNqCP/+2+peAXXQ2V8RwsBkenlfWMERb+Uy6xmevyhM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "fdec8815a86db36f42fc9c8cb2931cd8485f5aed",
+        "rev": "366d78c2856de6ab3411c15c1cb4fb4c2bf5c826",
        "type": "github"
      },
      "original": {
@@ -160,13 +160,38 @@
        "type": "github"
      }
    },
-    "impermanence": {
+    "home-manager_3": {
+      "inputs": {
+        "nixpkgs": [
+          "impermanence",
+          "nixpkgs"
+        ]
+      },
      "locked": {
-        "lastModified": 1737831083,
-        "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=",
+        "lastModified": 1768598210,
+        "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "impermanence": {
+      "inputs": {
+        "home-manager": "home-manager_3",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1769548169,
+        "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=",
        "owner": "nix-community",
        "repo": "impermanence",
-        "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170",
+        "rev": "7b1d382faf603b6d264f58627330f9faa5cba149",
        "type": "github"
      },
      "original": {
@@ -183,11 +208,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1766225187,
-        "narHash": "sha256-6hcaU8qtmixsaEUbjPiOFd5aJPZxAIBokl5d7dkab3k=",
+        "lastModified": 1769596123,
+        "narHash": "sha256-kcElu+HiwNIJiaNH41IdemFaaGyU3TqI4ebx5CQMHFs=",
        "owner": "Jovian-Experiments",
        "repo": "Jovian-NixOS",
-        "rev": "bb53a85db9210204a98f771f10f1f5b4e06ccb2d",
+        "rev": "d6bf85533180720680544a0791c7334e315c4fd6",
        "type": "github"
      },
      "original": {
@@ -206,11 +231,11 @@
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1766225539,
-        "narHash": "sha256-0Y6o3oUmQCxrzLIvZTcUAQCPEXAc+tU+N3ZjmzdrC28=",
+        "lastModified": 1769417433,
+        "narHash": "sha256-0WZ7I/N9InaBHL96/qdiJxg8mqFW3vRla8Z062JmQFE=",
        "owner": "nix-community",
        "repo": "lanzaboote",
-        "rev": "14455220bef50f8df94f05e5763cdf51bc704acd",
+        "rev": "1902463415745b992dbaf301b2a35a1277be1584",
        "type": "github"
      },
      "original": {
@@ -228,15 +253,15 @@
        "spectrum": "spectrum"
      },
      "locked": {
-        "lastModified": 1766005889,
-        "narHash": "sha256-UCFkQ37BKDmPEHDkW1BaqJo6AZFoVcogtuyxTg4/a8M=",
-        "owner": "astro",
+        "lastModified": 1769624238,
+        "narHash": "sha256-qeXiVWfblS5w/gxwklncxfXPrdpyPJ3OGvgXKekXzaM=",
+        "owner": "microvm-nix",
        "repo": "microvm.nix",
-        "rev": "bb9e99bdb3662354299605cc1a75a2b1a86bd29a",
+        "rev": "43406f57d740f96428a8df14d2fba80f437ca79a",
        "type": "github"
      },
      "original": {
-        "owner": "astro",
+        "owner": "microvm-nix",
        "repo": "microvm.nix",
        "type": "github"
      }
@@ -265,11 +290,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1764440730,
-        "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
+        "lastModified": 1769302137,
+        "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
+        "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8",
        "type": "github"
      },
      "original": {
@@ -281,11 +306,43 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1766201043,
-        "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=",
+        "lastModified": 1768564909,
+        "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1769461804,
+        "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1769598131,
+        "narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "b3aad468604d3e488d627c0b43984eb60e75e782",
+        "rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211",
        "type": "github"
      },
      "original": {
@@ -295,19 +352,23 @@
        "type": "github"
      }
    },
-    "nixpkgs-unstable": {
+    "noctalia": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
      "locked": {
-        "lastModified": 1766070988,
-        "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8",
+        "lastModified": 1769743095,
+        "narHash": "sha256-yZ1bR3ducegfyauYnZ6JRbLQnIwxMWM7P2PioyEtsMk=",
+        "owner": "noctalia-dev",
+        "repo": "noctalia-shell",
+        "rev": "4dea7d37801d705cf977ce69fd3ee87a3c995fe5",
        "type": "github"
      },
      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
+        "owner": "noctalia-dev",
+        "repo": "noctalia-shell",
        "type": "github"
      }
    },
@@ -321,11 +382,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1765464257,
-        "narHash": "sha256-dixPWKiHzh80PtD0aLuxYNQ0xP+843dfXG/yM3OzaYQ=",
+        "lastModified": 1769069492,
+        "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=",
        "owner": "cachix",
        "repo": "pre-commit-hooks.nix",
-        "rev": "09e45f2598e1a8499c3594fe11ec2943f34fe509",
+        "rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23",
        "type": "github"
      },
      "original": {
@@ -344,8 +405,9 @@
        "lanzaboote": "lanzaboote",
        "microvm": "microvm",
        "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable"
+        "nixpkgs": "nixpkgs_2",
+        "nixpkgs-unstable": "nixpkgs-unstable",
+        "noctalia": "noctalia"
      }
    },
    "rust-overlay": {
@@ -356,11 +418,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1765680428,
-        "narHash": "sha256-fyPmRof9SZeI14ChPk5rVPOm7ISiiGkwGCunkhM+eUg=",
+        "lastModified": 1769309768,
+        "narHash": "sha256-AbOIlNO+JoqRJkK1VrnDXhxuX6CrdtIu2hSuy4pxi3g=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "eb3898d8ef143d4bf0f7f2229105fc51c7731b2f",
+        "rev": "140c9dc582cb73ada2d63a2180524fcaa744fad5",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -15,7 +15,7 @@
      nixos-hardware.url = "github:NixOS/nixos-hardware/master";

      microvm = {
-        url = "github:astro/microvm.nix";
+        url = "github:microvm-nix/microvm.nix";
        inputs.nixpkgs.follows = "nixpkgs";
      };

@@ -46,6 +46,11 @@
        inputs.nixpkgs.follows = "nixpkgs";
      };

+      noctalia = {
+        url = "github:noctalia-dev/noctalia-shell";
+	inputs.nixpkgs.follows = "nixpkgs";
+      };
+
  };

  outputs = { 
@@ -64,7 +69,7 @@
  } @ inputs: rec {
    inherit (self) outputs;
    systems = [
-      "aarch64-linux"
+#      "aarch64-linux"
      "x86_64-linux"
    ];

--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@@ -17,12 +17,12 @@
 #           └─ default.nix
 #

-{ config, nixpkgs, pkgs, user, lib, pkgs-kabbone, ... }:
+{ inputs, lib, config, pkgs, user, nixpkgs, pkgs-kabbone, ... }:

 {
  imports =                                                         # For now, if applying to other system, swap files
    [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
-    [(import ../../modules/wm/sway/default.nix)] ++         # Window Manager
+    [(import ../../modules/wm/niri/default.nix)] ++         # Window Manager
    (import ../../modules/wm/virtualisation) ++             # libvirt + Docker
    [(import ../../modules/wm/virtualisation/kvm-amd.nix)] ++   # kvm module options
    #[(import ../../modules/kabbone/corosync-qdevice.nix)] ++   # corosync qdevice quorum
@@ -101,5 +101,4 @@
        };
    };
  };
-
 }
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -17,7 +17,7 @@
  imports =
    [
      #../../modules/wm/hyprland/home.nix # Window Manager
-      ../../modules/wm/sway/home.nix # Window Manager
+      ../../modules/wm/niri/home.nix # Window Manager
      ../../modules/home.nix # Window Manager
    ];

--- a/hosts/home.nix
+++ b/hosts/home.nix
@@ -64,6 +64,7 @@
      vimiv-qt
      freecad
      discord
+      vesktop
      element-desktop

 # Fileanagement
@@ -81,7 +82,6 @@
      gimp

      # Flatpak
-      prusa-slicer
      #vscodium
      (vscode-with-extensions.override {
          vscode = vscodium;
@@ -90,8 +90,8 @@
            github.copilot
            #ms-python.python
            ms-vscode.cpptools
-            dracula-theme.theme-dracula
-
+	    catppuccin.catppuccin-vsc-icons
+	    catppuccin.catppuccin-vsc
          ];
      })

--- a/hosts/lifebook/default.nix
+++ b/hosts/lifebook/default.nix
@@ -17,13 +17,13 @@
 #           └─ default.nix
 #

-{ lib, config, pkgs, user, ... }:
+{ inputs, lib, config, pkgs, user, ... }:

 {
  imports =                                                         # For now, if applying to other system, swap files
    [(import ./hardware-configuration.nix)] ++                      # Current system hardware config @ /etc/nixos/hardware-configuration.nix
    [(import ../../modules/wm/niri/default.nix)] ++        # Window Manager
-    [(import ../../modules/wm/virtualisation/docker.nix)] ++   # Docker
+    (import ../../modules/wm/virtualisation) ++             # libvirt + Docker
    [(import ../../modules/wm/virtualisation/kvm-intel.nix)] ++   # kvm module options
    (import ../../modules/hardware);                                # Hardware devices

@@ -54,6 +54,7 @@
    systemPackages = with pkgs; [
       linux-firmware
       intel-media-driver
+       intel-compute-runtime
    ];
  };

--- a/modules/programs/alacritty.nix
+++ b/modules/programs/alacritty.nix
@@ -13,17 +13,16 @@
  programs = {
    alacritty = {
      enable = true;
-      package = pkgs.alacritty;
-      settings = {
-        env.term = "screen-256color";
-        font = rec {                          # Font - Laptop has size manually changed at home.nix
-          #normal.family = "FiraCode Nerd Font";
-          normal.family = "Cascadia Code";
-          #normal.family = "Intel One Mono";
-          #bold = { style = "Bold"; };
-#         size = 8;
-        };
-      };
+      #settings = {
+      #  env.term = "screen-256color";
+      #  font = rec {                          # Font - Laptop has size manually changed at home.nix
+      #    #normal.family = "FiraCode Nerd Font";
+      #    normal.family = "Cascadia Code";
+      #    #normal.family = "Intel One Mono";
+      #    #bold = { style = "Bold"; };
+#     #    size = 8;
+      #  };
+      #};
    };
  };
 }
--- a/modules/programs/default.nix
+++ b/modules/programs/default.nix
@@ -11,7 +11,7 @@
 #

 [
-   ./alacritty.nix
+#   ./alacritty.nix
 #   ./rofi.nix
   ./firefox.nix
   #./waybar.nix
--- a/modules/services/default.nix
+++ b/modules/services/default.nix
@@ -11,14 +11,14 @@
 #

 [
-  ./dunst.nix
-  ./flameshot.nix
+  #./dunst.nix
+  #./flameshot.nix
  #./picom.nix
  #./polybar.nix
  #./sxhkd.nix
  #./udiskie.nix
  #./redshift.nix
-  ./kanshi.nix
+  #./kanshi.nix
  ./keyring.nix
 ]

--- a/modules/shell/themes/wall.jpg
+++ b/modules/shell/themes/wall.jpg
--- a/modules/shell/zsh.nix
+++ b/modules/shell/zsh.nix
@@ -15,11 +15,11 @@
      oh-my-zsh = {                             # Extra plugins for zsh
        enable = true;
        plugins = [ "git" ];
-        custom = "$HOME/.config/zsh_nix/custom";
+        #custom = "$HOME/.config/zsh_nix/custom";
      };

      initContent = ''
-        if [[ $DISPLAY ]]; then
+        if [[ $WAYLAND_DISPLAY ]]; then
            [[ $- != *i* ]] && return
            [[ -z "$TMUX" ]] && (tmux attach || tmux new-session)
        fi
--- a/modules/themes/nixos-wallpaper-catppuccin-mocha.jpg
+++ b/modules/themes/nixos-wallpaper-catppuccin-mocha.jpg
--- a/modules/themes/wall.jpg
+++ b/modules/themes/wall.jpg
@@ -1 +1 @@
-nixos-wallpaper-catppuccin-mocha.svg
+nixos-wallpaper-catppuccin-mocha.jpg
--- a/modules/wm/niri/config.kdl
+++ b/modules/wm/niri/config.kdl
@@ -0,0 +1,693 @@
+// This config is in the KDL format: https://kdl.dev
+// "/-" comments out the following node.
+// Check the wiki for a full description of the configuration:
+// https://yalter.github.io/niri/Configuration:-Introduction
+
+// Input device configuration.
+// Find the full list of options on the wiki:
+// https://yalter.github.io/niri/Configuration:-Input
+input {
+    keyboard {
+        xkb {
+            // You can set rules, model, layout, variant and options.
+            // For more information, see xkeyboard-config(7).
+
+            // For example:
+            layout "us,de"
+            options "grp:win_space_toggle"
+
+            // If this section is empty, niri will fetch xkb settings
+            // from org.freedesktop.locale1. You can control these using
+            // localectl set-x11-keymap.
+        }
+
+        // Enable numlock on startup, omitting this setting disables it.
+        //numlock
+    }
+
+    // Next sections include libinput settings.
+    // Omitting settings disables them, or leaves them at their default values.
+    // All commented-out settings here are examples, not defaults.
+    touchpad {
+        // off
+        tap
+        // dwt
+        // dwtp
+        // drag false
+        // drag-lock
+        // natural-scroll
+        // accel-speed 0.2
+        // accel-profile "flat"
+        scroll-method "two-finger"
+        // disabled-on-external-mouse
+    }
+
+    mouse {
+        // off
+        // natural-scroll
+        // accel-speed 0.2
+        // accel-profile "flat"
+        // scroll-method "no-scroll"
+    }
+
+    trackpoint {
+        // off
+        // natural-scroll
+        // accel-speed 0.2
+        // accel-profile "flat"
+        // scroll-method "on-button-down"
+        // scroll-button 273
+        // scroll-button-lock
+        // middle-emulation
+    }
+
+    touch {
+	map-to-output "eDP-1"
+    }
+
+    // Uncomment this to make the mouse warp to the center of newly focused windows.
+    // warp-mouse-to-focus
+
+    // Focus windows and outputs automatically when moving the mouse into them.
+    // Setting max-scroll-amount="0%" makes it work only on windows already fully on screen.
+    focus-follows-mouse max-scroll-amount="0%"
+    workspace-auto-back-and-forth
+}
+
+// You can configure outputs by their name, which you can find
+// by running `niri msg outputs` while inside a niri instance.
+// The built-in laptop monitor is usually called "eDP-1".
+// Find more information on the wiki:
+// https://yalter.github.io/niri/Configuration:-Outputs
+// Remember to uncomment the node by removing "/-"!
+// Lenovo main
+output "DP-2" {
+    mode "2560x1440"
+    scale 1.0
+    transform "normal"
+    position x=0 y=250
+    variable-refresh-rate
+};
+// Eizo right
+output "DP-3" {
+    mode "1920x1200"
+    scale 1.0
+    transform "270"
+    position x=2560 y=0
+};
+output "eDP-1" {
+    // Uncomment this line to disable this output.
+    // off
+
+    // Resolution and, optionally, refresh rate of the output.
+    // The format is "<width>x<height>" or "<width>x<height>@<refresh rate>".
+    // If the refresh rate is omitted, niri will pick the highest refresh rate
+    // for the resolution.
+    // If the mode is omitted altogether or is invalid, niri will pick one automatically.
+    // Run `niri msg outputs` while inside a niri instance to list all outputs and their modes.
+    mode "1920x1080"
+
+    // You can use integer or fractional scale, for example use 1.5 for 150% scale.
+    scale 1.2
+
+    // Transform allows to rotate the output counter-clockwise, valid values are:
+    // normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270.
+    transform "normal"
+
+    // Position of the output in the global coordinate space.
+    // This affects directional monitor actions like "focus-monitor-left", and cursor movement.
+    // The cursor can only move between directly adjacent outputs.
+    // Output scale and rotation has to be taken into account for positioning:
+    // outputs are sized in logical, or scaled, pixels.
+    // For example, a 3840×2160 output with scale 2.0 will have a logical size of 1920×1080,
+    // so to put another output directly adjacent to it on the right, set its x to 1920.
+    // If the position is unset or results in an overlap, the output is instead placed
+    // automatically.
+    position x=0 y=0
+}
+
+cursor {
+    xcursor-theme "Breeze_Hacked"
+    xcursor-size 24
+
+    hide-when-typing
+    hide-after-inactive-ms 1000
+}
+
+// Settings that influence how windows are positioned and sized.
+// Find more information on the wiki:
+// https://yalter.github.io/niri/Configuration:-Layout
+layout {
+    // Set gaps around windows in logical pixels.
+    gaps 8
+
+    // When to center a column when changing focus, options are:
+    // - "never", default behavior, focusing an off-screen column will keep at the left
+    //   or right edge of the screen.
+    // - "always", the focused column will always be centered.
+    // - "on-overflow", focusing a column will center it if it doesn't fit
+    //   together with the previously focused column.
+    center-focused-column "never"
+
+    // You can customize the widths that "switch-preset-column-width" (Mod+R) toggles between.
+    preset-column-widths {
+        // Proportion sets the width as a fraction of the output width, taking gaps into account.
+        // For example, you can perfectly fit four windows sized "proportion 0.25" on an output.
+        // The default preset widths are 1/3, 1/2 and 2/3 of the output.
+        proportion 0.33333
+        proportion 0.5
+        proportion 0.66667
+
+        // Fixed sets the width in logical pixels exactly.
+        // fixed 1920
+    }
+
+    // You can also customize the heights that "switch-preset-window-height" (Mod+Shift+R) toggles between.
+    preset-window-heights {
+      proportion 0.5
+      proportion 1.0
+    }
+
+    // You can change the default width of the new windows.
+    //default-column-width { proportion 1.0; }
+    // If you leave the brackets empty, the windows themselves will decide their initial width.
+    default-column-width {}
+
+    // By default focus ring and border are rendered as a solid background rectangle
+    // behind windows. That is, they will show up through semitransparent windows.
+    // This is because windows using client-side decorations can have an arbitrary shape.
+    //
+    // If you don't like that, you should uncomment `prefer-no-csd` below.
+    // Niri will draw focus ring and border *around* windows that agree to omit their
+    // client-side decorations.
+    //
+    // Alternatively, you can override it with a window rule called
+    // `draw-border-with-background`.
+
+    // You can change how the focus ring looks.
+    focus-ring {
+        // Uncomment this line to disable the focus ring.
+        // off
+
+        // How many logical pixels the ring extends out from the windows.
+        width 2
+
+        // Colors can be set in a variety of ways:
+        // - CSS named colors: "red"
+        // - RGB hex: "#rgb", "#rgba", "#rrggbb", "#rrggbbaa"
+        // - CSS-like notation: "rgb(255, 127, 0)", rgba(), hsl() and a few others.
+
+        // Color of the ring on the active monitor.
+        active-color "#7fc8ff"
+
+        // Color of the ring on inactive monitors.
+        //
+        // The focus ring only draws around the active window, so the only place
+        // where you can see its inactive-color is on other monitors.
+        inactive-color "#505050"
+
+        // You can also use gradients. They take precedence over solid colors.
+        // Gradients are rendered the same as CSS linear-gradient(angle, from, to).
+        // The angle is the same as in linear-gradient, and is optional,
+        // defaulting to 180 (top-to-bottom gradient).
+        // You can use any CSS linear-gradient tool on the web to set these up.
+        // Changing the color space is also supported, check the wiki for more info.
+        //
+        // active-gradient from="#80c8ff" to="#c7ff7f" angle=45
+
+        // You can also color the gradient relative to the entire view
+        // of the workspace, rather than relative to just the window itself.
+        // To do that, set relative-to="workspace-view".
+        //
+        // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view"
+    }
+
+    // You can also add a border. It's similar to the focus ring, but always visible.
+    border {
+        // The settings are the same as for the focus ring.
+        // If you enable the border, you probably want to disable the focus ring.
+        off
+
+        width 2
+        active-color "#ffc87f"
+        inactive-color "#505050"
+
+        // Color of the border around windows that request your attention.
+        urgent-color "#9b0000"
+
+        // Gradients can use a few different interpolation color spaces.
+        // For example, this is a pastel rainbow gradient via in="oklch longer hue".
+        //
+        // active-gradient from="#e5989b" to="#ffb4a2" angle=45 relative-to="workspace-view" in="oklch longer hue"
+
+        // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view"
+    }
+
+    // You can enable drop shadows for windows.
+    shadow {
+        // Uncomment the next line to enable shadows.
+        // on
+
+        // By default, the shadow draws only around its window, and not behind it.
+        // Uncomment this setting to make the shadow draw behind its window.
+        //
+        // Note that niri has no way of knowing about the CSD window corner
+        // radius. It has to assume that windows have square corners, leading to
+        // shadow artifacts inside the CSD rounded corners. This setting fixes
+        // those artifacts.
+        //
+        // However, instead you may want to set prefer-no-csd and/or
+        // geometry-corner-radius. Then, niri will know the corner radius and
+        // draw the shadow correctly, without having to draw it behind the
+        // window. These will also remove client-side shadows if the window
+        // draws any.
+        //
+        // draw-behind-window true
+
+        // You can change how shadows look. The values below are in logical
+        // pixels and match the CSS box-shadow properties.
+
+        // Softness controls the shadow blur radius.
+        softness 30
+
+        // Spread expands the shadow.
+        spread 5
+
+        // Offset moves the shadow relative to the window.
+        offset x=0 y=5
+
+        // You can also change the shadow color and opacity.
+        color "#0007"
+    }
+
+    // Struts shrink the area occupied by windows, similarly to layer-shell panels.
+    // You can think of them as a kind of outer gaps. They are set in logical pixels.
+    // Left and right struts will cause the next window to the side to always be visible.
+    // Top and bottom struts will simply add outer gaps in addition to the area occupied by
+    // layer-shell panels and regular gaps.
+    struts {
+        // left 64
+        // right 64
+        // top 6
+        // bottom 64
+    }
+}
+
+// Add lines like this to spawn processes at startup.
+// Note that running niri as a session supports xdg-desktop-autostart,
+// which may be more convenient to use.
+// See the binds section below for more spawn examples.
+
+// This line starts waybar, a commonly used bar for Wayland compositors.
+spawn-at-startup "noctalia-shell"
+spawn-at-startup "firefox"
+spawn-at-startup "element-desktop"
+spawn-at-startup "thunderbird"
+
+// To run a shell command (with variables, pipes, etc.), use spawn-sh-at-startup:
+// spawn-sh-at-startup "qs -c ~/source/qs/MyAwesomeShell"
+
+hotkey-overlay {
+    // Uncomment this line to disable the "Important Hotkeys" pop-up at startup.
+    skip-at-startup
+}
+
+// Uncomment this line to ask the clients to omit their client-side decorations if possible.
+// If the client will specifically ask for CSD, the request will be honored.
+// Additionally, clients will be informed that they are tiled, removing some client-side rounded corners.
+// This option will also fix border/focus ring drawing behind some semitransparent windows.
+// After enabling or disabling this, you need to restart the apps for this to take effect.
+prefer-no-csd
+
+// You can change the path where screenshots are saved.
+// A ~ at the front will be expanded to the home directory.
+// The path is formatted with strftime(3) to give you the screenshot date and time.
+screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
+
+// You can also set this to null to disable saving screenshots to disk.
+// screenshot-path null
+
+// Animation settings.
+// The wiki explains how to configure individual animations:
+// https://yalter.github.io/niri/Configuration:-Animations
+animations {
+    // Uncomment to turn off all animations.
+    // off
+
+    // Slow down all animations by this factor. Values below 1 speed them up instead.
+    // slowdown 3.0
+}
+
+// Window rules let you adjust behavior for individual windows.
+// Find more information on the wiki:
+// https://yalter.github.io/niri/Configuration:-Window-Rules
+
+// Work around WezTerm's initial configure bug
+// by setting an empty default-column-width.
+workspace "browser" {
+	open-on-output "DP-2"
+}
+workspace "chat" {
+	open-on-output "DP-3"
+}
+workspace "terminal" {
+}
+
+
+window-rule {
+    // This regular expression is intentionally made as specific as possible,
+    // since this is the default config, and we want no false positives.
+    // You can get away with just app-id="wezterm" if you want.
+    //match app-id=r#"^org\.wezfurlong\.wezterm$"#
+    match app-id="Alacritty"
+    match title="Firefox"
+    default-column-width { proportion 1.0; }
+}
+
+window-rule {
+    match title="Firefox"
+    default-column-width { proportion 1.0; }
+    open-on-workspace "browser"
+}
+window-rule {
+    match app-id="Element"
+    match app-id="thunderbird"
+    default-column-width { proportion 1.0; }
+    open-on-workspace "chat"
+}
+
+
+// Open the Firefox picture-in-picture player as floating by default.
+window-rule {
+    // This app-id regular expression will work for both:
+    // - host Firefox (app-id is "firefox")
+    // - Flatpak Firefox (app-id is "org.mozilla.firefox")
+    match app-id=r#"firefox$"# title="^Picture-in-Picture$"
+    match title="galculator"
+    match title="OpenSSH Askpass"
+    open-floating true
+}
+
+// Example: block out two password managers from screen capture.
+// (This example rule is commented out with a "/-" in front.)
+/-window-rule {
+    match app-id=r#"^org\.keepassxc\.KeePassXC$"#
+    match app-id=r#"^org\.gnome\.World\.Secrets$"#
+
+    block-out-from "screen-capture"
+
+    // Use this instead if you want them visible on third-party screenshot tools.
+    // block-out-from "screencast"
+}
+
+// Example: enable rounded corners for all windows.
+// (This example rule is commented out with a "/-" in front.)
+/-window-rule {
+    geometry-corner-radius 12
+    clip-to-geometry true
+}
+
+binds {
+    // Keys consist of modifiers separated by + signs, followed by an XKB key name
+    // in the end. To find an XKB name for a particular key, you may use a program
+    // like wev.
+    //
+    // "Mod" is a special modifier equal to Super when running on a TTY, and to Alt
+    // when running as a winit window.
+    //
+    // Most actions that you can bind here can also be invoked programmatically with
+    // `niri msg action do-something`.
+
+    // Mod-Shift-/, which is usually the same as Mod-?,
+    // shows a list of important hotkeys.
+    Mod+Shift+Slash { show-hotkey-overlay; }
+
+    // Suggested binds for running programs: terminal, app launcher, screen locker.
+    Mod+Return hotkey-overlay-title="Open a Terminal: alacritty" { spawn "alacritty"; }
+    Mod+D hotkey-overlay-title="Run an Application: fuzzel" { spawn "fuzzel"; }
+
+    XF86AudioPlay        allow-when-locked=true { spawn-sh "playerctl play-pause"; }
+    XF86AudioStop        allow-when-locked=true { spawn-sh "playerctl stop"; }
+    XF86AudioPrev        allow-when-locked=true { spawn-sh "playerctl previous"; }
+    XF86AudioNext        allow-when-locked=true { spawn-sh "playerctl next"; }
+
+    Mod+Alt+L { spawn-sh  "noctalia-shell ipc call lockScreen lock"; }
+    XF86AudioLowerVolume allow-when-locked=true { spawn-sh "noctalia-shell ipc call volume decrease"; }
+    XF86AudioRaiseVolume allow-when-locked=true { spawn-sh "noctalia-shell ipc call volume increase"; }
+    XF86MonBrightnessUp allow-when-locked=true { spawn-sh "noctalia-shell ipc call brightness increase"; }
+    XF86MonBrightnessDown allow-when-locked=true { spawn-sh "noctalia-shell ipc call brightness decrease"; }
+    XF86AudioMute allow-when-locked=true { spawn-sh "noctalia-shell ipc call volume muteOutput"; }
+    XF86AudioMicMute allow-when-locked=true { spawn-sh "noctalia-shell ipc call volume muteInput"; }
+    // Open/close the Overview: a zoomed-out view of workspaces and windows.
+    // You can also move the mouse into the top-left hot corner,
+    // or do a four-finger swipe up on a touchpad.
+    Mod+O repeat=false { toggle-overview; }
+
+    Mod+Q repeat=false { close-window; }
+
+    Mod+Left  { focus-column-left; }
+    Mod+Down  { focus-window-down; }
+    Mod+Up    { focus-window-up; }
+    Mod+Right { focus-column-right; }
+    Mod+H     { focus-column-left; }
+    Mod+J     { focus-window-down; }
+    Mod+K     { focus-window-up; }
+    Mod+L     { focus-column-right; }
+
+    // colemak-dh
+    Mod+M     { focus-column-left; }
+    Mod+N     { focus-window-down; }
+    Mod+E     { focus-window-up; }
+    Mod+I     { focus-column-right; }
+
+    Mod+Ctrl+Left  { move-column-left; }
+    Mod+Ctrl+Down  { move-window-down; }
+    Mod+Ctrl+Up    { move-window-up; }
+    Mod+Ctrl+Right { move-column-right; }
+    Mod+Ctrl+H     { move-column-left; }
+    Mod+Ctrl+J     { move-window-down; }
+    Mod+Ctrl+K     { move-window-up; }
+    Mod+Ctrl+L     { move-column-right; }
+
+    // colemak-dh
+    Mod+Ctrl+M     { move-column-left; }
+    Mod+Ctrl+N     { move-window-down; }
+    Mod+Ctrl+E     { move-window-up; }
+    Mod+Ctrl+I     { move-column-right; }
+
+    // Alternative commands that move across workspaces when reaching
+    // the first or last window in a column.
+    // Mod+J     { focus-window-or-workspace-down; }
+    // Mod+K     { focus-window-or-workspace-up; }
+    // Mod+Ctrl+J     { move-window-down-or-to-workspace-down; }
+    // Mod+Ctrl+K     { move-window-up-or-to-workspace-up; }
+
+    Mod+Home { focus-column-first; }
+    Mod+End  { focus-column-last; }
+    Mod+Ctrl+Home { move-column-to-first; }
+    Mod+Ctrl+End  { move-column-to-last; }
+
+    Mod+Shift+Left  { focus-monitor-left; }
+    Mod+Shift+Down  { focus-monitor-down; }
+    Mod+Shift+Up    { focus-monitor-up; }
+    Mod+Shift+Right { focus-monitor-right; }
+    Mod+Shift+H     { focus-monitor-left; }
+    Mod+Shift+J     { focus-monitor-down; }
+    Mod+Shift+K     { focus-monitor-up; }
+    Mod+Shift+L     { focus-monitor-right; }
+
+    //colemak-dh
+    Mod+Shift+M     { focus-monitor-left; }
+    Mod+Shift+N     { focus-monitor-down; }
+    Mod+Shift+I     { focus-monitor-up; }
+    Mod+Shift+O     { focus-monitor-right; }
+
+    Mod+Shift+Ctrl+Left  { move-column-to-monitor-left; }
+    Mod+Shift+Ctrl+Down  { move-column-to-monitor-down; }
+    Mod+Shift+Ctrl+Up    { move-column-to-monitor-up; }
+    Mod+Shift+Ctrl+Right { move-column-to-monitor-right; }
+    Mod+Shift+Ctrl+H     { move-column-to-monitor-left; }
+    Mod+Shift+Ctrl+J     { move-column-to-monitor-down; }
+    Mod+Shift+Ctrl+K     { move-column-to-monitor-up; }
+    Mod+Shift+Ctrl+L     { move-column-to-monitor-right; }
+
+    // colemak-dh
+    Mod+Shift+Ctrl+M     { move-column-to-monitor-left; }
+    Mod+Shift+Ctrl+N     { move-column-to-monitor-down; }
+    Mod+Shift+Ctrl+E     { move-column-to-monitor-up; }
+    Mod+Shift+Ctrl+I     { move-column-to-monitor-right; }
+
+    // Alternatively, there are commands to move just a single window:
+    // Mod+Shift+Ctrl+Left  { move-window-to-monitor-left; }
+    // ...
+
+    // And you can also move a whole workspace to another monitor:
+    // Mod+Shift+Ctrl+Left  { move-workspace-to-monitor-left; }
+    // ...
+
+    Mod+Page_Down      { focus-workspace-down; }
+    Mod+Page_Up        { focus-workspace-up; }
+    Mod+U              { focus-workspace-down; }
+    //Mod+I              { focus-workspace-up; }
+    Mod+Ctrl+Page_Down { move-column-to-workspace-down; }
+    Mod+Ctrl+Page_Up   { move-column-to-workspace-up; }
+    Mod+Ctrl+U         { move-column-to-workspace-down; }
+    //Mod+Ctrl+I         { move-column-to-workspace-up; }
+
+    // Alternatively, there are commands to move just a single window:
+    // Mod+Ctrl+Page_Down { move-window-to-workspace-down; }
+    // ...
+
+    Mod+Shift+Page_Down { move-workspace-down; }
+    Mod+Shift+Page_Up   { move-workspace-up; }
+    Mod+Shift+U         { move-workspace-down; }
+    //Mod+Shift+I         { move-workspace-up; }
+
+    // You can bind mouse wheel scroll ticks using the following syntax.
+    // These binds will change direction based on the natural-scroll setting.
+    //
+    // To avoid scrolling through workspaces really fast, you can use
+    // the cooldown-ms property. The bind will be rate-limited to this value.
+    // You can set a cooldown on any bind, but it's most useful for the wheel.
+    Mod+WheelScrollDown      cooldown-ms=150 { focus-workspace-down; }
+    Mod+WheelScrollUp        cooldown-ms=150 { focus-workspace-up; }
+    Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; }
+    Mod+Ctrl+WheelScrollUp   cooldown-ms=150 { move-column-to-workspace-up; }
+
+    Mod+WheelScrollRight      { focus-column-right; }
+    Mod+WheelScrollLeft       { focus-column-left; }
+    Mod+Ctrl+WheelScrollRight { move-column-right; }
+    Mod+Ctrl+WheelScrollLeft  { move-column-left; }
+
+    // Usually scrolling up and down with Shift in applications results in
+    // horizontal scrolling; these binds replicate that.
+    Mod+Shift+WheelScrollDown      { focus-column-right; }
+    Mod+Shift+WheelScrollUp        { focus-column-left; }
+    Mod+Ctrl+Shift+WheelScrollDown { move-column-right; }
+    Mod+Ctrl+Shift+WheelScrollUp   { move-column-left; }
+
+    // Similarly, you can bind touchpad scroll "ticks".
+    // Touchpad scrolling is continuous, so for these binds it is split into
+    // discrete intervals.
+    // These binds are also affected by touchpad's natural-scroll, so these
+    // example binds are "inverted", since we have natural-scroll enabled for
+    // touchpads by default.
+    // Mod+TouchpadScrollDown { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.02+"; }
+    // Mod+TouchpadScrollUp   { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.02-"; }
+
+    // You can refer to workspaces by index. However, keep in mind that
+    // niri is a dynamic workspace system, so these commands are kind of
+    // "best effort". Trying to refer to a workspace index bigger than
+    // the current workspace count will instead refer to the bottommost
+    // (empty) workspace.
+    //
+    // For example, with 2 workspaces + 1 empty, indices 3, 4, 5 and so on
+    // will all refer to the 3rd workspace.
+    Mod+1 { focus-workspace "browser"; }
+    Mod+2 { focus-workspace "chat"; }
+    Mod+3 { focus-workspace "terminal"; }
+    Mod+4 { focus-workspace 4; }
+    Mod+5 { focus-workspace 5; }
+    Mod+6 { focus-workspace 6; }
+    Mod+7 { focus-workspace 7; }
+    Mod+8 { focus-workspace 8; }
+    Mod+9 { focus-workspace 9; }
+    Mod+Ctrl+1 { move-column-to-workspace "browser"; }
+    Mod+Ctrl+2 { move-column-to-workspace "chat"; }
+    Mod+Ctrl+3 { move-column-to-workspace "terminal"; }
+    Mod+Ctrl+4 { move-column-to-workspace 4; }
+    Mod+Ctrl+5 { move-column-to-workspace 5; }
+    Mod+Ctrl+6 { move-column-to-workspace 6; }
+    Mod+Ctrl+7 { move-column-to-workspace 7; }
+    Mod+Ctrl+8 { move-column-to-workspace 8; }
+    Mod+Ctrl+9 { move-column-to-workspace 9; }
+
+    // Alternatively, there are commands to move just a single window:
+    // Mod+Ctrl+1 { move-window-to-workspace 1; }
+
+    // Switches focus between the current and the previous workspace.
+    // Mod+Tab { focus-workspace-previous; }
+
+    // The following binds move the focused window in and out of a column.
+    // If the window is alone, they will consume it into the nearby column to the side.
+    // If the window is already in a column, they will expel it out.
+    Mod+BracketLeft  { consume-or-expel-window-left; }
+    Mod+BracketRight { consume-or-expel-window-right; }
+
+    // Consume one window from the right to the bottom of the focused column.
+    Mod+Comma  { consume-window-into-column; }
+    // Expel the bottom window from the focused column to the right.
+    Mod+Period { expel-window-from-column; }
+
+    Mod+R { switch-preset-column-width; }
+    // Cycling through the presets in reverse order is also possible.
+    // Mod+R { switch-preset-column-width-back; }
+    Mod+Shift+R { switch-preset-window-height; }
+    Mod+Ctrl+R { reset-window-height; }
+    Mod+F { maximize-column; }
+    Mod+Shift+F { fullscreen-window; }
+
+    // Expand the focused column to space not taken up by other fully visible columns.
+    // Makes the column "fill the rest of the space".
+    Mod+Ctrl+F { expand-column-to-available-width; }
+
+    Mod+C { center-column; }
+
+    // Center all fully visible columns on screen.
+    Mod+Ctrl+C { center-visible-columns; }
+
+    // Finer width adjustments.
+    // This command can also:
+    // * set width in pixels: "1000"
+    // * adjust width in pixels: "-5" or "+5"
+    // * set width as a percentage of screen width: "25%"
+    // * adjust width as a percentage of screen width: "-10%" or "+10%"
+    // Pixel sizes use logical, or scaled, pixels. I.e. on an output with scale 2.0,
+    // set-column-width "100" will make the column occupy 200 physical screen pixels.
+    Mod+Minus { set-column-width "-10%"; }
+    Mod+Equal { set-column-width "+10%"; }
+
+    // Finer height adjustments when in column with other windows.
+    Mod+Shift+Minus { set-window-height "-10%"; }
+    Mod+Shift+Equal { set-window-height "+10%"; }
+
+    // Move the focused window between the floating and the tiling layout.
+    Mod+V       { toggle-window-floating; }
+    Mod+Shift+V { switch-focus-between-floating-and-tiling; }
+
+    // Toggle tabbed column display mode.
+    // Windows in this column will appear as vertical tabs,
+    // rather than stacked on top of each other.
+    Mod+W { toggle-column-tabbed-display; }
+
+    // Actions to switch layouts.
+    // Note: if you uncomment these, make sure you do NOT have
+    // a matching layout switch hotkey configured in xkb options above.
+    // Having both at once on the same hotkey will break the switching,
+    // since it will switch twice upon pressing the hotkey (once by xkb, once by niri).
+    // Mod+Space       { switch-layout "next"; }
+    // Mod+Shift+Space { switch-layout "prev"; }
+
+    Print { screenshot; }
+    Ctrl+Print { screenshot-screen; }
+    Alt+Print { screenshot-window; }
+
+    // Applications such as remote-desktop clients and software KVM switches may
+    // request that niri stops processing the keyboard shortcuts defined here
+    // so they may, for example, forward the key presses as-is to a remote machine.
+    // It's a good idea to bind an escape hatch to toggle the inhibitor,
+    // so a buggy application can't hold your session hostage.
+    //
+    // The allow-inhibiting=false property can be applied to other binds as well,
+    // which ensures niri always processes them, even when an inhibitor is active.
+    Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; }
+
+    // The quit action will show a confirmation dialog to avoid accidental exits.
+    Mod+Shift+E { quit; }
+    Ctrl+Alt+Delete { quit; }
+
+    // Powers off the monitors. To turn them back on, do any input like
+    // moving the mouse or pressing any other key.
+    Mod+Shift+P { power-off-monitors; }
+}
+include "./noctalia.kdl"
--- a/modules/wm/niri/default.nix
+++ b/modules/wm/niri/default.nix
@@ -11,15 +11,16 @@
 #               └─ hyprland.nix *
 #

-{ config, lib, user, pkgs, desktop, ... }:
+{ config, inputs, lib, user, pkgs, ... }:

 {
-  imports = [ ../waybar.nix ];
+  imports = [ ../noctalia.nix ];

  environment = {
    systemPackages = with pkgs; [
+      alacritty
      xdg-desktop-portal-gnome
-      dinit
+      xdg-desktop-portal-gtk
      swaylock
      swayidle
      slurp
@@ -29,15 +30,20 @@
      glib
      brightnessctl
      playerctl
+      xwayland-satellite
+      breeze-hacked-cursor-theme
    ];
+    loginShellInit = ''
+      export GTK_IM_MODULE="simple"
+      export ELECTRON_OZONE_PLATFORM_HINT="auto"
+      export NIXOS_OZONE_WL="1"
+      export WLR_RENDERER="vulkan"
+      export _JAVA_AWT_WM_NONREPARENTING="1"
+    '';
  };
  services = {
    iio-niri = {
-        enable = true;
-        extraArgs = [
-          "--monitor"
-          "eDP-1"
-        ];
+        enable = false;
    };
    greetd = {
      enable = true;
@@ -52,23 +58,6 @@

  programs = {
    niri.enable = true;
-#    sway.extraSessionCommands =  ''
-#      export MOZ_ENABLE_WAYLAND="1";
-#      export MOZ_WEBRENDER="1";
-#      export MOZ_USE_XINPUT2="2";
-#      export MOZ_DBUS_REMOTE="1";
-#      export WLR_RENDERER="vulkan";
-#      export LIBVA_DRIVER_NAME="iHD";
-#      export VDPAU_DRIVER="iHD";
-#      export XDG_SESSION_TYPE="wayland";
-#      #export XDG_CURRENT_DESKTOP="Unity";
-#      #export QT_QPA_PLATFORMTHEME="wayland-egl";
-#      export GST_VAAPI_ALL_DRIVERS="1";
-#      export GTK_THEME="Arc";
-#      export _JAVA_AWT_WM_NONREPARENTING="1";
-#      #export LIBCL_ALWAYS_SOFTWARE="1";       # For applications in VM like alacritty to work
-#      #export WLR_NO_HARDWARE_CURSORS="1";     # For cursor in VM
-#    '';
    ssh.enableAskPassword = true;
    ssh.askPassword = "${pkgs.lxqt.lxqt-openssh-askpass}/bin/lxqt-openssh-askpass";
  };
--- a/modules/wm/niri/home.nix
+++ b/modules/wm/niri/home.nix
@@ -14,271 +14,7 @@
 { config, lib, pkgs, ... }:

 {
-#  wayland.windowManager.sway = {
-#     enable = true;
-#     checkConfig = false;
-#     config = rec {
-#        menu = "${pkgs.rofi}/bin/rofi -show combi -show-icons";
-#        left = "m";
-#        down = "n";
-#        up = "e";
-#        right = "i";
-#        modifier = "Mod4";
-#        floating.modifier = "Mod4";
-#        floating.titlebar = true;
-#        
-#        input = {
-#            "type:keyboard" = { 
-#                xkb_layout = "us,de";
-#                xkb_variant = "altgr-intl,";
-#                xkb_options = "grp:win_space_toggle";
-#            };
-#            "type:touchpad" = {
-#                tap = "enabled";
-#                natural_scroll = "disabled";
-#                drag = "enabled";
-#                dwt = "enabled";
-#                middle_emulation = "enabled";
-#                scroll_method = "two_finger";
-#                tap_button_map = "lmr";
-#            };
-#	    "type:touch" = {
-#	        map_to_output = "eDP-1";
-#	    };
-#        };
-#
-#        output = {
-#            "*" = { 
-#                bg = "$HOME/.config/wall fill";
-#            };
-#            #"HDMI-A-1" = {
-#            #    mode = "2560x1440";
-#            #    pos = "0,0";
-#            #    #scale = "1.1";
-#            #};
-#            "eDP-1" = {
-#                mode = "1920x1080";
-#                pos = "2560,0";
-#            };
-#            "DP-5" = {
-#                mode = "2560x1440";
-#                pos = "0,250";
-#            };
-#            "DP-6" = {
-#                mode = "1920x1200";
-#                pos = "2560,0";
-#		transform = "90";
-#            };
-#            #"eDP-1" = { 
-#            #    mode = "1920x1080";
-#            #    #pos = "4480,0";
-#            #    pos = "2560,0";
-#            #    subpixel = "none";
-#            #    scale = "1.3";
-#            #};
-#        };
-#
-#        terminal = "${pkgs.alacritty}/bin/alacritty";
-#    
-#        fonts = {
-#            names = [ "Cascadia Code" ];
-#            size = 10.0;
-#        };
-#        
-#        colors.focused = {
-#            background = "#212121";
-#            border = "#999999";
-#            childBorder = "#999999";
-#            indicator = "#999999";
-#            text = "#FFFFFF";
-#        };
-#
-#        startup = [
-#            #{ command = "exec ${pkgs.rot8}/bin/rot8 -Y -k"; }
-#            { command = "xrdb -load ~/.Xresources"; }
-#         #   { command = "gsettings set org.gnome.desktop.interface gtk-theme Dracula"; }
-#         #   { command = "gsettings set org.gnome.desktop.interface icon-theme Dracula"; }
-#         #   { command = "gsettings set org.gnome.desktop.interface cursor-theme Adwaita"; }
-#            #{ command = "exec ${pkgs.networkmanagerapplet}/bin/nm-applet --indicator"; }
-#            #{ command = "${pkgs.thunderbird}/bin/thunderbird"; }
-#            { command = "${pkgs.firefox}/bin/firefox"; }
-#            #{ command = "${pkgs.element-desktop}/bin/element-desktop"; }
-#        ];
-#    
-#        workspaceAutoBackAndForth = true;
-#    
-#        gaps.inner = 8;
-#        gaps.outer = 4;
-#        gaps.smartGaps = true;
-#        gaps.smartBorders = "on";
-#
-#        assigns = {
-#            "workspace number 1" = [{ app_id = "thunderbird"; }];
-#            "workspace number 2" = [{ app_id = "firefox"; }];
-#            "workspace number 3" = [{ app_id = "Element"; }];
-#        };
-#
-#        window.commands = [
-#            { command = "floating enable"; criteria = { app_id = ".yubioath-flutter-wrapped"; }; }
-#            { command = "floating enable"; criteria = { app_id = "pavucontrol"; }; }
-#            { command = "floating enable"; criteria = { app_id = "galculator"; }; }
-#            { command = "floating enable"; criteria = { app_id = "com.nitrokey."; }; }
-#            { command = "floating enable"; criteria = { app_id = "org.keepassxc.KeePassXC."; }; }
-#            { command = "floating enable"; criteria = { app_id = "virt-manager"; }; }
-#            { command = "floating enable"; criteria = { title = "^OpenSSH Authentication"; }; }
-#            { command = "floating enable"; criteria = { class = "pop-up"; }; }
-#        ];
-#        
-#        bars = [
-#            { command = "${pkgs.waybar}/bin/waybar"; }
-#        ];
-#
-#        defaultWorkspace = "workspace number 2";
-#
-#        keybindings = 
-#          let
-#            mod = config.wayland.windowManager.sway.config.modifier;
-#            alt = "Mod1";
-#            left = config.wayland.windowManager.sway.config.left;
-#            down = config.wayland.windowManager.sway.config.down;
-#            up = config.wayland.windowManager.sway.config.up;
-#            right = config.wayland.windowManager.sway.config.right;
-#          in
-#          {
-#            "${mod}+Escape" = "exec swaymsg exit";     # Exit Sway
-#            "${mod}+Return" = "exec ${terminal}";      # Open terminal
-#            "${mod}+d" = "exec ${menu}";           # Open menu
-#            "${mod}+l" = "exec ${pkgs.swaylock}/bin/swaylock"; # Lock Screen
-#
-#            "${mod}+r" = "reload";                     # Reload environment
-#            "${mod}+q" = "kill";                       # Kill container
-#
-#            "${mod}+Shift+f" = "exec ${pkgs.pcmanfm}/bin/pcmanfm"; # File Manager
-#
-#
-#            "${alt}+${left}" = "workspace prev_on_output";         # Navigate to previous or next workspace on output if it exists
-#            "${alt}+${right}" = "workspace next_on_output";
-#            "${alt}+Shift+${left}" = "move container to workspace prev, workspace prev";    # Move container to next available workspace and focus
-#            "${alt}+Shift+${right}" = "move container to workspace next, workspace next";
-#
-#            "XF86TouchpadToggle" = "input type:touchpad events toggle enabled disabled";
-#            "XF86AudioPlay" = "exec playerctl play-pause";
-#            "XF86AudioNext" = "exec playerctl next";
-#            "XF86AudioPrev" = "exec playerctl previous";
-#            "XF86AudioStop" = "exec playerctl stop";
-#  
-#            # Sink volume raise optionally with --device
-#            "XF86AudioRaiseVolume" = "exec swayosd-client --output-volume raise";
-#            "XF86AudioLowerVolume" = "exec swayosd-client --output-volume lower";
-#            # Sink volume toggle mute
-#            "XF86AudioMute" = "exec swayosd-client --output-volume mute-toggle";
-#            # Source volume toggle mute
-#            "XF86AudioMicMute" = "exec swayosd-client --input-volume mute-toggle";
-#            
-#            # Capslock (If you don't want to use the backend)
-#            #bindsym --release Caps_Lock exec swayosd-client --caps-lock;
-#            
-#            # Brightness raise
-#            "XF86MonBrightnessUp" = "exec swayosd-client --brightness raise";
-#            # Brightness lower
-#            "XF86MonBrightnessDown" = "exec swayosd-client --brightness lower";
-#
-#
-#            "${mod}+${left}" = "focus left";
-#            "${mod}+${down}" = "focus down";
-#            "${mod}+${up}" = "focus up";
-#            "${mod}+${right}" = "focus right";
-#  
-#            "${mod}+Shift+${left}" = "move left";
-#            "${mod}+Shift+${down}" = "move down";
-#            "${mod}+Shift+${up}" = "move up";
-#            "${mod}+Shift+${right}" = "move right";
-#  
-#            "${mod}+${alt}+${left}" = "resize grow width 10px";
-#            "${mod}+${alt}+${down}" = "resize shrink height 10px";
-#            "${mod}+${alt}+${up}" = "resize grow height 10px";
-#            "${mod}+${alt}+${right}" = "resize shrink width 10px";
-#  
-#            "${mod}+1" = "workspace number 1";
-#            "${mod}+2" = "workspace number 2";
-#            "${mod}+3" = "workspace number 3";
-#            "${mod}+4" = "workspace number 4";
-#            "${mod}+5" = "workspace number 5";
-#            "${mod}+6" = "workspace number 6";
-#            "${mod}+7" = "workspace number 7";
-#            "${mod}+8" = "workspace number 8";
-#            "${mod}+9" = "workspace number 9";
-#            "${mod}+0" = "workspace number 10";
-#  
-#            "${mod}+Shift+1" = "move container to workspace number 1";
-#            "${mod}+Shift+2" = "move container to workspace number 2";
-#            "${mod}+Shift+3" = "move container to workspace number 3";
-#            "${mod}+Shift+4" = "move container to workspace number 4";
-#            "${mod}+Shift+5" = "move container to workspace number 5";
-#            "${mod}+Shift+6" = "move container to workspace number 6";
-#            "${mod}+Shift+7" = "move container to workspace number 7";
-#            "${mod}+Shift+8" = "move container to workspace number 8";
-#            "${mod}+Shift+9" = "move container to workspace number 9";
-#            "${mod}+Shift+0" = "move container to workspace number 10";
-#  
-#            "${mod}+Tab" = "workspace next";
-#            "${mod}+Alt+Tab" = "workspace prev";
-#
-#            "${mod}+k" = "splith";
-#            "${mod}+v" = "splitv";
-#  
-#            "${mod}+b" = "layout stacking";
-#            "${mod}+w" = "layout tabbed";
-#            "${mod}+p" = "layout toggle split";
-#  
-#            "${mod}+f" = "fullscreen";
-#            "${mod}+Shift+space" = "floating toggle";
-#            "${mod}+h" = "focus mode_toggle";
-#            "${mod}+a" = "focus parent";
-#  
-#            "${mod}+Shift+minus" = "move scratchpad";
-#            "${mod}+minus" = "scratchpad show";
-#        };
-#     };
-#    systemd.enable = true;
-#    wrapperFeatures.gtk = true;
-#    extraSessionCommands = ''
-#      export MOZ_ENABLE_WAYLAND="1";
-#      export MOZ_WEBRENDER="1";
-#      export MOZ_USE_XINPUT2="2";
-#      export MOZ_DBUS_REMOTE="1";
-#      export WLR_RENDERER="vulkan";
-#      export LIBVA_DRIVER_NAME="iHD";
-#      export VDPAU_DRIVER="iHD";
-#      export XDG_SESSION_TYPE="wayland";
-#      export ANV_DEBUG=video-decode,video-encode
-#      export XDG_CURRENT_DESKTOP="sway";
-#      #export QT_QPA_PLATFORMTHEME="wayland-egl";
-#      export QT_QPA_PLATFORMTHEME="qt6ct";
-#      export GST_VAAPI_ALL_DRIVERS="1";
-#      export GTK_THEME="Arc";
-#      export _JAVA_AWT_WM_NONREPARENTING="1";
-#      #export LIBCL_ALWAYS_SOFTWARE="1";       # For applications in VM like alacritty to work
-#      #export WLR_NO_HARDWARE_CURSORS="1";     # For cursor in VM
-#    '';
-#
-#    extraConfig = ''
-#        set $output-primary DP-5
-#        #set $output-secondary eDP-1
-#        set $output-secondary DP-6
-#
-#        workspace 1 output $output-secondary
-#        workspace 2 output $output-primary
-#        workspace 3 output $output-secondary
-#    '';
-#  };
-
  programs = {
-    niriswitcher = {
-    	enable = true;
-#	settings = ''
-#	'';
-    };
    swaylock = {
      enable = true;
      settings = {
@@ -288,23 +24,6 @@
          show-keyboard-layout = true;
      };
    };
-#    rofi = {
-#        enable = true;
-#        extraConfig = {
-#            modi = "window,drun,ssh";
-#            kb-primary-paste = "Control+V,Shift+Insert";
-#            kb-secondary-paste = "Control+v,Insert";
-#        };
-#        font = "Cascadia Code";
-#        location = "top-left";
-#        plugins = [
-#          pkgs.rofi-calc
-#          pkgs.rofi-bluetooth
-#          pkgs.pinentry-rofi
-#        ];
-#        terminal = "${pkgs.alacritty}/bin/alacritty";
-#        theme = "arthur";
-#    };
  };

  services = {
@@ -313,32 +32,16 @@
      events = [
        { event = "before-sleep"; command = "${pkgs.swaylock}/bin/swaylock"; }
        { event = "lock"; command = "${pkgs.swaylock}/bin/swaylock -fF"; }
-#        { event = "after-resume"; command = "${pkgs.sway}/bin/swaymsg 'output * dpms on'"; }
-#        { event = "unlock"; command = "${pkgs.sway}/bin/swaymsg 'output * dpms on'"; }
      ];
      timeouts = [
        { timeout = 300; command = "${pkgs.swaylock}/bin/swaylock -fF"; }
-#        { timeout = 600; command = "${pkgs.sway}/bin/swaymsg 'output * dpms off'"; resumeCommand = "${pkgs.sway}/bin/swaymsg 'output * dpms on'"; }
+        { timeout = 600; command = "${pkgs.niri}/bin/niri msg action power-off-monitors"; }
      ];
    };
-    swayosd.enable = true;
  };
-#  qt = {
-#    enable = true;
-#    style.package = [
-#      	pkgs.dracula-theme
-#      	pkgs.dracula-icon-theme
-#	pkgs.catppuccin-kvantum
-#	pkgs.catppuccin-kde
-#	pkgs.catppuccin-gtk
-#	pkgs.qt6Packages.qtstyleplugin-kvantum
-#    ];
-#    style.name = "kvantum";
-#    platformTheme.name = "qtct";
-#  };
-#  xdg.configFile = {
-#    "Kvantum/Catppuccin".source = "${pkgs.catppuccin-kvantum}/share/Kvantum/Catppuccin-Frappe-Blue";
-#    "Kvantum/kvantum.kvconfig".text = "[General]\ntheme=Catppuccin-Frappe-Blue";
-#  };
+
+  xdg.configFile = {
+    "niri/config.kdl".source = ./config.kdl;
+  };

 }
--- a/modules/wm/noctalia.nix
+++ b/modules/wm/noctalia.nix
@@ -0,0 +1,188 @@
+#
+# Bar
+#
+
+{ config, pkgs, inputs, user, ...}:
+
+{
+
+  # install package
+  environment.systemPackages = with pkgs; [
+    pwvucontrol
+    # ... maybe other stuff
+  ];
+
+  services = {
+    tuned.enable = true;
+    upower.enable = true;
+  };
+
+  home-manager.users.${user} = {                           # Home-manager waybar config
+    # import the home manager module
+    imports = [
+      inputs.noctalia.homeModules.default
+    ];
+
+    services = {
+      mako.enable = true; # notification daemon
+      polkit-gnome.enable = true; # polkit
+    };
+
+    # configure options
+    programs = {
+      fuzzel = {
+        enable = true; # Super+D in the default setting (app launcher)
+      };
+
+      noctalia-shell = {
+        enable = true;
+  
+        # enable the systemd service
+        systemd.enable = true;
+        settings = {
+          # configure noctalia here
+  	      appLauncher = {
+  	        terminalCommand = "alacritty -e";
+  	      };
+  
+          bar = {
+            density = "compact";
+            position = "top";
+            showCapsule = false;
+            widgets = {
+              left = [
+                {
+                  id = "ControlCenter";
+                  useDistroLogo = true;
+                }
+                {
+                  hideUnoccupied = false;
+                  id = "Workspace";
+                  labelMode = "none";
+                }
+                {
+                  id = "ActiveWindow";
+                }
+              ];
+              center = [
+                {
+                  formatHorizontal = "HH:mm";
+                  formatVertical = "HH mm";
+                  id = "Clock";
+                  useMonospacedFont = true;
+                  usePrimaryColor = true;
+                }
+              ];
+              right = [
+                {
+                  id = "MediaMini";
+                }
+                {
+                  id = "SystemMonitor";
+  	              showNetworkStats = true;
+		      compactMode = false;
+                }
+                {
+                  id = "WiFi";
+                }
+                {
+                  id = "Bluetooth";
+                }
+                {
+                  id = "Battery";
+                  warningThreshold = 20;
+                  displayMode = "alwaysShow";
+                }
+                {
+                  id = "Volume";
+  	              displayMode = "alwaysShow";
+                }
+                {
+                  id = "NotificationHistory";
+  	              hideWhenZero = true;
+                }
+  	            {
+                  id = "Tray";
+                }
+              ];
+            };
+          };
+  
+          colorSchemes.predefinedScheme = "Catppuccin";
+  
+          general = {
+            avatarImage = "/home/kabbone/.face";
+            radiusRatio = 0.2;
+  	        lockOnSusepnd = true;
+          };
+  
+          location = {
+            monthBeforeDay = true;
+            name = "Munich, Germany";
+            showWeekNumberInCalendar = true;
+            firstDayOfWeek = 0;
+          };
+  
+          wallpaper = {
+            enabled = true;
+            overviewEnabled = false;
+            directory = "/home/${user}/.setup/modules/themes/";
+          };
+    
+          brightness = {
+            enforceMinimum = true;
+            brightnessStep = 5;
+          };
+    
+          controlCenter = {
+            shortcuts = {
+              left = [
+                {
+                  id = "WiFi";
+                }
+                {
+                  id = "Bluetooth";
+                }
+                {
+                  id = "ScreenRecorder";
+                }
+                {
+                  id = "PowerProfile";
+                }
+                {
+                  id = "KeepAwake";
+                }
+              ];
+            };
+          };
+    
+          dock = {
+            enabled = false;
+          };
+
+	  sessionMenu = {
+	    enableCountdown = false;
+          };
+                
+          templates = {
+            fuzzel = true;
+            alacritty = true;
+            qt = true;
+            gtk = true;
+            discord  = true;
+            code = true;
+            telegram = true;
+            niri = true;
+            firefox = true;
+          };
+        };
+      };
+    };
+
+    home.file.".cache/noctalia/wallpapers.json" = {
+      text = builtins.toJSON {
+        defaultWallpaper = "/home/${user}/.setup/modules/themes/wall.jpg";
+      };
+    };
+  };
+}
--- a/modules/wm/virtualisation/qemu.nix
+++ b/modules/wm/virtualisation/qemu.nix
@@ -26,7 +26,9 @@
      virt-viewer
      qemu
      OVMF
+      OVMF-cloud-hypervisor
      gvfs                                    # Used for shared folders between linux and windows
+      cloud-hypervisor
    ];
  };
Author	SHA1	Message	Date
Kabbone	f6aa846798	flake update	2026-01-30 12:33:24 +01:00
Kabbone	31691c17fb	noctalia: add pwvucontrol	2026-01-30 12:28:43 +01:00
Kabbone	920876d436	flake update	2026-01-23 13:00:48 +01:00
Kabbone	f68bfe1ab6	flake update	2026-01-11 09:08:48 +01:00
Kabbone	9c4168dc5b	flake update and uncomment zsh config	2026-01-05 08:28:33 +01:00
Kabbone	86f76f418a	lifebook: enable virutalisation	2025-12-29 20:33:48 +01:00
Kabbone	1fed2ab17c	flake update and correcting microvm url	2025-12-29 15:29:34 +01:00
Kabbone	4cc6f0d183	add cloud-hypervisor and small niri floating fix	2025-12-29 15:29:12 +01:00
Kabbone	fdf38fdfae	flake update	2025-12-28 16:39:47 +01:00
Kabbone	7559b4354c	fix niri home import	2025-12-28 16:39:34 +01:00
Kabbone	e912b656a3	niri final touches on desktop	2025-12-27 15:56:43 +01:00
Kabbone	b62c5850dc	initial niri config	2025-12-26 18:51:26 +01:00
Kabbone	ab6e1aa16e	set environment for niri and cleanups	2025-12-26 17:54:45 +01:00
Kabbone	77b5652449	flake update	2025-12-26 12:59:13 +01:00
Kabbone	726e4e9432	add wallpaper	2025-12-26 12:38:25 +01:00
Kabbone	95e20a7dfe	fix zsh ini for Wayland	2025-12-26 12:29:27 +01:00
Kabbone	e14992e9fd	noctalia configuration and basic niri setup	2025-12-26 12:28:22 +01:00