niri: redo a lot

Signed-off-by: unexplrd <unexplrd@linerds.us>

LICENSE

@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: MIT
+
+Copyright 2025 unexplrd@linerds.us
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the “Software”), to deal
+in the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
+OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,6 +1,17 @@
-<h1>So what is this?</h1>
-<p>This is a personal config based on <a href="https://github.com/numtide/blueprint">Blueprint</a>, and it's pretty usable. If one wants to use it, they have to change and adapt it for their own use case, for that please visit the original repo, as it contains the necessary documentation.</p>
-<h2>TODOs:</h2>
-<ul>
-<li>i'll put that in when i recall what i wanted to add</li>
-</ul>
+# NixOS Configuration
+## So what is this?
+
+This is a personal NixOS config based on
+[Blueprint](https://github.com/numtide/blueprint).
+This repo is mainly used to sync changes between devices. If you want to
+use it - it's pretty composable, so modules can be integrated in your
+configs without much hassle.
+
+## Credits
+Configurations I took code/ideas from:
+- [github:TheMaxMur/NixOS-Configuration](https://github.com/TheMaxMur/NixOS-Configuration)
+- [github:nix-community/srvos](https://github.com/nix-community/srvos)
+- [github:cloud-gouv/securix](https://github.com/cloud-gouv/securix)
+- [GLF OS](https://www.gaminglinux.fr/glf-os/en)
+
+Thx a lot <3

UNLICENSE

@@ -1,24 +0,0 @@
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <https://unlicense.org/>

flake.nix

@@ -2,42 +2,104 @@
   description = "unexplrd's personal configuration";
 
   inputs = {
-    blueprint.url = "github:numtide/blueprint";
-    catppuccin.url = "github:catppuccin/nix";
-    chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
-    disko.url = "github:nix-community/disko/latest";
-    home-manager.url = "github:nix-community/home-manager";
-    hyprland.url = "github:hyprwm/Hyprland";
-    hyprsunset.url = "github:hyprwm/hyprsunset";
-    lanzaboote.url = "github:nix-community/lanzaboote/v0.4.2";
-    # lix.url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-2.tar.gz";
-    mysecrets.url = "git+ssh://gitea@gitea.linerds.us/unexplrd/nix-secrets";
-    # neve.url = "git+https://gitea.linerds.us/unexplrd/Neve";
+    # lix = {
+    #   url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.1.tar.gz";
+    #   inputs.nixpkgs.follows = "nixpkgs";
+    # };
+    # neve = {
+    #   inputs.nixvim.follows = "nixvim";
+    #   url = "git+https://gitea.linerds.us/unexplrd/Neve";
+    # };
     # nixvim.url = "github:nix-community/nixvim";
+    systems.url = "github:nix-systems/default";
+    blueprint = {
+      url = "github:numtide/blueprint";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.systems.follows = "systems";
+    };
+    chaotic = {
+      url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
+      inputs = {
+        home-manager.follows = "home-manager";
+        nixpkgs.follows = "nixpkgs";
+      };
+    };
+    disko = {
+      url = "github:nix-community/disko/latest";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    ghostty = {
+      url = "github:ghostty-org/ghostty";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.inputs.systems.follows = "systems";
+    };
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    hyprland = {
+      url = "github:hyprwm/Hyprland";
+      inputs = {
+        systems.follows = "systems";
+        nixpkgs.follows = "nixpkgs";
+      };
+    };
+    hyprsunset = {
+      url = "github:hyprwm/hyprsunset";
+      inputs = {
+        hyprland-protocols.follows = "hyprland/hyprland-protocols";
+        hyprutils.follows = "hyprland/hyprutils";
+        hyprwayland-scanner.follows = "hyprland/hyprwayland-scanner";
+        nixpkgs.follows = "nixpkgs";
+        systems.follows = "hyprland/systems";
+      };
+    };
+    lanzaboote = {
+      url = "github:nix-community/lanzaboote/v0.4.2";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    mysecrets = {
+      url = "git+ssh://gitea@gitea.linerds.us/unexplrd/nix-secrets";
+      flake = false;
+    };
     nix-flatpak.url = "github:gmodena/nix-flatpak";
-    nix-index-database.url = "github:nix-community/nix-index-database";
-    nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic";
+    nix-index-database = {
+      url = "github:nix-community/nix-index-database";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    nixos-cosmic = {
+      url = "github:lilyinstarlight/nixos-cosmic";
+      inputs = {
+        nixpkgs-stable.follows = "nixpkgs-stable";
+        nixpkgs.follows = "nixpkgs";
+      };
+    };
     nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
-    # nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
-    nixpkgs.url = "github:NixOS/nixpkgs?ref=nixos-unstable";
-    sops-nix.url = "github:mic92/sops-nix";
-    stylix.url = "github:danth/stylix/8b0d9317edd57c5374adcf6957ae4775875c2a9d";
-    # TODO: somehow reduce the number of *.inputs.nixpkgs.follows = "nixpkgs" stuff, mb a function?
-    blueprint.inputs.nixpkgs.follows = "nixpkgs";
-    chaotic.inputs.nixpkgs.follows = "nixpkgs";
-    disko.inputs.nixpkgs.follows = "nixpkgs";
-    home-manager.inputs.nixpkgs.follows = "nixpkgs";
-    hyprland.inputs.nixpkgs.follows = "nixpkgs";
-    hyprsunset.inputs.hyprland-protocols.follows = "hyprland/hyprland-protocols";
-    hyprsunset.inputs.hyprutils.follows = "hyprland/hyprutils";
-    hyprsunset.inputs.nixpkgs.follows = "nixpkgs";
-    lanzaboote.inputs.nixpkgs.follows = "nixpkgs";
-    # lix.inputs.nixpkgs.follows = "nixpkgs";
-    mysecrets.flake = false;
-    # neve.inputs.nixvim.follows = "nixvim";
-    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
-    sops-nix.inputs.nixpkgs.follows = "nixpkgs";
+    nixpkgs = {
+      url = "github:NixOS/nixpkgs/nixos-unstable";
+      # workaround for `unexpected Nix daemon error: error: serialised integer 7022364302122705765 is too large for type 'j'`
+      # url = "github:NixOS/nixpkgs/pull/413627/head";
+    };
+    sops-nix = {
+      url = "github:mic92/sops-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    stylix = {
+      url = "github:danth/stylix";
+      inputs = {
+        # home-manager.follows = "home-manager";
+        nixpkgs.follows = "nixpkgs";
+        systems.follows = "systems";
+      };
+    };
+    walker = {
+      url = "github:abenz1267/walker";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        systems.follows = "systems";
+      };
+    };
   };
 
   outputs = inputs: inputs.blueprint {inherit inputs;};

hosts/dunamis/boot/default.nix

@@ -1,38 +0,0 @@
-{
-  inputs,
-  pkgs,
-  ...
-}: {
-  imports = with inputs;
-    [
-      chaotic.nixosModules.default
-      lanzaboote.nixosModules.lanzaboote
-    ]
-    ++ [
-      ./loader.nix
-    ];
-  boot = {
-    plymouth.enable = true;
-    consoleLogLevel = 0;
-    kernelPackages = pkgs.linuxPackages_cachyos;
-    kernelParams = [
-      "amd_iommu=force_isolation"
-      "debugfs=off"
-      "efi=disable_early_pci_dma"
-      "gather_data_sampling=force"
-      "intel_iommu=on"
-      "iommu.passthrough=0"
-      "iommu.strict=1"
-      "iommu=force"
-      "page_alloc.shuffle=1"
-      "vsyscall=none"
-      # "ia32_emulation=0"
-      # "lockdown=confidentiality"
-      # "module.sig_enforce=1"
-    ];
-    initrd = {
-      systemd.enable = true; # needed for auto-unlocking with TPM
-      systemd.tpm2.enable = true;
-    };
-  };
-}

hosts/dunamis/boot/loader.nix

@@ -1,15 +0,0 @@
-{config, ...}: {
-  boot = {
-    lanzaboote = {
-      enable = true;
-      pkiBundle = "/var/lib/sbctl";
-    };
-    loader = {
-      efi.canTouchEfiVariables = true;
-      systemd-boot = {
-        enable = !config.boot.lanzaboote.enable;
-        consoleMode = "auto";
-      };
-    };
-  };
-}

hosts/dunamis/configuration.nix

@@ -1,34 +1,42 @@
 {inputs, ...}: {
   imports = with inputs; [
+    self.modules.shared.nixos
     self.nixosModules.desktop
     self.nixosModules.system
-    ./boot
     ./disko
-    ./hardware
-    ./minecraft.nix
-    ./networking
-    ./nix
-    ./programs.nix
-    ./services.nix
-    ./sops.nix
-    ./users.nix
+    ./misc
   ];
 
-  desktop.niri.enable = true;
-  environment.memoryAllocator.provider = "mimalloc";
-  locale.ukrainian.enable = true;
-  module.stylix = {
-    enable = true;
-    theme = "helios";
+  networking = {
+    hostId = "c7f6c4a1";
+    hostName = "dunamis";
   };
-  opentabletdriver.enable = false;
-  qmk-vial.enable = true;
-  security.basic.enable = true;
-  system.stateVersion = "25.05";
+
+  system.stateVersion = "25.11";
   time.timeZone = "Europe/Kyiv";
-  virtual.libvirt.enable = true;
-  wireless = {
-    bluetooth.enable = true;
-    bluetooth.enableBlueman = false;
+
+  desktop.niri.enable = true;
+
+  services.displayManager.autoLogin = {
+    enable = true;
+    user = "user";
+  };
+
+  module = {
+    config = {
+      secureBoot = true;
+      tpmDiskUnlock = true;
+      vaapi = "intel-media-driver";
+    };
+    stylix = {
+      enable = true;
+      theme = "sandcastle";
+    };
+    locale = "uk_UA.UTF-8";
+    misc = {
+      opentabletdriver.enable = false;
+      qmk-vial.enable = true;
+    };
+    virt.libvirt.enable = true;
   };
 }

hosts/dunamis/disko/default.nix

@@ -1,4 +1,9 @@
-{inputs, ...}: let
+{
+  config,
+  inputs,
+  ...
+}: let
+  inherit (config.networking) hostId;
   disk = "/dev/disk/by-id/nvme-eui.000000000000000100a075244b5d6185";
 in {
   imports = with inputs; [
@@ -10,5 +15,5 @@ in {
       mountOptions = ["rw" "nosuid" "nodev"];
     };
   };
-  disko.devices.disk.main = import ./disk-main.nix {inherit disk;};
+  disko.devices.disk.main = import ./disk-main.nix {inherit disk hostId;};
 }

hosts/dunamis/disko/disk-main.nix

@@ -1,4 +1,7 @@
-{disk, ...}: {
+{
+  disk,
+  hostId,
+}: {
   type = "disk";
   device = disk;
   content = {
@@ -25,41 +28,30 @@
         size = "100%";
         content = {
           type = "luks";
-          name = "luks-main";
+          name = "luks-" + hostId;
           initrdUnlock = true;
           settings.allowDiscards = true;
-          content = {
+          content = let
+            mountOptions = ["autodefrag" "compress-force=zstd" "noatime"];
+          in {
             type = "btrfs";
             extraArgs = ["-f"];
             subvolumes = {
               "@nixos-root" = {
                 mountpoint = "/";
-                mountOptions = [
-                  "compress=zstd"
-                  "noatime"
-                  "noexec"
-                ];
+                mountOptions = mountOptions ++ ["noexec"];
               };
               "@home" = {
                 mountpoint = "/home";
-                mountOptions = [
-                  "compress=zstd"
-                  "noatime"
-                ];
+                inherit mountOptions;
               };
               "@storage" = {
                 mountpoint = "/storage";
-                mountOptions = [
-                  "compress=zstd"
-                  "noatime"
-                ];
+                inherit mountOptions;
               };
               "@nix" = {
                 mountpoint = "/nix";
-                mountOptions = [
-                  "compress-force=zstd"
-                  "noatime"
-                ];
+                inherit mountOptions;
               };
             };
           };

hosts/dunamis/hardware/vaapi/intel-media-driver.nix

@@ -1,7 +0,0 @@
-{pkgs, ...}: {
-  hardware.graphics.extraPackages = with pkgs; [
-    intel-compute-runtime
-    intel-media-driver
-    vpl-gpu-rt
-  ];
-}

hosts/dunamis/misc/default.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    # ./minecraft.nix
+    # ./nix-ssh-serve.nix
+  ];
+}

hosts/dunamis/networking/default.nix

@@ -1,9 +0,0 @@
-{
-  imports = [
-    ./network-manager.nix
-    ./host-name-id.nix
-  ];
-  networking = {
-    hosts = import ./hosts.nix;
-  };
-}

hosts/dunamis/networking/host-name-id.nix

@@ -1,6 +0,0 @@
-{
-  networking = {
-    hostId = "c7f6c4a1";
-    hostName = "dunamis";
-  };
-}

hosts/dunamis/networking/network-manager.nix

@@ -1,7 +0,0 @@
-{
-  networking.networkmanager = {
-      enable = true;
-      ethernet.macAddress = "stable";
-    };
-  };
-}

hosts/dunamis/nix/common.nix

@@ -1,11 +0,0 @@
-{pkgs, ...}: {
-  nix = {
-    package = pkgs.lixPackageSets.latest.lix;
-    channel.enable = false;
-    daemonCPUSchedPolicy = "idle";
-    settings = {
-      experimental-features = ["nix-command" "flakes"];
-      builders-use-substitutes = true;
-    };
-  };
-}

hosts/dunamis/nix/distributed-build.nix

@@ -1,30 +0,0 @@
-{
-  config,
-  inputs,
-  ...
-}: let
-  inherit (builtins) readFile;
-  inherit (config.networking) hostName;
-  inherit (config.sops) secrets;
-  inherit (inputs) mysecrets;
-  pubHost = readFile "${mysecrets}/ssh/ssh_host_ed25519_dunamis.base64";
-in {
-  nix = {
-    distributedBuilds = true;
-    buildMachines = [
-      {
-        hostName = "dunamis";
-        publicHostKey = pubHost;
-        sshKey = secrets."ssh-${hostName}-user".path;
-        sshUser = "nix-ssh";
-        supportedFeatures = [
-          "benchmark"
-          "big-parallel"
-          "kvm"
-          "nixos-test"
-        ];
-        system = "x86_64-linux";
-      }
-    ];
-  };
-}

hosts/dunamis/nix/ssh-serve.nix

@@ -1,11 +0,0 @@
-{config, ...}: let
-  inherit (builtins) readFile;
-  inherit (config.users.users) user;
-in {
-  nix.settings.trusted-users = ["nix-ssh"];
-  nix.sshServe = {
-    enable = true;
-    write = true;
-    keys = map (f: readFile f) user.openssh.authorizedKeys.keyFiles;
-  };
-}

hosts/dunamis/users/user/common.nix

@@ -1,14 +0,0 @@
-{
-  inputs,
-  osConfig,
-  ...
-}: {
-  imports = with inputs; [
-    nix-index-database.hmModules.nix-index
-    self.homeModules.desktop
-    self.homeModules.programs
-  ];
-  inherit (osConfig) desktop;
-  home.stateVersion = osConfig.system.stateVersion;
-  home.sessionPath = ["$HOME/.local/bin"];
-}

hosts/dunamis/users/user/home-configuration.nix

@@ -1,7 +1 @@
-{
-  imports = [
-    ./common.nix
-    ./flatpak.nix
-    ./programs.nix
-  ];
-}
+{flake, ...}: {imports = [flake.modules.shared.user];}

hosts/dunamis/users/user/programs.nix

@@ -1,98 +0,0 @@
-{pkgs, ...}: {
-  console.yazi.enable = true;
-  editor.helix.enable = true;
-  shell = {
-    fish.enable = true;
-    oh-my-posh.enable = true;
-  };
-  syncthing.enable = true;
-  terminal.wezterm.enable = true;
-  terminal.ghostty.enable = true;
-  systemd.user.settings.Manager.DefaultEnvironment = {
-    TERMINAL = "ghostty";
-  };
-
-  services = {
-    pueue.enable = true; # process queue in rust
-    ssh-agent.enable = true;
-  };
-
-  programs = {
-    bat.enable = true; # cat in rust
-    btop = {
-      enable = true;
-      settings.update_ms = 200;
-    };
-    direnv.enable = true;
-    direnv.silent = true;
-    eza.enable = true; # ls in rust
-    fd.enable = true; # find in rust
-    fzf.enable = true; # fuzzy finder in rust
-    git = {
-      enable = true;
-      delta.enable = true; # diff in rust
-      signing.format = "ssh";
-      aliases = {
-        cl = "clone";
-        co = "checkout";
-        pom = "push origin main";
-      };
-    };
-    gitui.enable = true; # git ui in rust
-    jujutsu.enable = true; # vcs in rust
-    keychain = {
-      enable = true;
-      keys = ["id_ed25519"];
-    };
-    nix-index-database.comma.enable = true;
-    nix-index.enable = true;
-    nix-your-shell.enable = true;
-    pay-respects.enable = true; # thefuck in rust
-    ripgrep.enable = true; # grep in rust
-    zoxide.enable = true; # fuzzy cd in rust
-  };
-
-  home.packages = with pkgs;
-    [
-      # development utils
-      alejandra # nix formatter in rust
-      devenv # programming deps in rust
-      jj-fzf # fuzzy finder jujutsu tui
-      just # make in rust
-      silicon # create code pics in rust
-    ]
-    ++ [
-      # console utils
-      bluetuith # bluetooth tui in go
-      dua # disk space usage in rust
-      duf # better df in go
-      fend # calculator in rust
-      mprocs # process runner in rust
-      ouch # archive manager in rust
-      procs # ps in rust
-      rbw # bitwarden cli in rust
-      sd # sed in rust
-      trashy # trash cli in rust
-    ]
-    ++ [
-      # misc apps
-      # vial # qmk keyboard configuring app
-      pinentry-qt # pinentry for rbw
-      virt-manager # libvirt gui
-      waycheck # check wayland protocols
-    ];
-
-  xdg.desktopEntries = {
-    uni = {
-      actions."Copy".exec = "fish -c \"~/.local/bin/uni --copy\"";
-      categories = ["Utility" "X-Launch" "Network"];
-      comment = "Select and open or copy URLs from a list.";
-      exec = "fish -c \"~/.local/bin/uni\"";
-      icon = "web-browser";
-      name = "Uni URL Handler";
-      startupNotify = true;
-      terminal = false;
-      type = "Application";
-    };
-  };
-}

hosts/eldrid/boot/default.nix

@@ -1,39 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  imports = with inputs;
-    [
-      chaotic.nixosModules.default
-      lanzaboote.nixosModules.lanzaboote
-    ]
-    ++ [
-      ./loader.nix
-    ];
-  boot = {
-    # kernelPackages = pkgs.linuxPackages_latest;
-    plymouth.enable = true;
-    consoleLogLevel = 0;
-    kernelPackages = pkgs.linuxPackages_cachyos;
-    kernelParams = [
-      "amd_iommu=force_isolation"
-      "debugfs=off"
-      "efi=disable_early_pci_dma"
-      "gather_data_sampling=force"
-      "intel_iommu=on"
-      "iommu.passthrough=0"
-      "iommu.strict=1"
-      "iommu=force"
-      "page_alloc.shuffle=1"
-      "vsyscall=none"
-      # "ia32_emulation=0"
-      # "lockdown=confidentiality"
-      # "module.sig_enforce=1"
-    ];
-    initrd = {
-      systemd.enable = true; # needed for auto-unlocking with TPM
-      systemd.tpm2.enable = false; # no TPM
-    };
-  };
-}

hosts/eldrid/boot/loader.nix

@@ -1,15 +0,0 @@
-{config, ...}: {
-  boot = {
-    lanzaboote = {
-      enable = false;
-      pkiBundle = "/var/lib/sbctl";
-    };
-    loader = {
-      efi.canTouchEfiVariables = true;
-      systemd-boot = {
-        enable = !config.boot.lanzaboote.enable;
-        consoleMode = "auto";
-      };
-    };
-  };
-}

hosts/eldrid/configuration.nix

@@ -1,30 +1,27 @@
 {inputs, ...}: {
   imports = with inputs; [
+    self.modules.shared.nixos
     self.nixosModules.desktop
     self.nixosModules.system
-    ./boot
     ./disko
     ./hardware
-    ./networking
-    ./nix
-    ../dunamis/programs.nix
-    ../dunamis/services.nix
-    ../dunamis/sops.nix
-    ../dunamis/users.nix
+    ./misc
   ];
 
-  desktop.plasma.enable = true;
-
-  locale.ukrainian.enable = true;
-
-  module.stylix = {
-    enable = true;
-    theme = "nord";
+  networking = {
+    hostId = "14f63637";
+    hostName = "eldrid";
   };
 
-  security.basic.enable = true;
+  system.stateVersion = "25.11";
+  time.timeZone = "Europe/Kyiv";
 
-  system.stateVersion = "25.05";
+  desktop.niri.enable = true;
+
+  services.displayManager.autoLogin = {
+    enable = true;
+    user = "user";
+  };
 
   swapDevices = [
     {
@@ -33,7 +30,21 @@
     }
   ];
 
-  time.timeZone = "Europe/Kyiv";
-
-  # virtual.libvirt.enable = true;
+  module = {
+    config = {
+      laptop.homeRowMods = true;
+      powerSave = true;
+      secureBoot = true;
+      useIwd = true;
+      vaapi = "intel-media-driver";
+    };
+    stylix = {
+      enable = true;
+      theme = "sandcastle";
+    };
+    locale = "uk_UA.UTF-8";
+    misc = {
+      qmk-vial.enable = true;
+    };
+  };
 }

hosts/eldrid/disko/default.nix

@@ -1,5 +1,10 @@
-{inputs, ...}: let
-  disk = "/dev/nvme0n1";
+{
+  config,
+  inputs,
+  ...
+}: let
+  inherit (config.networking) hostId;
+  disk = "/dev/disk/by-id/nvme-eui.e8238fa6bf530001001b444a44022ad0";
 in {
   imports = with inputs; [
     disko.nixosModules.disko
@@ -10,5 +15,5 @@ in {
       mountOptions = ["rw" "nosuid" "nodev"];
     };
   };
-  disko.devices.disk.main = import ./disk-main.nix {inherit disk;};
+  disko.devices.disk.main = import ./disk-main.nix {inherit disk hostId;};
 }

hosts/eldrid/disko/disk-main.nix

@@ -1,4 +1,7 @@
-{disk, ...}: {
+{
+  disk,
+  hostId,
+}: {
   type = "disk";
   device = disk;
   content = {
@@ -25,7 +28,7 @@
         size = "100%";
         content = {
           type = "luks";
-          name = "luks-main";
+          name = "luks-" + hostId;
           initrdUnlock = true;
           settings.allowDiscards = true;
           content = {

hosts/eldrid/hardware/default.nix

@@ -1,8 +1,6 @@
 {
   imports = [
-    ./facter.nix
     ./laptop
-    ./vaapi/intel-media-driver.nix
   ];
   services = {
     logind = {

hosts/eldrid/hardware/facter.nix

@@ -1,14 +0,0 @@
-{
-  config,
-  inputs,
-  ...
-}: let
-  inherit (inputs) mysecrets;
-  inherit (config.networking) hostName;
-in {
-  imports = with inputs; [
-    nixos-facter-modules.nixosModules.facter
-  ];
-  facter.reportPath = "${mysecrets}/facter/${hostName}.json";
-  systemd.network.wait-online.enable = false;
-}

hosts/eldrid/hardware/laptop/cb-audio-fix.nix

@@ -1,20 +1,47 @@
 {pkgs, ...}: let
-  cb-ucm-conf = pkgs.alsa-ucm-conf.overrideAttrs {
-    wttsrc = pkgs.fetchFromGitHub {
-      owner = "WeirdTreeThing";
-      repo = "chromebook-ucm-conf";
-      rev = "b6ce2a7";
-      hash = "sha256-QRUKHd3RQmg1tnZU8KCW0AmDtfw/daOJ/H3XU5qWTCc=";
+  cb-ucm-conf = with pkgs;
+    alsa-ucm-conf.overrideAttrs {
+      wttsrc = fetchFromGitHub {
+        owner = "WeirdTreeThing";
+        repo = "alsa-ucm-conf-cros";
+        rev = "a4f0ed6cf59163fb571c33a81a6b40b6f53ed57d";
+        hash = "sha256-H0BsRzHSEJ6XCZB/Rvb3w+uGCzr+kAvAwcHWqYEtp6w=";
+      };
+      unpackPhase = ''
+        runHook preUnpack
+        tar xf "$src"
+        runHook postUnpack
+      '';
+
+      installPhase = ''
+        runHook preInstall
+        mkdir -p $out/share/alsa
+        cp -r alsa-ucm*/ucm2 $out/share/alsa
+        runHook postInstall
+      '';
     };
-    postInstall = ''
-      cp -R $wttsrc/common/* $out/share/alsa/ucm2/common
-      cp -R $wttsrc/codecs/* $out/share/alsa/ucm2/codecs
-      cp -R $wttsrc/platforms/* $out/share/alsa/ucm2/platforms
-      cp -R $wttsrc/sof-rt5682 $out/share/alsa/ucm2/conf.d
-      cp -R $wttsrc/sof-cs42l42 $out/share/alsa/ucm2/conf.d
-    '';
-  };
 in {
+  environment = {
+    systemPackages = [pkgs.sof-firmware];
+    sessionVariables.ALSA_CONFIG_UCM2 = "${cb-ucm-conf}/share/alsa/ucm2";
+    etc = {
+      "wireplumber/main.lua.d/51-increase-headroom.lua".text = ''
+          rule = {
+            matches = {
+              {
+                { "node.name", "matches", "alsa_output.*" },
+              },
+            },
+            apply_properties = {
+              ["api.alsa.headroom"] = 4096,
+            },
+          }
+
+        table.insert(alsa_monitor.rules,rule)
+      '';
+    };
+  };
+
   system.replaceDependencies.replacements = [
     {
       original = pkgs.alsa-ucm-conf;
@@ -22,6 +49,10 @@ in {
     }
   ];
 
+  boot.extraModprobeConfig = ''
+    options snd-intel-dspcfg dsp_driver=3
+  '';
+
   services.pipewire.wireplumber.configPackages = [
     (pkgs.writeTextDir "share/wireplumber/main.lua.d/51-increase-headroom.lua" ''
       rule = {
@@ -37,10 +68,19 @@ in {
 
       table.insert(alsa_monitor.rules,rule)
     '')
+    (pkgs.writeTextDir "share/wireplumber/main.lua.d/51-avs-dmic.lua" ''
+      rule = {
+        matches = {
+          {
+            { "node.nick", "equals", "Internal Microphone" },
+          },
+        },
+        apply_properties = {
+          ["audio.format"] = "S16LE",
+        },
+      }
+
+      table.insert(alsa_monitor.rules, rule)
+    '')
   ];
-  boot = {
-    extraModprobeConfig = ''
-      options snd-intel-dspcfg dsp_driver=3
-    '';
-  };
 }

hosts/eldrid/hardware/laptop/default.nix

@@ -2,8 +2,6 @@
   imports = [
     ./cb-audio-fix.nix
     ./cb-keyboard.nix
-    ./home-row-mods.nix
-    ./power-saving.nix
     ./touchscreen-fix.nix
   ];
 }

hosts/eldrid/hardware/laptop/home-row-mods.nix

@@ -1,20 +0,0 @@
-{
-  services.keyd = {
-    enable = true;
-    keyboards = {
-      default = {
-        ids = ["0001:0001"];
-        settings.main = {
-          a = "lettermod(alt, a, 200, 150)";
-          s = "lettermod(meta, s, 200, 150)";
-          d = "lettermod(control, d, 200, 150)";
-          f = "lettermod(shift, f, 200, 150)";
-          j = "lettermod(shift, j, 200, 150)";
-          k = "lettermod(control, k, 200, 150)";
-          l = "lettermod(meta, l, 200, 150)";
-          ";" = "lettermod(alt, ;, 200, 150)";
-        };
-      };
-    };
-  };
-}

hosts/eldrid/hardware/laptop/power-saving.nix

@@ -1,7 +0,0 @@
-{
-  powerManagement.enable = true;
-  powerManagement.powertop.enable = true;
-  services.power-profiles-daemon.enable = true;
-  services.thermald.enable = true;
-  services.upower.enable = true;
-}

hosts/eldrid/hardware/vaapi/intel-media-driver.nix

@@ -1,7 +0,0 @@
-{pkgs, ...}: {
-  hardware.graphics.extraPackages = with pkgs; [
-    intel-compute-runtime
-    intel-media-driver
-    vpl-gpu-rt
-  ];
-}

hosts/eldrid/misc/default.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    # ./distributed-build.nix
+    ./undervolt.nix
+  ];
+}

hosts/eldrid/misc/undervolt.nix

@@ -0,0 +1,7 @@
+{
+  services.undervolt = {
+    enable = true;
+    # coreOffset = -150;
+    turbo = 1;
+  };
+}

hosts/eldrid/networking/default.nix

@@ -1,9 +0,0 @@
-{
-  imports = [
-    ./network-manager.nix
-    ./host-name-id.nix
-  ];
-  networking = {
-    hosts = import ./hosts.nix;
-  };
-}

hosts/eldrid/networking/host-name-id.nix

@@ -1,6 +0,0 @@
-{
-  networking = {
-    # hostId = "";
-    hostName = "eldrid";
-  };
-}

hosts/eldrid/networking/hosts.nix

@@ -1,3 +0,0 @@
-{
-  "192.168.1.42" = ["dunamis"];
-}

hosts/eldrid/nix/common.nix

@@ -1,11 +0,0 @@
-{pkgs, ...}: {
-  nix = {
-    package = pkgs.lixPackageSets.latest.lix;
-    channel.enable = false;
-    daemonCPUSchedPolicy = "idle";
-    settings = {
-      experimental-features = ["nix-command" "flakes"];
-      builders-use-substitutes = true;
-    };
-  };
-}

hosts/eldrid/nix/default.nix

@@ -1,7 +0,0 @@
-{
-  imports = [
-    ./common.nix
-    ./substituters.nix
-    ./distributed-build.nix
-  ];
-}

hosts/eldrid/nix/distributed-build.nix

@@ -1,30 +0,0 @@
-{
-  config,
-  inputs,
-  ...
-}: let
-  inherit (builtins) readFile;
-  inherit (config.networking) hostName;
-  inherit (config.sops) secrets;
-  inherit (inputs) mysecrets;
-  pubHost = readFile "${mysecrets}/ssh/ssh_host_ed25519_dunamis.base64";
-in {
-  nix = {
-    distributedBuilds = true;
-    buildMachines = [
-      {
-        hostName = "dunamis";
-        publicHostKey = pubHost;
-        sshKey = secrets."ssh-${hostName}-user".path;
-        sshUser = "nix-ssh";
-        supportedFeatures = [
-          "benchmark"
-          "big-parallel"
-          "kvm"
-          "nixos-test"
-        ];
-        system = "x86_64-linux";
-      }
-    ];
-  };
-}

hosts/eldrid/nix/ssh-serve.nix

@@ -1,10 +0,0 @@
-{config, ...}: let
-  inherit (builtins) readFile;
-  inherit (config.users.users) user;
-in {
-  nix.sshServe = {
-    enable = true;
-    write = true;
-    keys = map (f: readFile f) user.openssh.authorizedKeys.keyFiles;
-  };
-}

hosts/eldrid/nix/substituters.nix

@@ -1,16 +0,0 @@
-{
-  nix.settings = {
-    substituters = [
-      "https://cache.nixos.org/"
-      "https://chaotic-nyx.cachix.org/"
-      "https://cosmic.cachix.org/"
-      "https://nix-community.cachix.org/"
-    ];
-    trusted-public-keys = [
-      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-      "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
-      "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-    ];
-  };
-}

hosts/eldrid/users/user/flatpak.nix

@@ -1,100 +0,0 @@
-{inputs, ...}: {
-  imports = with inputs; [
-    nix-flatpak.homeManagerModules.nix-flatpak
-  ];
-  services.flatpak = {
-    enable = true;
-    uninstallUnmanaged = true;
-    remotes = [
-      {
-        name = "flathub";
-        location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
-      }
-      {
-        name = "hero-persson";
-        location = "https://hero-persson.github.io/unmojang-flatpak/index.flatpakrepo";
-      }
-    ];
-    packages = [
-      # misc
-      "app.zen_browser.zen"
-      "net.mullvad.MullvadBrowser"
-      "com.obsproject.Studio"
-      "com.bitwarden.desktop"
-      "com.github.tchx84.Flatseal"
-      "de.haeckerfelix.Fragments"
-      "org.qbittorrent.qBittorrent"
-
-      # "com.transmissionbt.Transmission"
-      "com.usebottles.bottles"
-      "com.logseq.Logseq"
-
-      # chatting
-      "org.signal.Signal"
-      "im.riot.Riot"
-      "org.telegram.desktop"
-      "io.github.kukuruzka165.materialgram"
-      "io.github.spacingbat3.webcord"
-      "org.mozilla.Thunderbird"
-
-      # media
-      "io.bassi.Amberol"
-      "io.freetubeapp.FreeTube"
-      #"io.github.celluloid_player.Celluloid"
-      # "io.mpv.Mpv"
-
-      # gaming
-      #"com.github._0negal.Viper"
-      "net.lutris.Lutris"
-      "com.heroicgameslauncher.hgl"
-      {
-        appId = "org.unmojang.FjordLauncher";
-        origin = "hero-persson";
-      }
-      "org.freedesktop.Platform.VulkanLayer.MangoHud//24.08"
-      "org.freedesktop.Platform.VulkanLayer.gamescope//24.08"
-    ];
-    overrides = {
-      "global" = {
-        # Force Wayland by default
-        Context = {
-          sockets = ["wayland" "!x11" "!fallback-x11"];
-          filesystems = [
-            "!host"
-            "!home"
-            "!~/.ssh"
-            "xdg-run/pipewire-0"
-            "xdg-config/gtk-3.0:ro"
-            "xdg-config/gtk-4.0:ro"
-            "~/.local/share/icons:ro"
-            "/nix/store:ro"
-          ];
-        };
-        Environment = {
-          ELECTRON_OZONE_PLATFORM_HINT = "wayland";
-        };
-      };
-      "com.valvesoftware.Steam" = {
-        Context = {
-          sockets = ["x11" "wayland"];
-          filesystems = ["/storage/games/steam"];
-        };
-        Environment.STEAM_FORCE_DESKTOPUI_SCALING = "1.3";
-      };
-      "org.signal.Signal" = {
-        Environment.SIGNAL_PASSWORD_STORE = "gnome-libsecret";
-      };
-      "net.lutris.Lutris".Context = {
-        sockets = ["x11" "wayland"];
-        filesystems = ["/storage/games/lutris" "~/games/lutris"];
-      };
-      "com.heroicgameslauncher.hgl".Context = {
-        sockets = ["x11" "wayland"];
-        filesystems = ["/storage/games/heroic" "~/games/heroic"];
-      };
-      "com.usebottles.Bottles" = {
-        Context.sockets = ["x11" "wayland"];
-      };
-    };
-  };
-}

hosts/eldrid/users/user/home-configuration.nix

@@ -1,7 +1 @@
-{lib, ...}: {
-  imports = [
-    ../../../dunamis/users/user/common.nix
-    ../../../dunamis/users/user/programs.nix
-    ../../../dunamis/users/user/flatpak.nix
-  ];
-}
+{flake, ...}: {imports = [flake.modules.shared.user];}

hosts/legion/boot.nix

@@ -1,56 +0,0 @@
-{
-  pkgs,
-  config,
-  inputs,
-  ...
-}: {
-  imports = with inputs; [
-    chaotic.nixosModules.default
-    lanzaboote.nixosModules.lanzaboote
-  ];
-  boot = {
-    # kernelPackages = pkgs.linuxPackages_latest;
-    consoleLogLevel = 0;
-    kernelPackages = pkgs.linuxPackages_cachyos;
-    kernelModules = ["kvm-amd"];
-    kernelParams = [
-      # "mitigations=auto"
-      # "spectre_v2=on"
-      # "spectre_v2_user=on"
-      # "spectre_bhi=on"
-      # "spec_store_bypass_disable=on"
-      # "tsx=off"
-      # "kvm.nx_huge_pages=force"
-      # "l1d_flush=on"
-      "amd_iommu=force_isolation"
-      "debugfs=off"
-      "efi=disable_early_pci_dma"
-      "gather_data_sampling=force"
-      # "ia32_emulation=0"
-      "intel_iommu=on"
-      "iommu.passthrough=0"
-      "iommu.strict=1"
-      "iommu=force"
-      # "lockdown=confidentiality"
-      # "module.sig_enforce=1"
-      "page_alloc.shuffle=1"
-      # "reg_file_data_sampling=on"
-      # "spec_rstack_overflow=safe-ret"
-      "vsyscall=none"
-    ];
-    initrd = {
-      availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
-      systemd.enable = true; # needed for auto-unlocking with TPM
-    };
-    loader.efi.canTouchEfiVariables = true;
-    loader.systemd-boot = {
-      enable = !config.boot.lanzaboote.enable;
-      consoleMode = "auto";
-    };
-    lanzaboote = {
-      enable = true;
-      pkiBundle = "/etc/secureboot";
-    };
-    plymouth.enable = true;
-  };
-}

hosts/legion/configuration.nix

@@ -1,40 +1,41 @@
 {inputs, ...}: {
   imports = with inputs; [
+    self.modules.shared.nixos
     self.nixosModules.desktop
     self.nixosModules.system
-    ../dunamis/programs.nix
-    ./boot.nix
-    ./disko.nix
-    ./hardware.nix
-    ./networking.nix
-    ./nix.nix
-    ./power-saving.nix
-    ./services.nix
-    ./sops.nix
-    ./users.nix
+    ./disko
+    ./hardware
+    ./misc
   ];
 
-  desktop.niri.enable = true;
-  environment.memoryAllocator.provider = "mimalloc";
-  locale.ukrainian.enable = true;
-  module.stylix = {
-    enable = true;
-    theme = "helios";
+  networking = {
+    hostId = "45b00123";
+    hostName = "legion";
   };
-  opentabletdriver.enable = false;
-  qmk-vial.enable = true;
-  security.basic.enable = true;
-  system.stateVersion = "25.05";
+
+  system.stateVersion = "25.11";
   time.timeZone = "Europe/Kyiv";
-  virtual.libvirt.enable = true;
-  wireless = {
-    bluetooth.enable = true;
-    bluetooth.enableBlueman = true;
+
+  desktop.niri.enable = true;
+
+  services.displayManager.autoLogin = {
+    enable = true;
+    user = "user";
+  };
+
+  module = {
+    config = {
+      laptop.homeRowMods = true;
+      powerSave = true;
+      secureBoot = true;
+      tpmDiskUnlock = true;
+      vaapi = "nvidia";
+    };
+    stylix = {
+      enable = true;
+      theme = "sandcastle";
+    };
+    locale = "uk_UA.UTF-8";
+    virt.libvirt.enable = true;
   };
-  swapDevices = [
-    {
-      device = "/swap/swapfile";
-      size = 8 * 1024;
-    }
-  ];
 }

hosts/legion/disko.nix

@@ -1,115 +0,0 @@
-{inputs, ...}: let
-  disk = "/dev/disk/by-id/nvme-INTEL_SSDPEKKF256G8L_BTHH81460QC2256B";
-  disk1 = "/dev/disk/by-id/nvme-WDC_PC_SN730_SDBPNTY-1T00-1101_21114D802446";
-in {
-  imports = with inputs; [
-    disko.nixosModules.disko
-  ];
-  disko.devices.nodev = {
-    "/tmp" = {
-      fsType = "tmpfs";
-      mountOptions = ["rw" "nosuid" "nodev"];
-    };
-  };
-  disko.devices.disk.main = {
-    type = "disk";
-    device = disk;
-    content = {
-      type = "gpt";
-      partitions = {
-        ESP = {
-          size = "2G";
-          type = "EF00";
-          content = {
-            type = "filesystem";
-            format = "vfat";
-            mountpoint = "/boot";
-            mountOptions = [
-              "umask=0077"
-              "fmask=0022"
-              "dmask=0022"
-              "noexec"
-              "nosuid"
-              "nodev"
-            ];
-          };
-        };
-        luks = {
-          size = "100%";
-          content = {
-            type = "luks";
-            name = "luks-main";
-            initrdUnlock = true;
-            settings.allowDiscards = true;
-            content = {
-              type = "btrfs";
-              extraArgs = ["-f"];
-              subvolumes = {
-                "@root-nixos" = {
-                  mountpoint = "/";
-                  mountOptions = [
-                    "compress=zstd"
-                    "noatime"
-                    # "noexec"
-                  ];
-                };
-                "@home" = {
-                  mountpoint = "/home";
-                  mountOptions = [
-                    "compress=zstd"
-                    "noatime"
-                  ];
-                };
-                "@swap" = {
-                  mountpoint = "/swap";
-                  mountOptions = [
-                    # "compress=zstd"
-                    "noatime"
-                  ];
-                };
-                # "@nix" = {
-                #   mountpoint = "/nix";
-                #   mountOptions = [
-                #     "compress-force=zstd"
-                #     "noatime"
-                #   ];
-                # };
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-  disko.devices.disk.second = {
-    type = "disk";
-    device = disk1;
-    content = {
-      type = "gpt";
-      partitions = {
-        luks = {
-          size = "100%";
-          content = {
-            type = "luks";
-            name = "luks-second";
-            initrdUnlock = true;
-            settings.allowDiscards = true;
-            content = {
-              type = "btrfs";
-              extraArgs = ["-f"];
-              subvolumes = {
-                "@storage" = {
-                  mountpoint = "/storage";
-                  mountOptions = [
-                    "compress=zstd"
-                    "noatime"
-                  ];
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-}

hosts/legion/disko/default.nix

@@ -0,0 +1,21 @@
+{
+  config,
+  inputs,
+  ...
+}: let
+  inherit (config.networking) hostId;
+  disk-main = "/dev/disk/by-id/nvme-INTEL_SSDPEKKF256G8L_BTHH81460QC2256B";
+  disk-second = "/dev/disk/by-id/nvme-WDC_PC_SN730_SDBPNTY-1T00-1101_21114D802446";
+in {
+  imports = with inputs; [
+    disko.nixosModules.disko
+  ];
+  disko.devices.nodev = {
+    "/tmp" = {
+      fsType = "tmpfs";
+      mountOptions = ["rw" "nosuid" "nodev"];
+    };
+  };
+  disko.devices.disk.main = import ./disk-main.nix {inherit disk-main hostId;};
+  disko.devices.disk.second = import ./disk-second.nix {inherit disk-second hostId;};
+}

hosts/legion/disko/disk-main.nix

@@ -0,0 +1,75 @@
+{
+  disk-main,
+  hostId,
+}: {
+  type = "disk";
+  device = disk-main;
+  content = {
+    type = "gpt";
+    partitions = {
+      ESP = {
+        size = "2G";
+        type = "EF00";
+        content = {
+          type = "filesystem";
+          format = "vfat";
+          mountpoint = "/boot";
+          mountOptions = [
+            "umask=0077"
+            "fmask=0022"
+            "dmask=0022"
+            "noexec"
+            "nosuid"
+            "nodev"
+          ];
+        };
+      };
+      luks = {
+        size = "100%";
+        content = {
+          type = "luks";
+          name = "luks-" + hostId;
+          initrdUnlock = true;
+          settings.allowDiscards = true;
+          content = {
+            type = "btrfs";
+            extraArgs = ["-f"];
+            subvolumes = {
+              "@root-nixos" = {
+                mountpoint = "/";
+                mountOptions = [
+                  "autodefrag"
+                  "compress=zstd"
+                  "noatime"
+                  # "noexec"
+                ];
+              };
+              "@home" = {
+                mountpoint = "/home";
+                mountOptions = [
+                  "autodefrag"
+                  "compress=zstd"
+                  "noatime"
+                ];
+              };
+              "@swap" = {
+                mountpoint = "/swap";
+                mountOptions = [
+                  # "compress=zstd"
+                  "noatime"
+                ];
+              };
+              # "@nix" = {
+              #   mountpoint = "/nix";
+              #   mountOptions = [
+              #     "compress-force=zstd"
+              #     "noatime"
+              #   ];
+              # };
+            };
+          };
+        };
+      };
+    };
+  };
+}

hosts/legion/disko/disk-second.nix

@@ -0,0 +1,35 @@
+{
+  disk-second,
+  hostId,
+}: {
+  type = "disk";
+  device = disk-second;
+  content = {
+    type = "gpt";
+    partitions = {
+      luks = {
+        size = "100%";
+        content = {
+          type = "luks";
+          name = "luks-${hostId}-second";
+          initrdUnlock = true;
+          settings.allowDiscards = true;
+          content = {
+            type = "btrfs";
+            extraArgs = ["-f"];
+            subvolumes = {
+              "@storage" = {
+                mountpoint = "/storage";
+                mountOptions = [
+                  "autodefrag"
+                  "compress=zstd"
+                  "noatime"
+                ];
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+}

hosts/legion/hardware.nix

@@ -1,41 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{
-  inputs,
-  lib,
-  modulesPath,
-  ...
-}: {
-  imports = with inputs.nixos-hardware.nixosModules; [
-    (modulesPath + "/installer/scan/not-detected.nix")
-    lenovo-legion-15ach6h
-  ];
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-
-  hardware = {
-    enableRedistributableFirmware = true;
-    nvidia-container-toolkit.enable = true;
-    nvidia = {
-      dynamicBoost.enable = true;
-      powerManagement.finegrained = false;
-    };
-  };
-
-  services.keyd = {
-    enable = true;
-    keyboards.laptop = {
-      ids = ["048d:c101"];
-      settings.main = {
-        a = "lettermod(alt, a, 200, 150)";
-        s = "lettermod(meta, s, 200, 150)";
-        d = "lettermod(control, d, 200, 150)";
-        f = "lettermod(shift, f, 200, 150)";
-        j = "lettermod(shift, j, 200, 150)";
-        k = "lettermod(control, k, 200, 150)";
-        l = "lettermod(meta, l, 200, 150)";
-        ";" = "lettermod(alt, ;, 200, 150)";
-      };
-    };
-  };
-}

hosts/legion/hardware/default.nix

@@ -0,0 +1,11 @@
+{
+  imports = [
+    ./nvidia.nix
+  ];
+  services = {
+    logind = {
+      lidSwitch = "ignore";
+      powerKey = "suspend";
+    };
+  };
+}

hosts/legion/hardware/nvidia.nix

@@ -0,0 +1,36 @@
+{
+  config,
+  lib,
+  ...
+}: {
+  nixpkgs.config.allowUnfreePredicate = pkg:
+    builtins.elem (lib.getName pkg) [
+      "nvidia-x11"
+    ];
+  services.xserver.videoDrivers = ["nvidia"];
+  hardware = {
+    nvidia-container-toolkit.enable = true;
+    nvidia = {
+      package = config.boot.kernelPackages.nvidiaPackages.beta;
+      open = true;
+      modesetting.enable = true;
+      nvidiaSettings = false;
+      dynamicBoost.enable = true;
+      powerManagement = {
+        enable = false;
+        # finegrained = true;
+      };
+      prime = {
+        # sync.enable = true;
+        # reverseSync.enable = true;
+        # allowExternalGpu = true;
+        offload = {
+          enable = true;
+          enableOffloadCmd = true;
+        };
+        amdgpuBusId = "PCI:6:0:0";
+        nvidiaBusId = "PCI:1:0:0";
+      };
+    };
+  };
+}

hosts/legion/misc/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    # ./distributed-build.nix
+  ];
+}

hosts/legion/networking.nix

@@ -1,6 +0,0 @@
-{
-  networking = {
-    hostName = "legion";
-    networkmanager.enable = true;
-  };
-}

hosts/legion/nix.nix

@@ -1,14 +0,0 @@
-# TODO: better file name
-{
-  config,
-  pkgs,
-  ...
-}: {
-  nixpkgs.config.allowUnfree = true;
-  nix = {
-    package = pkgs.lix;
-    channel.enable = false;
-    settings.experimental-features = ["nix-command" "flakes"];
-    daemonCPUSchedPolicy = "idle";
-  };
-}

hosts/legion/power-saving.nix

@@ -1,7 +0,0 @@
-{
-  powerManagement.enable = true;
-  powerManagement.powertop.enable = true;
-  services.power-profiles-daemon.enable = true;
-  services.thermald.enable = true;
-  services.upower.enable = true;
-}

hosts/legion/programs.nix

@@ -1,19 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
-  programs = {
-    fish.enable = true;
-    mosh.enable = true;
-    nh = {
-      enable = true;
-      flake = "/home/user/.config/nixos";
-    };
-  };
-  environment.systemPackages = with pkgs; [
-    (lib.hiPrio uutils-coreutils-noprefix)
-    helix
-    nushell
-  ];
-}

hosts/legion/services.nix

@@ -1,34 +0,0 @@
-{
-  services = {
-    # hardware.openrgb.enable = true;
-    flatpak.enable = true;
-    fwupd.enable = true;
-    openssh.enable = true;
-    syncthing.openDefaultPorts = true;
-    dnscrypt-proxy2 = {
-      enable = true;
-      settings = {
-        require_dnssec = true;
-        server_names = ["mullvad-doh"];
-        bootstrap_resolvers = ["9.9.9.11:53" "9.9.9.9:53"];
-      };
-    };
-    opensnitch = {
-      enable = false;
-      settings = {
-        DefaultAaction = "deny";
-        Firewall = "iptables";
-        InterceptUnknown = true;
-        ProcMonitorMethod = "ebpf";
-      };
-    };
-    scx = {
-      enable = false;
-      scheduler = "scx_flash";
-    };
-    logind = {
-      lidSwitch = "ignore";
-      powerKey = "suspend";
-    };
-  };
-}

hosts/legion/sops.nix

@@ -1,64 +0,0 @@
-{
-  config,
-  inputs,
-  ...
-}: let
-  inherit (inputs) mysecrets;
-  hostName =
-    if (config.networking.hostName == "vylxae")
-    then "sarien"
-    else config.networking.hostName;
-  sopsFile = mysecrets + "/hosts/${hostName}.yaml";
-  dotSsh = name: "/home/user/.ssh/" + name;
-  sshKey = {
-    mode = "0400";
-    owner = "user";
-  };
-in {
-  imports = with inputs; [
-    sops-nix.nixosModules.sops
-  ];
-
-  sops = {
-    age = {
-      sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
-      keyFile = "/var/lib/sops-nix/key.txt";
-      generateKey = true;
-    };
-    defaultSopsFile = mysecrets + "/common.yaml";
-    secrets = {
-      "user-password-hashed".neededForUsers = true;
-      "ssh-config" = {
-        path = dotSsh "config";
-        mode = "0400";
-        owner = "user";
-      };
-      "ssh-${hostName}-user" = {
-        inherit sopsFile;
-        inherit (sshKey) mode owner;
-        path = dotSsh "id_ed25519";
-      };
-      "ssh-${hostName}-user.pub" = {
-        inherit sopsFile;
-        inherit (sshKey) mode owner;
-        path = dotSsh "id_ed25519.pub";
-      };
-      "ssh-unexplrd" = {
-        inherit (sshKey) mode owner;
-        path = dotSsh "id_unexplrd_ed25519";
-      };
-      "ssh-unexplrd.pub" = {
-        inherit (sshKey) mode owner;
-        path = dotSsh "id_unexplrd_ed25519.pub";
-      };
-      "ssh-uni" = {
-        inherit (sshKey) mode owner;
-        path = dotSsh "id_uni_ed25519";
-      };
-      "ssh-uni.pub" = {
-        inherit (sshKey) mode owner;
-        path = dotSsh "id_uni_ed25519.pub";
-      };
-    };
-  };
-}

hosts/legion/users.nix

@@ -1,26 +0,0 @@
-{
-  inputs,
-  config,
-  pkgs,
-  ...
-}: let
-  inherit (config.sops) secrets;
-  inherit (inputs) mysecrets;
-in {
-  nix.settings.trusted-users = ["user" "nix-ssh"];
-  users.mutableUsers = false;
-  users.users = {
-    user = {
-      hashedPasswordFile = secrets."user-password-hashed".path;
-      extraGroups = ["wheel" "video" "libvirtd" "dialout"];
-      isNormalUser = true;
-      shell = pkgs.fish;
-      openssh.authorizedKeys.keyFiles = map (f: "${mysecrets}/ssh/user/id_${f}_ed25519.pub") [
-        "dunamis"
-        "eldrid"
-        "sarien"
-        "legion"
-      ];
-    };
-  };
-}

hosts/legion/users/user/home-configuration.nix

@@ -1,7 +1 @@
-{
-  imports = [
-    ../../../dunamis/users/user/common.nix
-    ../../../dunamis/users/user/flatpak.nix
-    ../../../dunamis/users/user/programs.nix
-  ];
-}
+{flake, ...}: {imports = [flake.modules.shared.user];}

hosts/morphius/configuration.nix

@@ -0,0 +1,47 @@
+{inputs, ...}: {
+  imports = with inputs; [
+    self.nixosModules.desktop
+    self.nixosModules.system
+    self.modules.shared.nixos
+    ./disko
+    ./hardware
+    ./misc
+  ];
+
+  networking = {
+    hostId = "bd1b5837";
+    hostName = "morphius";
+  };
+
+  system.stateVersion = "25.11";
+  time.timeZone = "Europe/Kyiv";
+
+  desktop.gnome.enable = true;
+
+  services.displayManager.autoLogin = {
+    enable = true;
+    user = "user";
+  };
+
+  swapDevices = [
+    {
+      device = "/swap/swapfile";
+      size = 8 * 1024;
+    }
+  ];
+
+  module = {
+    config = {
+      secureBoot = true;
+      tpmDiskUnlock = true;
+      powerSave = true;
+      useIwd = true;
+      vaapi = "intel-media-driver";
+    };
+    stylix = {
+      enable = true;
+      theme = "sandcastle";
+    };
+    locale = "uk_UA.UTF-8";
+  };
+}

hosts/morphius/disko/default.nix

@@ -0,0 +1,19 @@
+{
+  config,
+  inputs,
+  ...
+}: let
+  inherit (config.networking) hostId;
+  disk = "/dev/nvme0n1";
+in {
+  imports = with inputs; [
+    disko.nixosModules.disko
+  ];
+  disko.devices.nodev = {
+    "/tmp" = {
+      fsType = "tmpfs";
+      mountOptions = ["rw" "nosuid" "nodev"];
+    };
+  };
+  disko.devices.disk.main = import ./disk-main.nix {inherit disk hostId;};
+}

hosts/morphius/disko/disk-main.nix

@@ -1,11 +1,15 @@
-{disk, ...}: {
+{
+  disk,
+  hostId,
+  ...
+}: {
   type = "disk";
   device = disk;
   content = {
     type = "gpt";
     partitions = {
       ESP = {
-        size = "2G";
+        size = "1G";
         type = "EF00";
         content = {
           type = "filesystem";
@@ -25,7 +29,7 @@
         size = "100%";
         content = {
           type = "luks";
-          name = "luks-main";
+          name = "luks-" + hostId;
           initrdUnlock = true;
           settings.allowDiscards = true;
           content = {
@@ -61,6 +65,12 @@
                   "noatime"
                 ];
               };
+              "@swap" = {
+                mountpoint = "/swap";
+                mountOptions = [
+                  "noatime"
+                ];
+              };
             };
           };
         };

hosts/morphius/hardware/default.nix

@@ -0,0 +1,12 @@
+{
+  imports = [
+    # ./laptop
+  ];
+  hardware.sensor.iio.enable = true;
+  services = {
+    logind = {
+      lidSwitch = "ignore";
+      powerKey = "suspend";
+    };
+  };
+}

hosts/morphius/misc/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    # ./distributed-build.nix
+  ];
+}

hosts/morphius/users/user/home-configuration.nix

@@ -0,0 +1 @@
+{flake, ...}: {imports = [flake.modules.shared.user];}

hosts/pixel/users/droid/home-configuration.nix

@@ -1,13 +0,0 @@
-{inputs, ...}: {
-  imports = with inputs; [
-    nix-index-database.hmModules.nix-index
-    self.homeModules.programs
-    ./programs.nix
-  ];
-  home = {
-    stateVersion = "25.05";
-    sessionPath = [
-      "$HOME/.local/bin"
-    ];
-  };
-}

hosts/pixel/users/droid/programs.nix

@@ -1,60 +0,0 @@
-{pkgs, ...}: {
-  shell = {
-    fish.enable = true;
-    #nushell.enable = true;
-    oh-my-posh.enable = true;
-  };
-
-  console.yazi.enable = true;
-
-  services.ssh-agent.enable = true;
-
-  programs = {
-    bat.enable = true;
-    btop = {
-      enable = true;
-      settings.update_ms = 200;
-    };
-    eza.enable = true;
-    fd.enable = true;
-    fzf = {
-      enable = true;
-      defaultOptions = ["--color=16"];
-    };
-    pay-respects.enable = true;
-    nix-index.enable = true;
-    nix-index-database.comma.enable = true;
-    gitui.enable = true;
-    git = {
-      enable = true;
-      delta.enable = true;
-      signing.format = "ssh";
-      aliases = {
-        cl = "clone";
-        co = "checkout";
-        pom = "push origin main";
-      };
-    };
-    jujutsu.enable = true;
-    ripgrep.enable = true;
-  };
-
-  editor = {
-    helix.enable = true;
-  };
-
-  home.packages = with pkgs; [
-    alejandra # nix formatter in rust
-    trashy # trash cli in rust
-    devenv # programming deps in rust
-    procs # ps in rust
-    ouch # archive manager in runt
-    dust # du in rust
-    fend # calc in rust
-    moar # better pager (in go)
-    just # make in rust
-    rbw # bitwarden cli in rust
-    jj-fzf # fuzzy finder jujutsu tui
-  ];
-  systemd.user.settings.Manager.DefaultEnvironment.PAGER = "moar";
-}

hosts/sarien/boot/default.nix

@@ -1,39 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  imports = with inputs;
-    [
-      chaotic.nixosModules.default
-      lanzaboote.nixosModules.lanzaboote
-    ]
-    ++ [
-      ./loader.nix
-    ];
-  boot = {
-    # kernelPackages = pkgs.linuxPackages_latest;
-    plymouth.enable = true;
-    consoleLogLevel = 0;
-    kernelPackages = pkgs.linuxPackages_cachyos;
-    kernelParams = [
-      "amd_iommu=force_isolation"
-      "debugfs=off"
-      "efi=disable_early_pci_dma"
-      "gather_data_sampling=force"
-      "intel_iommu=on"
-      "iommu.passthrough=0"
-      "iommu.strict=1"
-      "iommu=force"
-      "page_alloc.shuffle=1"
-      "vsyscall=none"
-      # "ia32_emulation=0"
-      # "lockdown=confidentiality"
-      # "module.sig_enforce=1"
-    ];
-    initrd = {
-      systemd.enable = true; # needed for auto-unlocking with TPM
-      systemd.tpm2.enable = false; # no TPM
-    };
-  };
-}

hosts/sarien/boot/loader.nix

@@ -1,15 +0,0 @@
-{config, ...}: {
-  boot = {
-    lanzaboote = {
-      enable = false;
-      pkiBundle = "/var/lib/sbctl";
-    };
-    loader = {
-      efi.canTouchEfiVariables = true;
-      systemd-boot = {
-        enable = !config.boot.lanzaboote.enable;
-        consoleMode = "auto";
-      };
-    };
-  };
-}

hosts/sarien/configuration.nix

@@ -1,34 +1,54 @@
-{
-  inputs,
-  pkgs,
-  ...
-}: {
+{inputs, ...}: {
   imports = with inputs; [
     self.nixosModules.desktop
     self.nixosModules.system
-    ./boot
+    self.modules.shared.nixos
     ./disko
     ./hardware
-    ./networking
-    ./nix
-    ../dunamis/programs.nix
-    ../dunamis/services.nix
-    ../dunamis/sops.nix
-    ../dunamis/users.nix
+    ./misc
   ];
 
-  system.stateVersion = "25.05";
-  time.timeZone = "Europe/Kyiv";
-
-  module.stylix = {
-    enable = true;
-    theme = "helios";
+  networking = {
+    hostId = "31150fae";
+    hostName = "sarien";
   };
 
+  system.stateVersion = "25.11";
+  time.timeZone = "Europe/Kyiv";
+
   desktop.niri.enable = true;
 
-  locale.ukrainian.enable = true;
-  qmk-vial.enable = true;
-  security.basic.enable = true;
-  virtual.libvirt.enable = true;
+  services.displayManager.autoLogin = {
+    enable = true;
+    user = "user";
+  };
+
+  swapDevices = [
+    {
+      device = "/swap/swapfile";
+      size = 4 * 1024;
+      priority = 100;
+    }
+    {
+      device = "/swap/hibernate";
+      size = 16 * 1024;
+      priority = 1;
+    }
+  ];
+
+  module = {
+    config = {
+      laptop.homeRowMods = true;
+      powerSave = true;
+      useIwd = true;
+      vaapi = "intel-media-driver";
+    };
+    stylix = {
+      enable = true;
+      theme = "sandcastle";
+    };
+    locale = "uk_UA.UTF-8";
+    misc.qmk-vial.enable = true;
+    virt.libvirt.enable = true;
+  };
 }

hosts/sarien/disko/default.nix

@@ -1,4 +1,9 @@
-{inputs, ...}: let
+{
+  config,
+  inputs,
+  ...
+}: let
+  inherit (config.networking) hostId;
   disk = "/dev/disk/by-id/nvme-eui.0025385911b36714";
 in {
   imports = with inputs; [
@@ -10,5 +15,6 @@ in {
       mountOptions = ["rw" "nosuid" "nodev"];
     };
   };
-  disko.devices.disk.main = import ./disk-main.nix {inherit disk;};
+  # same partitioning setup
+  disko.devices.disk.main = import ../../dunamis/disko/disk-main.nix {inherit disk hostId;};
 }

hosts/sarien/hardware/default.nix

@@ -1,8 +1,6 @@
 {
   imports = [
-    ./facter.nix
     ./laptop
-    ./vaapi/intel-media-driver.nix
   ];
   services = {
     logind = {

hosts/sarien/hardware/facter.nix

@@ -1,14 +0,0 @@
-{
-  config,
-  inputs,
-  ...
-}: let
-  inherit (inputs) mysecrets;
-  inherit (config.networking) hostName;
-in {
-  imports = with inputs; [
-    nixos-facter-modules.nixosModules.facter
-  ];
-  facter.reportPath = "${mysecrets}/facter/${hostName}.json";
-  systemd.network.wait-online.enable = false;
-}

hosts/sarien/hardware/laptop/default.nix

@@ -1,7 +1,5 @@
 {
   imports = [
-    ./home-row-mods.nix
     ./keyboard-fix.nix
-    ./power-saving.nix
   ];
 }

hosts/sarien/hardware/laptop/home-row-mods.nix

@@ -1,20 +0,0 @@
-{
-  services.keyd = {
-    enable = true;
-    keyboards = {
-      default = {
-        ids = ["0001:0001"];
-        settings.main = {
-          a = "lettermod(alt, a, 200, 150)";
-          s = "lettermod(meta, s, 200, 150)";
-          d = "lettermod(control, d, 200, 150)";
-          f = "lettermod(shift, f, 200, 150)";
-          j = "lettermod(shift, j, 200, 150)";
-          k = "lettermod(control, k, 200, 150)";
-          l = "lettermod(meta, l, 200, 150)";
-          ";" = "lettermod(alt, ;, 200, 150)";
-        };
-      };
-    };
-  };
-}

hosts/sarien/hardware/laptop/power-saving.nix

@@ -1,7 +0,0 @@
-{
-  powerManagement.enable = true;
-  powerManagement.powertop.enable = true;
-  services.power-profiles-daemon.enable = true;
-  services.thermald.enable = true;
-  services.upower.enable = true;
-}

hosts/sarien/hardware/vaapi/intel-media-driver.nix

@@ -1,7 +0,0 @@
-{pkgs, ...}: {
-  hardware.graphics.extraPackages = with pkgs; [
-    intel-compute-runtime
-    intel-media-driver
-    vpl-gpu-rt
-  ];
-}

hosts/sarien/misc/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    # ./distributed-build.nix
+  ];
+}

hosts/sarien/networking/default.nix

@@ -1,9 +0,0 @@
-{
-  imports = [
-    ./network-manager.nix
-    ./host-name-id.nix
-  ];
-  networking = {
-    hosts = import ./hosts.nix;
-  };
-}

hosts/sarien/networking/host-name-id.nix

@@ -1,6 +0,0 @@
-{
-  networking = {
-    hostId = "31150fae";
-    hostName = "sarien";
-  };
-}

hosts/sarien/networking/hosts.nix

@@ -1,3 +0,0 @@
-{
-  "192.168.1.42" = ["dunamis"];
-}

hosts/sarien/networking/network-manager.nix

@@ -1,20 +0,0 @@
-{
-  networking = {
-    networkmanager = {
-      enable = true;
-      ethernet.macAddress = "stable";
-      wifi = {
-        backend = "iwd";
-        macAddress = "random";
-        scanRandMacAddress = true;
-      };
-    };
-    wireless.iwd = {
-      enable = true;
-      settings = {
-        General.AddressRandomization = "network";
-        Settings.AlwaysRandomizeAddress = true;
-      };
-    };
-  };
-}

hosts/sarien/nix/common.nix

@@ -1,11 +0,0 @@
-{pkgs, ...}: {
-  nix = {
-    package = pkgs.lixPackageSets.latest.lix;
-    channel.enable = false;
-    daemonCPUSchedPolicy = "idle";
-    settings = {
-      experimental-features = ["nix-command" "flakes"];
-      builders-use-substitutes = true;
-    };
-  };
-}

hosts/sarien/nix/default.nix

@@ -1,7 +0,0 @@
-{
-  imports = [
-    ./common.nix
-    ./substituters.nix
-    ./distributed-build.nix
-  ];
-}

hosts/sarien/nix/distributed-build.nix

@@ -1,30 +0,0 @@
-{
-  config,
-  inputs,
-  ...
-}: let
-  inherit (builtins) readFile;
-  inherit (config.networking) hostName;
-  inherit (config.sops) secrets;
-  inherit (inputs) mysecrets;
-  pubHost = readFile "${mysecrets}/ssh/ssh_host_ed25519_dunamis.base64";
-in {
-  nix = {
-    distributedBuilds = true;
-    buildMachines = [
-      {
-        hostName = "dunamis";
-        publicHostKey = pubHost;
-        sshKey = secrets."ssh-${hostName}-user".path;
-        sshUser = "nix-ssh";
-        supportedFeatures = [
-          "benchmark"
-          "big-parallel"
-          "kvm"
-          "nixos-test"
-        ];
-        system = "x86_64-linux";
-      }
-    ];
-  };
-}

hosts/sarien/nix/ssh-serve.nix

@@ -1,10 +0,0 @@
-{config, ...}: let
-  inherit (builtins) readFile;
-  inherit (config.users.users) user;
-in {
-  nix.sshServe = {
-    enable = true;
-    write = true;
-    keys = map (f: readFile f) user.openssh.authorizedKeys.keyFiles;
-  };
-}

hosts/sarien/nix/substituters.nix

@@ -1,16 +0,0 @@
-{
-  nix.settings = {
-    substituters = [
-      "https://cache.nixos.org/"
-      "https://chaotic-nyx.cachix.org/"
-      "https://cosmic.cachix.org/"
-      "https://nix-community.cachix.org/"
-    ];
-    trusted-public-keys = [
-      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-      "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
-      "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-    ];
-  };
-}

hosts/sarien/users/user/home-configuration.nix

@@ -1,7 +1 @@
-{
-  imports = [
-    ../../../dunamis/users/user/common.nix
-    ../../../dunamis/users/user/programs.nix
-    ../../../dunamis/users/user/flatpak.nix
-  ];
-}
+{flake, ...}: {imports = [flake.modules.shared.user];}

modules/home/desktop/common/default.nix

@@ -1,5 +1,4 @@
 {
   imports = [
-    ./xdg-userdirs.nix
   ];
 }

modules/home/desktop/common/xdg-userdirs.nix

@@ -1,17 +0,0 @@
-{config, ...}: let
-  inherit (config.home) homeDirectory;
-  home = f: "${homeDirectory}/${f}";
-in {
-  xdg.userDirs = {
-    enable = true;
-    createDirectories = true;
-    templates = home "temps";
-    publicShare = home "pub";
-    desktop = home "desktop";
-    download = home "downloads";
-    documents = home "docs";
-    pictures = home "pics";
-    videos = home "vids";
-    music = home "music";
-  };
-}

modules/home/desktop/default.nix

@@ -1,6 +1,6 @@
 {
   imports = [
-    ./common
+    # ./common
     ./cosmic
     ./gnome
     ./hyprland

modules/home/desktop/gnome/default.nix

@@ -1,4 +1,5 @@
 {
+  osConfig,
   config,
   pkgs,
   lib,
@@ -13,33 +14,63 @@ in {
       mkEnableOption "enable gnome desktop";
   };
   config = mkIf cfg.enable {
-    home.packages = with pkgs; [
-      gnomeExtensions.alphabetical-app-grid
-      gnomeExtensions.removable-drive-menu
-      gnomeExtensions.caffeine
-      gnomeExtensions.space-bar
-      gnomeExtensions.switcher
-      gnomeExtensions.tactile
-      gnomeExtensions.pano
-      gnomeExtensions.window-is-ready-remover
-      junction
-      celluloid
-      mission-center
-      dconf
-      pwvucontrol
-      wl-clipboard
-    ];
+    home.packages =
+      (with pkgs.gnomeExtensions; [
+        # extensions
+        alphabetical-app-grid
+        app-icons-taskbar
+        caffeine
+        pano
+        removable-drive-menu
+        space-bar
+        switcher
+        tactile
+        window-is-ready-remover
+      ])
+      ++ (with pkgs; [
+        # regular packages
+        junction
+        celluloid
+        mission-center
+        dconf
+        pwvucontrol
+        wl-clipboard
+      ]);
     programs.gnome-shell.extensions = [
       {package = pkgs.gnomeExtensions.alphabetical-app-grid;}
-
-      {package = pkgs.gnomeExtensions.removable-drive-menu;}
+      {package = pkgs.gnomeExtensions.app-icons-taskbar;}
       {package = pkgs.gnomeExtensions.caffeine;}
+      {package = pkgs.gnomeExtensions.pano;}
+      {package = pkgs.gnomeExtensions.removable-drive-menu;}
       {package = pkgs.gnomeExtensions.space-bar;}
       {package = pkgs.gnomeExtensions.switcher;}
       {package = pkgs.gnomeExtensions.tactile;}
-      {package = pkgs.gnomeExtensions.pano;}
       {package = pkgs.gnomeExtensions.window-is-ready-remover;}
     ];
+    gtk = {
+      enable = true;
+      iconTheme = let
+        name =
+          if (lib.strings.hasPrefix "gruvbox" osConfig.module.stylix.theme)
+          then "Gruvbox-Plus-Dark"
+          else if config.stylix.polarity == "dark"
+          then "Papirus-Dark"
+          else "Papirus-Light";
+        package =
+          if (lib.strings.hasPrefix "gruvbox" osConfig.module.stylix.theme)
+          then pkgs.gruvbox-plus-icons
+          else if (lib.strings.hasPrefix "rose-pine" osConfig.module.stylix.theme)
+          then pkgs.papirus-icon-theme.override {color = "indigo";}
+          else if (lib.strings.hasPrefix "nord" osConfig.module.stylix.theme)
+          then pkgs.papirus-icon-theme.override {color = "nordic";}
+          else pkgs.papirus-icon-theme;
+      in {inherit name package;};
+    };
+    qt = {
+      enable = true;
+      platformTheme.name = lib.mkForce "adwaita";
+    };
+
     dconf.settings = with lib.hm.gvariant; {
       "org/gnome/desktop/a11y/applications" = {
         screen-reader-enabled = false;
@@ -54,12 +85,12 @@ in {
 
       "org/gnome/desktop/input-sources" = {
         mru-sources = [(mkTuple ["xkb" "us"])];
-        sources = [(mkTuple ["xkb" "us"]) (mkTuple ["xkb" "ua"]) (mkTuple ["xkb" "us+colemak_dh"])];
+        # sources = [(mkTuple ["xkb" "us"]) (mkTuple ["xkb" "ua"]) (mkTuple ["xkb" "us+colemak_dh"])];
         xkb-options = ["terminate:ctrl_alt_bksp"];
       };
 
       "org/gnome/desktop/interface" = {
-        accent-color = "slate";
+        # accent-color = "slate";
         clock-show-seconds = true;
         color-scheme = "prefer-dark";
         enable-animations = true;
@@ -100,8 +131,8 @@ in {
         move-to-workspace-last = ["<Shift><Control><Super>End"];
         move-to-workspace-left = ["<Control><Super>Left"];
         move-to-workspace-right = ["<Control><Super>Right"];
-        switch-input-source = ["<Super>Escape"];
-        switch-input-source-backward = ["<Shift><Super>Escape"];
+        switch-input-source = ["<Super>Space"];
+        switch-input-source-backward = ["<Shift><Super>Space"];
         switch-to-workspace-1 = ["<Super>1"];
         switch-to-workspace-2 = ["<Super>2"];
         switch-to-workspace-3 = ["<Super>3"];
@@ -135,7 +166,18 @@ in {
       };
 
       "org/gnome/shell" = {
-        enabled-extensions = ["drive-menu@gnome-shell-extensions.gcampax.github.com" "caffeine@patapon.info" "AlphabeticalAppGrid@stuarthayhurst" "appindicatorsupport@rgcjonas.gmail.com" "user-theme@gnome-shell-extensions.gcampax.github.com" "tactile@lundal.io" "switcher@landau.fi" "pano@elhan.io" "space-bar@luchrioh"];
+        enabled-extensions = [
+          "AlphabeticalAppGrid@stuarthayhurst"
+          "appindicatorsupport@rgcjonas.gmail.com"
+          "aztaskbar@aztaskbar.gitlab.com"
+          "caffeine@patapon.info"
+          "drive-menu@gnome-shell-extensions.gcampax.github.com"
+          "pano@elhan.io"
+          "space-bar@luchrioh"
+          "switcher@landau.fi"
+          "tactile@lundal.io"
+          "user-theme@gnome-shell-extensions.gcampax.github.com"
+        ];
       };
 
       "org/gnome/shell/app-switcher" = {
@@ -167,6 +209,21 @@ in {
         workspace-indicator = true;
       };
 
+      "org/gnome/shell/extensions/aztaskbar" = with lib.hm.gvariant; {
+        favorites = true;
+        icon-size = 25;
+        icon-style = "REGULAR";
+        # intellihide = true;
+        main-panel-height = mkTuple [true 40];
+        position-offset = 4;
+        prefs-visible-page = "";
+        show-apps-button = mkTuple [true 0];
+        show-panel-activities-button = true;
+        show-weather-by-clock = "LEFT";
+        taskbar-spacing = 2;
+        # update-notifier-project-version = 30;
+      };
+
       "org/gnome/shell/extensions/tactile" = {
         background-color = "#${colors.base00}";
         border-color = "#${colors.base0D}";

modules/home/desktop/hyprland/hyprland.nix

@@ -0,0 +1,458 @@
+{
+  config,
+  osConfig,
+  perSystem,
+  launcher,
+  lockscreen,
+  # pkgs,
+  # lib,
+  ...
+}: let
+  inherit (config.lib.stylix) colors;
+  # inherit (lib) mkIf;
+  hostname = osConfig.networking.hostName;
+  cursorSize = config.stylix.cursor.size;
+  fontName = config.stylix.fonts.sansSerif.name;
+  keyboard =
+    if hostname == "eldrid"
+    then "chromeos"
+    else "platform";
+  xdgPictures =
+    config.xdg.userDirs.pictures;
+  # ifLaptop = mkIf (hostname != "dunamis");
+in {
+  enable = true;
+  systemd = {
+    enable = true;
+    variables = [
+      "--all"
+    ];
+  };
+  package = perSystem.hyprland.hyprland;
+  portalPackage = perSystem.hyprland.xdg-desktop-portal-hyprland;
+  # plugins = with pkgs.hyprlandPlugins; [
+  # hyprspace
+  # hy3
+  # hyprscroller
+  # ];
+  settings = {
+    input = {
+      kb_layout = "us,ua";
+      resolve_binds_by_sym =
+        if hostname == "dunamis"
+        then 0
+        else 1;
+      repeat_rate = 50;
+      repeat_delay = 300;
+      # mouse
+      accel_profile = "flat";
+      sensitivity = 0;
+    };
+    device = [
+      {
+        name = "ite-tech.-inc.-ite-device(8910)-keyboard";
+        kb_variant = "colemak_dh,";
+      }
+      {
+        name = "at-translated-set-2-keyboard";
+        kb_variant = "colemak_dh,";
+      }
+      {
+        name = "keyd-virtual-keyboard";
+        kb_variant = "colemak_dh,";
+      }
+    ];
+    xwayland.force_zero_scaling = true;
+    monitor = [
+      ", preferred, auto, 1"
+      "desc:AOC 27V2G5 0x0000026C, addreserved, 0, 300, 0, 0"
+      "desc:Samsung Electric Company S24R65x H4TMA03291, preferred, 0x0, 1, bitdepth, 10, vrr, 1"
+      "desc:Philips Consumer Electronics Company 27M2N5500 UK02418033254, 2560x1440@180.00Hz, 0x0, 1.3333333, bitdepth, 10, vrr, 1"
+      "desc:BOE 0x08E8, preferred, 1920x0, 1.2, bitdepth, 10"
+      "desc:LG Display 0x068B, preferred, 1920x0, 1.2, bitdepth, 10"
+      "desc:Chimei Innolux Corporation 0x1406, preferred, 1920x0, 1.2"
+      "desc:KDC 0x0000, preferred, 1920x0, 1.25"
+    ];
+    env = [
+      "ELECTRON_OZONE_PLATFORM_HINT,auto"
+      "QT_QPA_PLATFORM,wayland"
+      "QT_QPA_PLATFORMTHEME,gtk3"
+      "XCURSORSIZE,${toString cursorSize}"
+      "GSK_RENDERER,ngl"
+    ];
+    decoration = {
+      shadow.enabled = false;
+      # drop_shadow = false;
+      blur = {
+        size = 8;
+        passes = 3;
+      };
+      #  shadow_offset = "0 5";
+      #  "col.shadow" = "rgba(00000099)";
+      rounding = 12;
+    };
+    misc = {
+      font_family = fontName;
+      disable_splash_rendering = true;
+      disable_hyprland_logo = true;
+      # vfr = true;
+    };
+    bezier = [
+      "easeOutQuad, 0.25, 0.46, 0.45, 0.94"
+      "easeOutExpo, 0.19, 1, 0.22, 1"
+    ];
+    animation = [
+      "workspaces, 1, 3, easeOutExpo, slidefade 20%"
+      "windows, 1, 3, easeOutExpo, popin 80%"
+      "layers, 1, 2, easeOutExpo, fade"
+    ];
+    plugin = [
+      {
+        overview = {
+          gapsIn = 12;
+          gapsOut = 24;
+          exitOnClick = true;
+          centerAligned = true;
+          showNewWorkspace = false;
+          showEmptyWorkspace = false;
+          affectStrut = false;
+        };
+        hyprexpo = {
+          columns = 3;
+          gap_size = 8;
+          #bg_col = "rgb(111111)";
+          workspace_method = "first 1"; # [center/first] [workspace] e.g. first 1 or center m+1
+          enable_gesture = true; # laptop touchpad
+          gesture_fingers = 3; # 3 or 4
+          gesture_distance = 400; # how far is the "max"
+          gesture_positive = false; # positive = swipe down. Negative = swipe up.;
+        };
+      }
+      {
+        hy3 = {
+          autotile = true;
+          tab_first_window = false;
+          tabs = {
+            render_text = true;
+            height = 24;
+            padding = 8;
+            rounding = 8;
+            text_height = 14;
+            text_center = true;
+            text_font = fontName;
+
+            "col.active" = "0xff${colors.base00}";
+            "col.inactive" = "0xff${colors.base00}";
+            "col.urgent" = "0xff${colors.base00}";
+            "col.active.text" = "0xff${colors.base0D}";
+            "col.inactive.text" = "0xff${colors.base05}";
+            "col.urgent.text" = "0xff${colors.base09}";
+            "col.active.border" = "0xff${colors.base00}";
+            "col.inactive.border" = "0xff${colors.base00}";
+            "col.urgent.border" = "0xff${colors.base00}";
+          };
+        };
+      }
+      {
+        scroller = {
+          column_widths = "onethird onehalf twothirds one";
+          window_heights = "onethird onehalf twothirds one";
+          gesture_scroll_fingers = 3;
+          gesture_overview_fingers = 3;
+          jump_labels_font = fontName;
+          jump_labels_color = "0xff${colors.base0A}";
+        };
+      }
+    ];
+
+    dwindle = {
+      force_split = 2;
+      default_split_ratio = 1.2;
+    };
+    master = {
+      mfact = 0.6;
+    };
+
+    "$mod" = "SUPER";
+    "$modShift" = "$mod SHIFT";
+    "$modCtrl" = "$mod CTRL";
+    "$modShiftCtrl" = "$mod SHIFT CTRL";
+
+    "$left" = "N";
+    "$down" = "E";
+    "$up" = "I";
+    "$right" = "O";
+
+    "$terminal" = "ghostty";
+    "$launcher" = launcher;
+    "$screenLocker" = lockscreen;
+    "$webBrowser" = "io.github.zen_browser.zen";
+    "$clipboardManager" = "copyq menu";
+
+    general = {
+      "col.active_border" = "0xff${colors.base0D}";
+      "col.inactive_border" = "0xff${colors.base03}";
+      gaps_in = 4;
+      gaps_out = 8;
+      border_size = 3;
+      allow_tearing = true;
+      layout = "dwindle";
+    };
+    group = {
+      "col.border_active" = "0xff${colors.base0D}";
+      "col.border_inactive" = "0xff${colors.base03}";
+      "col.border_locked_active" = "0xff${colors.base0A}";
+      "col.border_locked_inactive" = "0xff${colors.base0F}";
+      groupbar = {
+        height = 16;
+        rounding = 0;
+        indicator_height = 0;
+        gradient_rounding = 4;
+        font_size = 14;
+        gradients = true;
+        font_family = fontName;
+        "text_color" = "0xff${colors.base00}";
+        "col.active" = "0xff${colors.base0D}";
+        "col.inactive" = "0xff${colors.base03}";
+      };
+    };
+    binds.scroll_event_delay = 0;
+    cursor.persistent_warps = true;
+
+    bind = [
+      "$mod, Return, exec, $terminal"
+      "$mod, Space, exec, $launcher"
+      # "$modShift, Space, exec, $launcher"
+      "$modCtrl, Q, killactive"
+      "$modCtrl, M, fullscreen"
+      "$modCtrl, G, togglefloating"
+      "$mod, G, pin"
+
+      "$mod, T, togglegroup"
+      "$mod, period, changegroupactive, f"
+      "$mod, comma, changegroupactive, b"
+      "$modCtrl, period, movewindoworgroup, r"
+      "$modCtrl, comma, movewindoworgroup, l"
+
+      "$mod, Tab, cyclenext,"
+      "$modShift, Tab, cyclenext, prev"
+      "$mod, Tab, bringactivetotop,"
+
+      "$modShift, U, focusurgentorlast"
+
+      "$modCtrl, L, exec, $screenLocker"
+      "$modCtrl, B, exec, $webBrowser"
+      "$modCtrl, V, exec, $clipboardManager"
+      "$modCtrl, K, focuswindow, title:(Meet:.*)"
+
+      # ", Print, exec, ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp -o -r -c '\#\#00000000')\" -t ppm - | ${pkgs.satty}/bin/satty --filename - --fullscreen --output-filename ${xdgPictures}/screenshots/satty-$(date '+%Y%m%d-%H:%M:%S').png"
+      ", Print, exec, hyprshot -z -m region -o ${xdgPictures}/screenshots -f screenshot-$(date '+%Y%m%d-%H:%M:%S').png"
+      "CTRL, Print, exec, hyprshot -z -m window -o ${xdgPictures}/screenshots -f screenshot-$(date '+%Y%m%d-%H:%M:%S').png"
+      "SHIFT, Print, exec, hyprshot -z -m output -o ${xdgPictures}/screenshots -f screenshot-$(date '+%Y%m%d-%H:%M:%S').png"
+      ## navigation
+      "$mod, $left, movefocus, l"
+      "$mod, $down, movefocus, d"
+      "$mod, $up, movefocus, u"
+      "$mod, $right, movefocus, r"
+      "$modShift, $left, workspace, e-1"
+      "$modShift, $right, workspace, e+1"
+      "$mod, left, movefocus, l"
+      "$mod, up, movefocus, u"
+      "$mod, down, movefocus, d"
+      "$mod, right, movefocus, r"
+      "$modShift, W, focuscurrentorlast"
+      "$mod, mouse_down, workspace, e-1"
+      "$mod, mouse_up, workspace, e+1"
+      "$modShift, left, workspace, e-1"
+      "$modShift, right, workspace, e+1"
+
+      "$modCtrl, $left, movewindow, l"
+      "$modCtrl, $down, movewindow, d"
+      "$modCtrl, $up, movewindow, u"
+      "$modCtrl, $right, movewindow, r"
+      "$modCtrl, left, movewindow, l"
+      "$modCtrl, up, movewindow, u"
+      "$modCtrl, down, movewindow, d"
+      "$modCtrl, right, movewindow, r"
+      # workspaces
+      "$mod, 1, workspace, 1"
+      "$mod, 2, workspace, 2"
+      "$mod, 3, workspace, 3"
+      "$mod, 4, workspace, 4"
+      "$mod, 5, workspace, 5"
+      "$mod, 6, workspace, 6"
+      "$mod, 7, workspace, 7"
+      "$mod, 8, workspace, 8"
+      "$mod, 9, workspace, 9"
+      "$mod, 0, togglespecialworkspace"
+
+      "$modShiftCtrl, 1, movetoworkspace, 1"
+      "$modShiftCtrl, 2, movetoworkspace, 2"
+      "$modShiftCtrl, 3, movetoworkspace, 3"
+      "$modShiftCtrl, 4, movetoworkspace, 4"
+      "$modShiftCtrl, 5, movetoworkspace, 5"
+      "$modShiftCtrl, 6, movetoworkspace, 6"
+      "$modShiftCtrl, 7, movetoworkspace, 7"
+      "$modShiftCtrl, 8, movetoworkspace, 8"
+      "$modShiftCtrl, 9, movetoworkspace, 9"
+      "$modShiftCtrl, 0, movetoworkspace, special"
+
+      "$mod, Q, workspace, 1"
+      "$mod, W, workspace, 2"
+      "$mod, F, workspace, 3"
+      "$mod, P, workspace, 4"
+      "$mod, B, workspace, 5"
+      "$mod, J, workspace, 6"
+      "$mod, L, workspace, 7"
+      "$mod, U, workspace, 8"
+      "$mod, Y, workspace, 9"
+      "$mod, apostrophe, togglespecialworkspace"
+
+      "$modShiftCtrl, Q, movetoworkspace, 1"
+      "$modShiftCtrl, W, movetoworkspace, 2"
+      "$modShiftCtrl, F, movetoworkspace, 3"
+      "$modShiftCtrl, P, movetoworkspace, 4"
+      "$modShiftCtrl, B, movetoworkspace, 5"
+      "$modShiftCtrl, J, movetoworkspace, 6"
+      "$modShiftCtrl, L, movetoworkspace, 7"
+      "$modShiftCtrl, U, movetoworkspace, 8"
+      "$modShiftCtrl, Y, movetoworkspace, 9"
+      "$modShiftCtrl, apostrophe, movetoworkspace, special"
+
+      "$modShiftCtrl, $left, movetoworkspace, e-1"
+      "$modShiftCtrl, $right, movetoworkspace, e+1"
+      "$modShiftCtrl, left, movetoworkspace, e-1"
+      "$modShiftCtrl, right, movetoworkspace, e+1"
+
+      ''$mod ALT, mouse_down, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor * 1.25}')"''
+      ''$mod ALT, mouse_up, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor / 1.25}')"''
+      "$mod ALT, mouse:274, exec, hyprctl keyword cursor:zoom_factor 1" # middle wheel click
+    ];
+    # binde = [
+    #   "$mod, comma, resizeactive, -10 0"
+    #   "$mod, period, resizeactive, 10 0"
+    #   "$modShift, comma, resizeactive, 0 -10"
+    #   "$modShift, period, resizeactive, 0 10"
+    # ];
+    bindl = [
+      "$mod, Escape, exec, hyprctl switchxkblayout all next"
+      ", switch:on:Lid Switch, exec, hyprctl keyword monitor 'eDP-1, disable'"
+      ", switch:off:Lid Switch, exec, hyprctl keyword monitor 'eDP-1, preferred, 1920x0, 1.2'"
+      ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
+      ", XF86AudioPlay, exec, playerctl play-pause"
+      ", XF86AudioPrev, exec, playerctl previous"
+      ", XF86AudioNext, exec, playerctl next"
+      "$modShiftCtrl ALT, Q, exit"
+    ];
+    binde = [
+      ", XF86MonBrightnessUp, exec, brightnessctl s 5%+"
+      ", XF86MonBrightnessDown, exec, brightnessctl s 5%-"
+      "ALT, XF86MonBrightnessUp, exec, brightnessctl s 5%+ -d ${keyboard}::kbd_backlight"
+      "ALT, XF86MonBrightnessDown, exec, brightnessctl s 5%- -d ${keyboard}::kbd_backlight"
+      ", XF86KbdBrightnessUp, exec, brightnessctl s 5%+ -d ${keyboard}::kbd_backlight"
+      ", XF86KbdBrightnessDown, exec, brightnessctl s 5%- -d ${keyboard}::kbd_backlight"
+      ", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
+      ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
+    ];
+    bindm = [
+      "$mod, mouse:272, movewindow"
+      "$mod, mouse:273, resizewindow"
+      "$mod ALT, mouse:272, resizewindow"
+    ];
+    gestures = {
+      workspace_swipe = true;
+      workspace_swipe_fingers = 3;
+      workspace_swipe_distance = 300;
+    };
+
+    workspace = [
+      "1, defaultName:general"
+      "2, defaultName:web"
+      "3, defaultName:chat"
+      "4, defaultName:code"
+      "5, defaultName:uni"
+      "6, defaultName:games"
+      "7, defaultName:system"
+      "8, defaultName:media"
+      "9, defaultName:tray"
+      # "10, defaultName:"
+    ];
+    windowrulev2 = [
+      ## tray/misc utilities
+      # file picker
+      "float, class:xdg-desktop-portal-gtk"
+      "size <50% <90%, class:xdg-desktop-portal-gtk"
+      "center 1, class:xdg-desktop-portal-gtk"
+      # xdp-hyprland stream picker
+      "float, initialTitle:MainPicker"
+      # general apps
+      "float, class:(com.saivert.pwvucontrol)"
+      "float, class:(re.sonny.Junction)"
+      "float, class:(com.github.hluk.copyq)"
+      "float, class:(nm-connection-editor)"
+      "float, class:(.blueman-manager-wrapped)"
+      # telegram
+      "maximize, initialTitle:Медіапереглядач"
+      "noborder, title:TelegramDesktop"
+      "keepaspectratio, title:TelegramDesktop"
+      "noblur, title:TelegramDesktop"
+      "float, title:TelegramDesktop"
+      "pin, title:TelegramDesktop"
+      # any chromium-based
+      "noborder, title:Картинка в картинці"
+      "keepaspectratio, title:Картинка в картинці"
+      "noblur, title:Картинка в картинці"
+      "float, title:Картинка в картинці"
+      "pin, title:Картинка в картинці"
+      # and firefox
+      "noborder, title:Picture-in-Picture"
+      "keepaspectratio, title:Picture-in-Picture"
+      "noblur, title:Picture-in-Picture"
+      "float, title:Picture-in-Picture"
+      "pin, title:Picture-in-Picture"
+      # screenshot editor
+      "noanim, class:com.gabm.satty"
+      "float, class:com.gabm.satty"
+      "rounding 0, class:com.gabm.satty"
+      "size 100% 100%, class:com.gabm.satty"
+      "move 0 0, class:com.gabm.satty"
+      "pin, class:com.gabm.satty"
+      ## games
+      "float, class:(com.mojang.minecraft.java-edition)"
+      "immediate, class:(com.mojang.minecraft.java-edition)"
+      # cs2
+      "immediate, class:(cs2)"
+      # deadlock
+      # "float, class:(steam_app_1422450)"
+      "fullscreen, class:(steam_app_1422450)"
+      "immediate, class:(steam_app_1422450)"
+      "immediate, initialTitle:(Ghostrunner)"
+      # dead by daylight
+      "immediate, class:deadbydaylight-egs-shipping.exe"
+      ## workspace assignments
+      "workspace name:chat, class:org.telegram.desktop"
+      "workspace name:chat, class:org.signal.Signal"
+      "workspace name:chat, class:im.riot.Riot"
+      "workspace name:chat, class:WebCord"
+
+      "workspace name:games, class:com.heroicgameslauncher.hgl"
+      "workspace name:games, class:net.lutris.Lutris"
+      "workspace name:games, class:steam"
+      # "workspace name:game, class:"
+    ];
+  };
+  extraConfig = ''
+    bind = $modShift, R, submap, resize
+    submap = resize
+    binde = , right, resizeactive, 10 0
+    binde = , left, resizeactive, -10 0
+    binde = , up, resizeactive, 0 -10
+    binde = , down, resizeactive, 0 10
+    binde = , $right, resizeactive, 10 0
+    binde = , $left, resizeactive, -10 0
+    binde = , $up, resizeactive, 0 -10
+    binde = , $down, resizeactive, 0 10
+    bind = , escape, submap, reset
+    submap = reset
+  '';
+}

modules/home/desktop/hyprland/programs/default.nix

@@ -0,0 +1,23 @@
+{
+  osConfig,
+  config,
+  inputs,
+  pkgs,
+  lib,
+  ...
+}: let
+  inherit (lib) mkIf mkDefault getExe;
+  inherit (config.lib.stylix) colors;
+  inherit (osConfig.networking) hostName;
+  ifLaptop = mkIf (hostName != "dunamis");
+in {
+  imports = with inputs; [
+    walker.homeManagerModules.default
+  ];
+  options = config.desktop.hyprland.enable {
+    # programs.fuzzel = import ./fuzzel {inherit config mkDefault;};
+    programs.walker = import ./walker {inherit config inputs pkgs;};
+    programs.waybar = import ./waybar {inherit colors config getExe ifLaptop pkgs;};
+    programs.hyprlock = import ./hyprlock {inherit config pkgs;};
+  };
+}