nixos-dots

commit 8bcbbb366148640fe900824f21685fc961f5442b
parent f3635b0392f4667f99d1aacba210c1d7f8a178c1
Author: Milutin Popovic <milutin@popovic.xyz>
Date:   Sat, 28 Mar 2026 09:25:34 +0000

bump

Diffstat:
M
justfile
 | 
20
++++----------------
M
lib/dotfiles.nix
 | 
2
+-
M
modules/alacitty.nix
 | 
2
+-
M
modules/niri.nix
 | 
21
++++++++++++---------
M
modules/noctalia.nix
 | 
21
++++-----------------
M
users/mika.nix
 | 
2
+-

6 files changed, 23 insertions(+), 45 deletions(-)
diff --git a/justfile b/justfile
@@ -1,14 +1,8 @@
 hostname := `hostname`
 user := `whoami`
 
-os wayland:
-    IS_WAYLAND=1 sudo nixos-rebuild switch --flake ./#{{hostname}} --impure --show-trace
-
-os xorg:
-    sudo nixos-rebuild switch --flake ./#{{hostname}} --impure --show-trace
-
-os:
-    sudo nixos-rebuild switch --flake ./#{{hostname}} --impure --show-trace
+os target="xorg":
+    sudo {{ if target == "wayland" { "IS_WAYLAND=1 " } else { "" } }} nixos-rebuild switch --flake ./#{{hostname}} --impure --show-trace
 
 darwin:
     sudo darwin-rebuild switch --flake ./#{{hostname}} --impure
@@ -19,14 +13,8 @@ darwin_rollback:
 os_rollback:
     sudo nixos-rebuild switch --flake --rollback
 
-hm:
-    home-manager switch -b backup --flake ./#{{user}} --impure
-
-hm wayland:
-    IS_WAYLAND=1 home-manager switch -b backup --flake ./#{{user}} --impure
-
-hm xorg:
-    home-manager switch -b backup --flake ./#{{user}} --impure
+hm target="xorg":
+    {{ if target == "wayland" { "IS_WAYLAND='1' " } else { "" } }}home-manager switch -b backup --flake ./#{{user}} --impure
 
 gc:
     sudo nix-collect-garbage --delete-older-than 7d
diff --git a/lib/dotfiles.nix b/lib/dotfiles.nix
@@ -2,6 +2,6 @@
   dotfiles = builtins.fetchGit {
     url = "git://popovic.xyz/dots.git";
     ref = "master";
-    rev = "bd02e6caeb77dd35d41672df3c4d8654ba2e6bb3";
+    rev = "211e377b24ab0cf7e6583678d358239cca20278a";
   };
 }
diff --git a/modules/alacitty.nix b/modules/alacitty.nix
@@ -11,7 +11,7 @@
           x = 2;
           y = 2;
         };
-        opacity = 0.98;
+        opacity = 0.99;
       };
 
       font = {
diff --git a/modules/niri.nix b/modules/niri.nix
@@ -18,22 +18,25 @@
       in
       {
         prefer-no-csd = true;
+        hotkey-overlay.skip-at-startup = true;
 
         window-rules = [
           {
-            open-maximized = true;
-          }
-          {
             matches = [ { app-id = "spotify"; } ];
             open-on-workspace = "9";
+            open-maximized = true;
           }
           {
             matches = [ { app-id = "Alacritty"; } ];
-            opacity = 0.9;
+            opacity = 0.92;
           }
           {
-            matches = [ { app-id = "Firefox"; } ];
-            open-on-workspace = "9";
+            matches = [ { app-id = "firefox"; } ];
+            open-maximized = true;
+          }
+          {
+            matches = [ { app-id = "telegram"; } ];
+            open-maximized = true;
           }
         ];
         binds = {
@@ -49,6 +52,7 @@
           "Mod+Shift+W".action.spawn-sh = "${terminalCmd} -e nmtui";
           "Mod+M".action.spawn-sh = "TZ=Europe/Berlin ${terminalCmd} -e neomutt";
           "Mod+Shift+R".action.spawn-sh = "background";
+          "Mod+Shift+Slash".action.show-hotkey-overlay = { };
 
           "Mod+Shift+E".action.quit.skip-confirmation = true;
           "Mod+Shift+Q".action.close-window = { };
@@ -125,8 +129,7 @@
           );
         };
         layout = {
-          always-center-single-column = true;
-          default-column-width.proportion = 0.4;
+          default-column-width.proportion = 0.5;
           border = {
             enable = true;
             width = 4;
@@ -137,7 +140,7 @@
               color = "#263238";
             };
           };
-          gaps = 15;
+          gaps = 10;
           focus-ring = {
             enable = false;
           };
diff --git a/modules/noctalia.nix b/modules/noctalia.nix
@@ -60,7 +60,7 @@
               colorizeIcons = false;
               emptyColor = "none";
               enableScrollWheel = true;
-              focusedColor = "primary";
+              focusedColor = "none";
               followFocusedScreen = false;
               groupedBorderOpacity = 1;
               hideUnoccupied = false;
@@ -78,26 +78,16 @@
           ];
           right = [
             {
-              displayMode = "onhover";
-              iconColor = "none";
+              id = "NotificationHistory";
+            }
+            {
               id = "Bluetooth";
-              textColor = "none";
-              fontWeight = "bold";
             }
             {
-              displayMode = "onhover";
-              iconColor = "none";
               id = "Volume";
-              middleClickCommand = "pwvucontrol || pavucontrol";
-              textColor = "none";
-              fontWeight = "bold";
             }
             {
-              displayMode = "onhover";
-              iconColor = "none";
               id = "Network";
-              textColor = "none";
-              fontWeight = "bold";
             }
             {
               compactMode = false;
@@ -122,11 +112,8 @@
               fontWeight = "bold";
             }
             {
-              clockColor = "none";
               formatHorizontal = "HH:mm:ss";
-              formatVertical = "HH mm - dd MM";
               id = "Clock";
-              tooltipFormat = "HH:mm ddd, MMM dd";
               fontWeight = "bold";
             }
           ];
diff --git a/users/mika.nix b/users/mika.nix
@@ -44,7 +44,7 @@ in
         email
         development
       ]
-      ++ lib.optionals (!isDarwin || !isWayland) [ xorg ]
+      ++ lib.optionals (!isDarwin && !isWayland) [ xorg ]
       ++ lib.optionals (isWayland) [ wayland ]
     );