nixconf

commit 07dcbbec071f08b6497771908e959abe5616046a
parent 81ba977e7d8ebfd417de2ade12f06470cffd05c0
Author: Milutin Popovic <milutin@popovic.xyz>
Date:   Fri, 10 Apr 2026 23:17:35 +0100

use nvim repo

Diffstat:
M
modules/dotfiles.nix
 | 
9
++++++++-
M
modules/systemd-services.nix
 | 
2
+-
M
users/mika.nix
 | 
7
++++++-
M
users/r2d2.nix
 | 
9
+++++++--
M
users/root.nix
 | 
13
+++++++++----

5 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/modules/dotfiles.nix b/modules/dotfiles.nix
@@ -2,6 +2,13 @@
   dotfiles = builtins.fetchGit {
     url = "git://popovic.xyz/dots.git";
     ref = "master";
-    rev = "7d5ac0291469188e5ccba679876726cc970a5da3";
+    rev = "363cea507239c8ffcb81ef12f7e19060286ad475";
+
+  };
+  nvim-config = builtins.fetchGit {
+    url = "git://popovic.xyz/nvim.config.git";
+    ref = "master";
+    rev = "a10499f8a7a4abe1c0d079b5b4bd4fe1470815d9";
+
   };
 }
diff --git a/modules/systemd-services.nix b/modules/systemd-services.nix
@@ -45,7 +45,7 @@
 
       Service = {
         Type = "oneshot";
-        ExecStart = "${pkgs.bash}/bin/bash -lc '%h/.local/bin/scripts/niri-wakeup-monitors'";
+        ExecStart = "${pkgs.bash}/bin/zsh -c 'niri-wakeup-monitors'";
       };
 
       Install = {
diff --git a/users/mika.nix b/users/mika.nix
@@ -13,7 +13,7 @@ let
   packageSets = import ../modules/packages.nix { inherit pkgs isDarwin; };
 
   link = config.lib.file.mkOutOfStoreSymlink;
-  inherit (import ../modules/dotfiles.nix) dotfiles;
+  inherit (import ../modules/dotfiles.nix) dotfiles nvim-config;
   configDirs = builtins.attrNames (builtins.readDir "${dotfiles}/.config");
 in
 {
@@ -58,6 +58,11 @@ in
         recursive = true;
         force = true;
       };
+      ".config/nvim" = {
+        source = link "${nvim-config}";
+        recursive = true;
+        force = true;
+      };
       ".config/nix-zsh-plugins.zsh".text = ''
         source ${pkgs.zsh-fast-syntax-highlighting}/share/zsh/plugins/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh
         source ${pkgs.zsh-system-clipboard}/share/zsh/zsh-system-clipboard/zsh-system-clipboard.zsh
diff --git a/users/r2d2.nix b/users/r2d2.nix
@@ -9,7 +9,7 @@ let
   packageSets = import ../modules/packages.nix { inherit pkgs; };
 
   link = config.lib.file.mkOutOfStoreSymlink;
-  inherit (import ../modules/dotfiles.nix) dotfiles;
+  inherit (import ../modules/dotfiles.nix) dotfiles nvim-config;
   configDirs = builtins.attrNames (builtins.readDir "${dotfiles}/.config");
 in
 {
@@ -38,13 +38,18 @@ in
         source = config.lib.file.mkOutOfStoreSymlink "${dotfiles}/${path}";
         recursive = true;
       };
+      mkNvimfileLink = path: {
+        source = config.lib.file.mkOutOfStoreSymlink "${nvim-config}";
+        recursive = true;
+        force = true;
+      };
     in
     {
       ".zshenv" = mkDotfileLink ".zshenv";
       ".config/zsh/.zshrc" = mkDotfileLink ".config/zsh/.zshrc";
       ".config/shell" = mkDotfileLink ".config/shell";
       ".config/git" = mkDotfileLink ".config/git";
-      ".config/nvim" = mkDotfileLink ".config/nvim";
+      ".config/nvim" = mkNvimfileLink ".config/nvim";
       ".config/nix-zsh-plugins.zsh".text = ''
         source ${pkgs.zsh-fast-syntax-highlighting}/share/zsh/plugins/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh
         source ${pkgs.zsh-system-clipboard}/share/zsh/zsh-system-clipboard/zsh-system-clipboard.zsh
diff --git a/users/root.nix b/users/root.nix
@@ -4,7 +4,7 @@
   ...
 }:
 let
-  inherit (import ../modules/dotfiles.nix) dotfiles;
+  inherit (import ../modules/dotfiles.nix) dotfiles nvim-config;
 in
 {
   environment.pathsToLink =
@@ -34,6 +34,11 @@ in
                 recursive = true;
                 force = true;
               };
+              mkNvimfileLink = path: {
+                source = config.lib.file.mkOutOfStoreSymlink "${nvim-config}";
+                recursive = true;
+                force = true;
+              };
             in
             {
               # zsh no plugins
@@ -47,9 +52,9 @@ in
               ".local/bin/.keep".text = "";
 
               # nvim no plugins
-              ".config/nvim/init.lua" = mkDotfileLink ".config/nvim/init.lua";
-              ".config/nvim/after" = mkDotfileLink ".config/nvim/after";
-              ".config/nvim/lua/config" = mkDotfileLink ".config/nvim/lua/config";
+              ".config/nvim/init.lua" = mkNvimfileLink ".config/nvim/init.lua";
+              ".config/nvim/after" = mkNvimfileLink ".config/nvim/after";
+              ".config/nvim/lua/config" = mkNvimfileLink ".config/nvim/lua/config";
             };
         }
         // lib.optionalAttrs (!isDarwin) {