Merge pull request #2 from izaac/niri-migration

Niri migration

Author: izaac

README.md

@@ -6,9 +6,11 @@ Custom packages live in a separate [nix-packages](https://github.com/izaac/nix-p
 ## Overview
 
 - **OS:** NixOS (Branch: 25.11)
-- **DM:** cosmic-greeter (greetd)
-- **DE:** COSMIC (Epoch 1)
-- **Theme:** Catppuccin Mocha (Blue Accent, system-wide via catppuccin/nix)
+- **DM:** tuigreet (greetd) with YubiKey U2F
+- **Compositor:** [Niri](https://github.com/YaLTeR/niri) (scrollable-tiling Wayland) via [niri-flake](https://github.com/sodiboo/niri-flake) — unstable channel for xwayland-satellite
+- **Shell of the desktop:** Waybar (bar) + fuzzel (launcher) + mako (notifications) + swaylock-effects/swayidle (lock) + wlogout (power menu)
+- **File manager:** Nemo (+ file-roller, ffmpegthumbnailer)
+- **Theme:** Catppuccin Mocha Blue, system-wide via [Stylix](https://github.com/danth/stylix)
 - **Shell:** Brush (Rust bash-compatible) + Starship + Atuin + Zoxide
 - **Terminal:** WezTerm + Zellij
 - **Editor:** Helix
@@ -23,9 +25,14 @@ lib/               # mkSystem helper, user config
 hosts/             # Per-host configuration.nix + hardware
 modules/           # Reusable NixOS modules (mySystem.* options)
   core/            # Audio, codecs, nix-ld, performance, sops, maintenance
-  desktop/         # COSMIC DE, display manager
+  desktop/         # Niri compositor, tuigreet greeter, NVIDIA glue
   gaming/          # Steam, GameMode, sched-ext (SCX)
 home/              # Home Manager modules (per-app .nix files)
+  niri.nix         # Compositor config, keybinds, spawn-at-startup
+  waybar.nix       # Status bar
+  launcher.nix     # fuzzel launcher
+  notifications.nix # mako
+  screenlock.nix   # swaylock + swayidle
   shell/           # Split shell config (aliases, functions, packages)
 users/             # Per-user profile composition
 overlays/          # Package overrides

flake.lock

@@ -25,6 +25,10 @@
       url = "github:danth/stylix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    niri-flake = {
+      url = "github:sodiboo/niri-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     treefmt-nix = {
       url = "github:numtide/treefmt-nix";
       inputs.nixpkgs.follows = "nixpkgs";

flake.nix

@@ -1,10 +1,4 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: let
-  nix-packages = inputs.nix-packages.packages.${pkgs.stdenv.hostPlatform.system};
-in {
+{pkgs, ...}: {
   imports = [
     ./distrobox.nix
     ./wezterm.nix
@@ -34,7 +28,6 @@ in {
     monophony
     amberol # Simple Rust Music Player
     shortwave # Rust Internet Radio
-    nix-packages.ethereal-waves # COSMIC Music Player
 
     # General Software
     fragments # GTK Torrent Client (Rust)
@@ -43,8 +36,15 @@ in {
     sparrow
     ffmpeg-full
 
-    # COSMIC Extensions & Integration
-    cosmic-applets # Official System76 applet bundle
+    # File manager + archives + preview thumbnailers
+    nemo-with-extensions # Nemo + bundled extensions (image preview, etc.)
+    nemo-fileroller # Archive context-menu integration
+    file-roller # Archive manager
+    ffmpegthumbnailer # Video thumbnails for Nemo
+    webp-pixbuf-loader # WebP image thumbnails
+
+    # GUI text editor (honors GNOME prefer-dark via dconf)
+    gnome-text-editor
 
     # CD/DVD Backup & Cloning
     cdrtools # CLI: readcd, etc.
@@ -90,18 +90,18 @@ in {
         "x-scheme-handler/unknown" = ["brave-origin.desktop"];
 
         # Text
-        "text/plain" = ["com.system76.CosmicEdit.desktop"];
-        "text/markdown" = ["com.system76.CosmicEdit.desktop"];
-        "text/x-log" = ["com.system76.CosmicEdit.desktop"];
-
-        # Archives
-        "application/zip" = ["com.system76.CosmicFiles.desktop"];
-        "application/x-tar" = ["com.system76.CosmicFiles.desktop"];
-        "application/x-7z-compressed" = ["com.system76.CosmicFiles.desktop"];
-        "application/x-rar" = ["com.system76.CosmicFiles.desktop"];
-        "application/gzip" = ["com.system76.CosmicFiles.desktop"];
-        "application/x-bzip2" = ["com.system76.CosmicFiles.desktop"];
-        "application/x-xz" = ["com.system76.CosmicFiles.desktop"];
+        "text/plain" = ["org.gnome.TextEditor.desktop"];
+        "text/markdown" = ["org.gnome.TextEditor.desktop"];
+        "text/x-log" = ["org.gnome.TextEditor.desktop"];
+
+        # Archives (file-roller)
+        "application/zip" = ["org.gnome.FileRoller.desktop"];
+        "application/x-tar" = ["org.gnome.FileRoller.desktop"];
+        "application/x-7z-compressed" = ["org.gnome.FileRoller.desktop"];
+        "application/x-rar" = ["org.gnome.FileRoller.desktop"];
+        "application/gzip" = ["org.gnome.FileRoller.desktop"];
+        "application/x-bzip2" = ["org.gnome.FileRoller.desktop"];
+        "application/x-xz" = ["org.gnome.FileRoller.desktop"];
 
         # Video
         "video/mp4" = ["com.github.rafostar.Clapper.desktop"];
@@ -120,15 +120,15 @@ in {
         "video/vnd.rn-realvideo" = ["com.github.rafostar.Clapper.desktop"];
         "video/x-ms-wmv" = ["com.github.rafostar.Clapper.desktop"];
 
-        # Audio
-        "audio/mpeg" = ["com.system76.CosmicPlayer.desktop"];
-        "audio/flac" = ["com.system76.CosmicPlayer.desktop"];
-        "audio/x-wav" = ["com.system76.CosmicPlayer.desktop"];
-        "audio/ogg" = ["com.system76.CosmicPlayer.desktop"];
-        "audio/x-vorbis+ogg" = ["com.system76.CosmicPlayer.desktop"];
-        "audio/mp4" = ["com.system76.CosmicPlayer.desktop"];
-        "audio/x-flac" = ["com.system76.CosmicPlayer.desktop"];
-        "audio/x-mp3" = ["com.system76.CosmicPlayer.desktop"];
+        # Audio (Amberol)
+        "audio/mpeg" = ["io.bassi.Amberol.desktop"];
+        "audio/flac" = ["io.bassi.Amberol.desktop"];
+        "audio/x-wav" = ["io.bassi.Amberol.desktop"];
+        "audio/ogg" = ["io.bassi.Amberol.desktop"];
+        "audio/x-vorbis+ogg" = ["io.bassi.Amberol.desktop"];
+        "audio/mp4" = ["io.bassi.Amberol.desktop"];
+        "audio/x-flac" = ["io.bassi.Amberol.desktop"];
+        "audio/x-mp3" = ["io.bassi.Amberol.desktop"];
 
         # Documents / Images
         "application/pdf" = ["org.gnome.Papers.desktop"];
@@ -141,8 +141,8 @@ in {
         "image/bmp" = ["org.gnome.Loupe.desktop"];
         "image/tiff" = ["org.gnome.Loupe.desktop"];
 
-        # Directories (COSMIC Files)
-        "inode/directory" = ["com.system76.CosmicFiles.desktop"];
+        # Directories (Nemo)
+        "inode/directory" = ["nemo.desktop"];
       };
     };
   };

home/desktop.nix

@@ -0,0 +1,18 @@
+_: {
+  programs.fuzzel = {
+    enable = true;
+    settings = {
+      main = {
+        terminal = "wezterm";
+        layer = "overlay";
+        width = 40;
+        lines = 12;
+        prompt = "'> '";
+      };
+      border = {
+        radius = 8;
+        width = 2;
+      };
+    };
+  };
+}