update niri, rename openmw, remove cat-discord, refactor flake inputs

flake.lock

@@ -85,22 +85,6 @@
         "type": "github"
       }
     },
-    "catppuccin-discord": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1769446491,
-        "narHash": "sha256-7v1Hu6QofOyFOGnHeqHFK0JsxUxdJ9uTjI7nM7mdTsg=",
-        "owner": "catppuccin",
-        "repo": "discord",
-        "rev": "f235754322320211a8646d963466fac402e5c297",
-        "type": "github"
-      },
-      "original": {
-        "owner": "catppuccin",
-        "repo": "discord",
-        "type": "github"
-      }
-    },
     "flake-compat": {
       "locked": {
         "lastModified": 1761640442,
@@ -230,14 +214,12 @@
     },
     "niri": {
       "inputs": {
-        "niri-stable": [
+        "niri-stable": "niri-stable",
-          "niri-blur"
-        ],
         "niri-unstable": [
           "niri-blur"
         ],
         "nixpkgs": [
-          "nixpkgs"
+          "nixpkgs-unstable"
         ],
         "nixpkgs-stable": [
           "nixpkgs-stable"
@@ -277,6 +259,23 @@
         "type": "github"
       }
     },
+    "niri-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1756556321,
+        "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "ref": "v25.08",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
     "nix-cachyos-kernel": {
       "inputs": {
         "cachyos-kernel": "cachyos-kernel",
@@ -486,7 +485,6 @@
         "apple-silicon": "apple-silicon",
         "base16": "base16",
         "base16-discord": "base16-discord",
-        "catppuccin-discord": "catppuccin-discord",
         "home-manager": "home-manager",
         "niri": "niri",
         "niri-blur": "niri-blur",

flake.nix

@@ -8,14 +8,9 @@
     # edit this to switch between stable and unstable
     nixpkgs.follows = "nixpkgs-unstable";
 
-    nix-cachyos-kernel = {
+    nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release";
-      url = "github:xddxdd/nix-cachyos-kernel/release";
+    apple-silicon.url = "github:nix-community/nixos-apple-silicon";
-      # inputs.nixpkgs.follows = "nixpkgs";
+    base16.url = "github:SenchoPens/base16.nix";
-    };
-
-    base16 = {
-      url = "github:SenchoPens/base16.nix";
-    };
 
     tt-schemes = {
       url = "github:tinted-theming/schemes/b9f335ad6a0b7d85b9c2eb932c3215f7429f7d11";
@@ -40,9 +35,8 @@
 
     niri = {
       url = "github:sckova/niri-flake/feat/blur";
-      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
       inputs.nixpkgs-stable.follows = "nixpkgs-stable";
-      inputs.niri-stable.follows = "niri-blur";
       inputs.niri-unstable.follows = "niri-blur";
     };
 
@@ -71,20 +65,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    apple-silicon = {
-      url = "github:nix-community/nixos-apple-silicon";
-      # inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     openmw = {
       url = "gitlab:OpenMW/openmw";
       flake = false;
     };
-
-    catppuccin-discord = {
-      url = "github:catppuccin/discord";
-      flake = false;
-    };
   };
 
   outputs =
@@ -92,6 +76,7 @@
       nixpkgs,
       nixpkgs-unstable,
       nix-cachyos-kernel,
+      apple-silicon,
       base16,
       tt-schemes,
       base16-discord,
@@ -102,9 +87,7 @@
       spicetify-nix,
       nur,
       nixvim,
-      apple-silicon,
       openmw,
-      catppuccin-discord,
       ...
     }:
     let
@@ -148,7 +131,6 @@
                   nur.overlays.default
                   (final: prev: {
                     openmw-git = openmw;
-                    catppuccin-discord-git = catppuccin-discord;
                     base16-discord-git = base16-discord;
                   })
                   (import ./packages/overlay.nix)

home/apps/discord.nix

@@ -4,12 +4,9 @@
   ...
 }:
 let
-  catppuccin-discord = "${pkgs.catppuccin-discord}/share/catppuccin-discord/catppuccin-mocha-*.theme.css";
-
   mergedThemes = pkgs.runCommand "mergedConfig" { } ''
     mkdir -p $out
     cp -rvf ${pkgs.base16-discord-git}/base16.css $out/base16.css
-    cp -rvf ${catppuccin-discord} $out
   '';
 
   vesktopSettings = {

home/games/morrowind.nix

@@ -3,7 +3,7 @@
   ...
 }:
 {
-  home.packages = with pkgs; [ openmw ];
+  home.packages = with pkgs; [ openmw-unstable ];
   home.sessionVariables.SDL_VIDEO_DRIVER = "wayland";
 
   programs.firefox.profiles.default.search.engines.uesp = {

home/tiling/noctalia.nix

@@ -68,7 +68,7 @@
         showCapsule = true;
         barType = "simple";
         capsuleColorKey = "none";
-        capsuleOpacity = 1;
+        capsuleOpacity = 0.90;
         displayMode = "always_visible";
         floating = false;
         marginHorizontal = 5;

packages/catppuccin-discord/default.nix

@@ -1,56 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchYarnDeps,
-  yarn,
-  nodejs,
-  fixup-yarn-lock,
-  nodePackages,
-  catppuccin-discord-git,
-}:
-stdenv.mkDerivation rec {
-  pname = "catppuccin-discord";
-  version = "unstable-${catppuccin-discord-git.rev}";
-
-  src = catppuccin-discord-git;
-
-  yarnOfflineCache = fetchYarnDeps {
-    yarnLock = "${src}/yarn.lock";
-    hash = "sha256-BhE3aKyA/LBErjWx+lbEVb/CIXhqHkXbV+9U2djIBhs=";
-  };
-
-  nativeBuildInputs = [
-    yarn
-    nodejs
-    fixup-yarn-lock
-    nodePackages.sass
-  ];
-
-  postPatch = ''
-    substituteInPlace package.json \
-      --replace-fail "--no-charset --no-source-map" ""
-  '';
-
-  configurePhase = ''
-    export HOME=$TMPDIR
-    yarn config --offline set yarn-offline-mirror ${yarnOfflineCache}
-    fixup-yarn-lock yarn.lock
-    yarn install --offline --frozen-lockfile --ignore-scripts --ignore-platform
-  '';
-
-  buildPhase = ''
-    yarn --offline release
-  '';
-
-  installPhase = ''
-    mkdir -p $out/share/catppuccin-discord
-    cp -r dist/dist/* $out/share/catppuccin-discord/
-  '';
-
-  meta = {
-    description = "Soothing pastel theme for Discord";
-    homepage = "https://github.com/catppuccin/discord";
-    license = lib.licenses.mit;
-    platforms = lib.platforms.all;
-  };
-}

packages/overlay.nix

@@ -1,11 +1,7 @@
 final: prev: {
   spotify-webapp = final.callPackage ./spotify-webapp { };
 
-  catppuccin-discord = final.callPackage ./catppuccin-discord {
+  openmw-unstable = prev.openmw.overrideAttrs (oldAttrs: {
-    inherit (final) catppuccin-discord-git;
-  };
-
-  openmw = prev.openmw.overrideAttrs (oldAttrs: {
     pname = "openmw";
     src = final.openmw-git;
     version = "${final.openmw-git.rev}";