nixconf

commit 4a71a58cf32eb86937ffa422162376756e0231ef
parent d892c7d36270c2584927808a7c6809f94a5c1597
Author: Milutin Popovic <milutin@popovic.xyz>
Date:   Sat,  4 Apr 2026 16:42:16 +0100

renamings

Diffstat:
M
hosts/frame/configuration.nix
 | 
2
+-
M
hosts/mac/configuration.nix
 | 
2
+-
M
hosts/server/configuration.nix
 | 
2
+-
M
modules/dotfiles.nix
 | 
2
+-
D
modules/mbsync_timer.nix
 | 
50
--------------------------------------------------
M
modules/niri.nix
 | 
2
+-
R
modules/nix_settings.nix -> modules/nix-settings.nix
 | 
0

A
modules/systemd-services.nix
 | 
50
++++++++++++++++++++++++++++++++++++++++++++++++++
M
users/mika.nix
 | 
4
++--

9 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/hosts/frame/configuration.nix b/hosts/frame/configuration.nix
@@ -9,7 +9,7 @@
 {
   imports = [
     ../../users/root.nix
-    ../../modules/nix_settings.nix
+    ../../modules/nix-settings.nix
     ../../modules/nm.nix
   ];
 
diff --git a/hosts/mac/configuration.nix b/hosts/mac/configuration.nix
@@ -12,7 +12,7 @@
 
   imports = [
     ../../users/root.nix
-    ../../modules/nix_settings.nix
+    ../../modules/nix-settings.nix
   ];
 
   environment.variables = {
diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix
@@ -6,7 +6,7 @@
 {
   imports = [
     ../../users/root.nix
-    ../../modules/nix_settings.nix
+    ../../modules/nix-settings.nix
   ];
 
   system.stateVersion = "25.11";
diff --git a/modules/dotfiles.nix b/modules/dotfiles.nix
@@ -2,6 +2,6 @@
   dotfiles = builtins.fetchGit {
     url = "git://popovic.xyz/dots.git";
     ref = "master";
-    rev = "77e6504385113bb99ed92200909f6fb3e42bf210";
+    rev = "253da659e61c816340357e02e20205fcc51bf0e0";
   };
 }
diff --git a/modules/mbsync_timer.nix b/modules/mbsync_timer.nix
@@ -1,50 +0,0 @@
-{ pkgs, ... }:
-{
-  systemd.user = {
-    startServices = "sd-switch";
-    services.mbsync = {
-      Unit = {
-        Description = "Mailbox sync service";
-        RefuseManualStart = "no";
-        RefuseManualStop = "yes";
-      };
-      Service = {
-        Type = "oneshot";
-        ExecStart = "${pkgs.zsh}/bin/zsh -c 'mbsync -c .config/isync/mbsyncrc -a -q'";
-      };
-      Install = {
-        wantedBy = [ "default.target" ];
-      };
-    };
-    timers.mbsync = {
-      Unit = {
-        Description = "Mailbox sync timer";
-        RefuseManualStop = "no";
-        RefuseManualStart = "no";
-      };
-      Timer = {
-        Persistent = false;
-        OnBootSec = "0.3m";
-        OnUnitActiveSec = "0.5m";
-        Unit = "mbsync.service";
-      };
-      Install = {
-        WantedBy = [ "timers.target" ];
-      };
-    };
-    services.monitor-wakeup = {
-      Unit = {
-        Description = "Wake up external monitors after sleep/hiberanate";
-        RefuseManualStart = "no";
-        RefuseManualStop = "yes";
-      };
-      Service = {
-        Type = "oneshot";
-        ExecStart = "${pkgs.zsh}/bin/zsh -c 'zsh .local/bin/scripts/niri-wakeup-monitors'";
-      };
-      Install = {
-        wantedBy = [ "default.target" ];
-      };
-    };
-  };
-}
diff --git a/modules/niri.nix b/modules/niri.nix
@@ -225,7 +225,7 @@
 
           {
             command = [
-              "sh"
+              "zsh"
               "niri-monitors"
             ];
           }
diff --git a/modules/nix_settings.nix b/modules/nix-settings.nix
diff --git a/modules/systemd-services.nix b/modules/systemd-services.nix
@@ -0,0 +1,50 @@
+{ pkgs, ... }:
+{
+  systemd.user = {
+    startServices = "sd-switch";
+    services.mbsync = {
+      Unit = {
+        Description = "Mailbox sync service";
+        RefuseManualStart = "no";
+        RefuseManualStop = "yes";
+      };
+      Service = {
+        Type = "oneshot";
+        ExecStart = "${pkgs.zsh}/bin/zsh -c 'mbsync -c .config/isync/mbsyncrc -a -q'";
+      };
+      Install = {
+        wantedBy = [ "default.target" ];
+      };
+    };
+    timers.mbsync = {
+      Unit = {
+        Description = "Mailbox sync timer";
+        RefuseManualStop = "no";
+        RefuseManualStart = "no";
+      };
+      Timer = {
+        Persistent = false;
+        OnBootSec = "0.3m";
+        OnUnitActiveSec = "0.5m";
+        Unit = "mbsync.service";
+      };
+      Install = {
+        WantedBy = [ "timers.target" ];
+      };
+    };
+    services.monitor-wakeup = {
+      Unit = {
+        Description = "Wake up external monitors after sleep/hiberanate";
+        RefuseManualStart = "no";
+        RefuseManualStop = "yes";
+      };
+      Service = {
+        Type = "oneshot";
+        ExecStart = "${pkgs.zsh}/bin/zsh -c 'zsh .local/bin/scripts/niri-wakeup-monitors'";
+      };
+      Install = {
+        WantedBy = [ "default.target" ];
+      };
+    };
+  };
+}
diff --git a/users/mika.nix b/users/mika.nix
@@ -77,7 +77,7 @@ in
   ++ lib.optionals (!isDarwin) [
     ../modules/theme.nix
     ../modules/xdg.nix
-    ../modules/mbsync_timer.nix
+    ../modules/systemd-services.nix
   ]
   ++ lib.optionals (isWayland) [
     ../modules/niri.nix
@@ -85,7 +85,7 @@ in
     ../modules/noctalia.nix
   ]
   ++ lib.optionals (standalone) [
-    ../modules/nix_settings.nix
+    ../modules/nix-settings.nix
   ];
 
   xdg.configFile =