From 409fe1ae735721843777ee5d3ca56b66347e467e Mon Sep 17 00:00:00 2001
From: elwrcl <elwerici@icloud.com>
Date: Fri, 7 Aug 2026 03:41:35 +0300
Subject: [PATCH] idk

---
 hosts/copland.ulu.nix                          |  2 ++
 modules/nixos/common/common-packages.ulu.nix   | 18 ++++++++----------
 .../nixos/desktop/desktop-niri-package.ulu.nix |  8 ++++++++
 modules/nixos/hw/hw-graphics.ulu.nix           |  1 -
 4 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 modules/nixos/desktop/desktop-niri-package.ulu.nix

diff --git a/hosts/copland.ulu.nix b/hosts/copland.ulu.nix
index f96d1da..95f7af9 100644
--- a/hosts/copland.ulu.nix
+++ b/hosts/copland.ulu.nix
@@ -55,6 +55,7 @@ in
               config.flake.homeModules.home-easyeffects
               config.flake.homeModules.home-discord
               config.flake.homeModules.desktop-niri-home
+              config.flake.homeModules.desktop-niri-package
               config.flake.homeModules.desktop-niri-env
               config.flake.homeModules.desktop-niri-execs
               config.flake.homeModules.desktop-niri-general
@@ -88,6 +89,7 @@ in
       config.flake.nixosModules.service-ssh
       config.flake.nixosModules.common-locale
       config.flake.nixosModules.common-nix
+      config.flake.nixosModules.common-nix-access-tokens
       config.flake.nixosModules.common-fonts
       config.flake.nixosModules.common-kmscon
       config.flake.nixosModules.desktop-display
diff --git a/modules/nixos/common/common-packages.ulu.nix b/modules/nixos/common/common-packages.ulu.nix
index 9bd2476..38de028 100644
--- a/modules/nixos/common/common-packages.ulu.nix
+++ b/modules/nixos/common/common-packages.ulu.nix
@@ -16,18 +16,15 @@
       environment.systemPackages = with pkgs; [
         # apps
         onlyoffice-desktopeditors
-        whatsapp-electron
         telegram-desktop
         prismlauncher
         moonlight-qt
         qbittorrent
-        antigravity
         obs-studio
         localsend
         picotool
         sunshine
         spotify
-        equibop
         heroic
         loupe
         gimp
@@ -64,9 +61,9 @@
         libimobiledevice
         android-tools
         uxplay-fixed
+        simple-mtpfs
         usbmuxd
         libmtp
-        jmtpfs
         scrcpy
         ifuse
 
@@ -77,23 +74,24 @@
         claude-code
 
         # cli
+        agenix-cli
         fastfetch
-        trash-cli
-        lazyjj
-        jj-fzf
-        meld
-        jujutsu
         tailscale
+        trash-cli
         dos2unix
+        jujutsu
         autossh
         ani-cli
-        zoxide
         cachix
+        lazyjj
         direnv
+        jj-fzf
+        zoxide
         rsync
         unzip
         kitty
         tree
+        meld
         tldr
         perf
         file
diff --git a/modules/nixos/desktop/desktop-niri-package.ulu.nix b/modules/nixos/desktop/desktop-niri-package.ulu.nix
new file mode 100644
index 0000000..a304e5b
--- /dev/null
+++ b/modules/nixos/desktop/desktop-niri-package.ulu.nix
@@ -0,0 +1,8 @@
+{ ... }:
+{
+  flake.homeModules.desktop-niri-package =
+    { pkgs, ... }:
+    {
+      programs.niri.package = pkgs.niri;
+    };
+}
diff --git a/modules/nixos/hw/hw-graphics.ulu.nix b/modules/nixos/hw/hw-graphics.ulu.nix
index ce1459a..c668ef7 100644
--- a/modules/nixos/hw/hw-graphics.ulu.nix
+++ b/modules/nixos/hw/hw-graphics.ulu.nix
@@ -12,7 +12,6 @@
 
       amd = {
         hardware.graphics.extraPackages = with pkgs; [
-          amdvlk
           rocmPackages.clr.icd
         ];