nixos-dots

commit 5a3ccc6699e655d4cb2249f5f4b1dc7c85707568
parent e1ed8667c7b7a505733c8d3ad5d37b554ab6db9d
Author: Milutin Popovic <milutin@popovic.xyz>
Date:   Tue, 10 Mar 2026 21:43:02 +0000

bump

Diffstat:
M
flake.nix
 | 
2
++
M
modules/nix_settings.nix
 | 
1
+
M
modules/packages.nix
 | 
5
++---
M
users/mika.nix
 | 
8
+++++++-
M
users/root.nix
 | 
2
+-

5 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/flake.nix b/flake.nix
@@ -154,6 +154,7 @@
             ./system/hardware/vm.nix
             {
               home-manager = {
+                backupFileExtension = true;
                 useGlobalPkgs = true;
                 useUserPackages = true;
                 extraSpecialArgs = {
@@ -185,6 +186,7 @@
             ./system/host/mac.nix
             {
               home-manager = {
+                backupFileExtension = true;
                 useGlobalPkgs = true;
                 useUserPackages = true;
                 extraSpecialArgs = {
diff --git a/modules/nix_settings.nix b/modules/nix_settings.nix
@@ -6,6 +6,7 @@
   nix = {
     enable = true;
     package = pkgs.nix;
+    channel.enable = false;
     settings = {
       use-xdg-base-directories = true;
       experimental-features = [ "nix-command" "flakes" ];
diff --git a/modules/packages.nix b/modules/packages.nix
@@ -170,14 +170,13 @@ with pkgs; {
     cmake
     gnumake
     gcc
-    npm
+    nodejs_25
     pnpm
 
     # Languages and runtimes
     libclang
-    nodejs
     luarocks
-    javaPackages.compiler.openjdk25
+    javaPackages.compiler.openjdk17
     lua5_1
     go
     ruby
diff --git a/users/mika.nix b/users/mika.nix
@@ -41,10 +41,14 @@ in
     );
 
     file = {
-      ".zshenv".source = link "${dotfiles}/.zshenv";
+      ".zshenv" = {
+        source = link "${dotfiles}/.zshenv";
+        force = true;
+      };
       ".local" = {
         source = link "${dotfiles}/.local";
         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
@@ -54,6 +58,7 @@ in
       "/Users/mika/Applications" = {
         source = link "/Users/mika/Applications/Home Manager Apps/";
         recursive = true;
+        force = true;
       };
     };
   } // lib.optionalAttrs (!isDarwin || standalone){
@@ -88,6 +93,7 @@ in
     lib.genAttrs filteredDirs (dir: {
       source = link "${dotfiles}/.config/${dir}";
       recursive = true;
+      force = true;
     });
 
 }
diff --git a/users/root.nix b/users/root.nix
@@ -1,5 +1,4 @@
 {
-  pkgs,
   lib,
   isDarwin ? false,
   ...
@@ -25,6 +24,7 @@ in {
           mkDotfileLink = path: {
             source = config.lib.file.mkOutOfStoreSymlink "${dotfiles}/${path}";
             recursive = true;
+            force = true;
           };
         in {
           # zsh no plugins