nixos-dots

commit 2fb002e6a018a19333931c1126dc9d0c72d324bf
parent 7ae17f9713a180ed992483a19df8a48c0f8ecf79
Author: Milutin Popovic <milutin@popovic.xyz>
Date:   Wed, 25 Mar 2026 20:58:46 +0000

add niri

Diffstat:
M
flake.nix
 | 
2
++
M
machines/frame/configuration.nix
 | 
2
++
A
modules/kitty.nix
 | 
15
+++++++++++++++
A
modules/niri.nix
 | 
37
+++++++++++++++++++++++++++++++++++++
M
users/mika.nix
 | 
56
++++++++------------------------------------------------

5 files changed, 64 insertions(+), 48 deletions(-)
diff --git a/flake.nix b/flake.nix
@@ -10,6 +10,8 @@
     nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
 
+    niri.url = "github:sobidoo/niri-flake";
+
     betterfox.url = "github:HeitorAugustoLN/betterfox-nix";
 
     sops-nix = {
diff --git a/machines/frame/configuration.nix b/machines/frame/configuration.nix
@@ -3,6 +3,7 @@
   lib,
   hostName,
   isDarwin,
+  inputs,
   ...
 }:
 {
@@ -182,6 +183,7 @@
 
   # packages
   nixpkgs.config.allowUnfree = true;
+  nixpkgs.overlays = [ inputs.niri.overlays.niri ];
   environment.systemPackages = with pkgs; [
     neovim
     wget
diff --git a/modules/kitty.nix b/modules/kitty.nix
@@ -0,0 +1,15 @@
+{ ... }:
+{
+  programs.kitty = {
+    enable = true;
+    font = {
+      name = "Terminess Nerd Font";
+      size = 18;
+    };
+    settings = {
+      background_opacity = 0.93;
+      confirm_os_window_close = 0;
+      touch_scroll_multiplier = 1.0;
+    };
+  };
+}
diff --git a/modules/niri.nix b/modules/niri.nix
@@ -0,0 +1,37 @@
+{ inputs, ... }:
+{
+  inports = [ inputs.niri.homeModules.niri ];
+  programs.niri.settings = {
+    enable = true;
+    prefer-no-csd = false;
+    layout = {
+      focus-ring = {
+        width = 2;
+      };
+    };
+    input = {
+      focus-follows-mouse.enable = true;
+      keyboard = {
+        xkb = {
+          layout = "us,de";
+          model = "pc104";
+          options = "grp:shifts_toggle";
+        };
+        repeat-rate = 50;
+        repeat-delay = 200;
+      };
+      touchpad = {
+        natural-scroll = false;
+        tap = true;
+      };
+      mouse = {
+        accel-profile = "flat";
+      };
+    };
+    binds = {
+      "Mod+Return".action.spawn = "alacritty";
+      "XF86AudioRaiseVolume".action.spawn-sh = "wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%+";
+      "XF86AudioLowerVolume".action.spawn-sh = "wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%-";
+    };
+  };
+}
diff --git a/users/mika.nix b/users/mika.nix
@@ -2,6 +2,7 @@
   config,
   pkgs,
   lib,
+  inputs,
   standalone ? false,
   isDarwin ? pkgs.stdenv.isDarwin,
   ...
@@ -19,6 +20,7 @@ in
     if standalone then
       {
         config.allowUnfree = true;
+        overlays = [ inputs.niri.overlays.niri ];
       }
     else
       { };
@@ -65,61 +67,19 @@ in
     homeDirectory = if isDarwin then "/Users/mika" else "/home/mika";
   };
 
-  programs.kitty = lib.mkIf isDarwin {
-    enable = true;
-    font = {
-      name = "Terminess Nerd Font";
-      size = 18;
-    };
-    settings = {
-      background_opacity = 0.93;
-      confirm_os_window_close = 0;
-      touch_scroll_multiplier = 1.0;
-    };
-  };
-
-  #  programs.niri.settings = {
-  #    prefer-no-csd = false;
-  #    layout = {
-  #      focus-ring = {
-  #        width = 2;
-  #      };
-  #    };
-  #    input = {
-  #      focus-follows-mouse.enable = true;
-  #      keyboard = {
-  #        xkb = {
-  #          layout = "us,de";
-  #          model = "pc104";
-  #          options = "grp:shifts_toggle";
-  #        };
-  #        repeat-rate = 50;
-  #        repeat-delay = 200;
-  #      };
-  #      touchpad = {
-  #        natural-scroll = false;
-  #        tap = true;
-  #      };
-  #      mouse = {
-  #        accel-profile = "flat";
-  #      };
-  #    };
-  #    binds = {
-  #      "Mod+Return".action.spawn = "alacritty";
-  #      "XF86AudioRaiseVolume".action.spawn-sh = "wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%+";
-  #      "XF86AudioLowerVolume".action.spawn-sh = "wpctl set-volume -l 1.4 @DEFAULT_AUDIO_SINK@ 5%-";
-  #    };
-  #  };
-
   imports = [
-    ../modules/mbsync_timer.nix
     ../modules/firefox.nix
   ]
+  ++ lib.optionals (isDarwin) [
+    ../modules/kitty.nix
+  ]
   ++ lib.optionals (!isDarwin) [
     ../modules/theme.nix
     ../modules/xdg.nix
+    ../modules/mbsync_timer.nix
+    ../modules/niri.nix
   ]
-  ++ lib.optionals standalone [
+  ++ lib.optionals (standalone) [
     ../modules/nix_settings.nix
   ];