nixos-dots

commit bfbd882db59f24df2ad9cd3b7a963b3924d05209
parent 4201d8fa91cf1bf8bac1c768d966052cc31cbbb1
Author: Milutin Popovic <milutin@popovic.xyz>
Date:   Sat,  7 Mar 2026 15:21:45 +0100

fix darwin config

Diffstat:
M
flake.nix
 | 
3
+++
M
modules/firefox.nix
 | 
6
+++---
M
system/host/mac.nix
 | 
4
+---
M
users/mika.nix
 | 
11
++++++-----
M
users/root.nix
 | 
20
+++++++++++---------

5 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/flake.nix b/flake.nix
@@ -144,6 +144,7 @@
         nix-darwin.lib.darwinSystem {
           specialArgs = {
             inherit hostName systemName inputs;
+            isDarwin = true;
           };
           modules = [
             home-manager.darwinModules.home-manager
@@ -156,6 +157,7 @@
                 extraSpecialArgs = {
                   inherit system inputs;
                   standalone = false;
+                  isDarwin = true;
                 };
                 users.mika = import ./users/mika.nix;
               };
@@ -176,6 +178,7 @@
           extraSpecialArgs = {
             inherit system inputs;
             standalone = true;
+            isDarwin = true;
           };
         };
     };
diff --git a/modules/firefox.nix b/modules/firefox.nix
@@ -1,4 +1,4 @@
-{ inputs, ... }:
+{ inputs, isDarwin, ... }:
 {
   imports = [ inputs.betterfox.homeModules.betterfox ];
 
@@ -27,7 +27,7 @@
         settings = {
           "browser.toolbars.bookmarks.visibility" = "always";
           "browser.download.start_downloads_in_tmp_dir" = false;
-          "browser.download.lastDir" = "/home/mika";
+          "browser.download.lastDir" = if isDarwin then "/User/mika" else "/home/mika";
         };
       };
       mulmon = {
@@ -39,7 +39,7 @@
           "browser.toolbars.bookmarks.visibility" = "always";
           "browser.download.useDownloadDir" = true;
           "browser.download.start_downloads_in_tmp_dir" = false;
-          "browser.download.lastDir" = "/home/mika";
+          "browser.download.lastDir" = if isDarwin then "/User/mika" else "/home/mika";
         };
       };
     };
diff --git a/system/host/mac.nix b/system/host/mac.nix
@@ -1,4 +1,5 @@
 {
+  lib,
   pkgs,
   hostName,
   systemName,
@@ -62,17 +63,14 @@
   homebrew = {
     enable = true;
     brewPrefix = "/opt/homebrew";
-
     taps = [
       "homebrew/cask"
       "homebrew/cask-fonts"
     ];
-
     brews = [
       "fzf"
       "ripgrep"
     ];
-
     onActivation = {
       autoUpdate = true;
       upgrade = true;
diff --git a/users/mika.nix b/users/mika.nix
@@ -2,7 +2,8 @@
   config,
   pkgs,
   lib,
-  standalone,
+  standalone ? false,
+  isDarwin ? pkgs.stdenv.isDarwin,
   ...
 }:
 let
@@ -16,11 +17,11 @@ in
 {
   home = {
     username = "mika";
-    homeDirectory = "/home/mika";
-    stateVersion = "25.11";
+    homeDirectory = if isDarwin then "/Users/mika" else "/home/mika";
+    stateVersion = if isDarwin then "25.05" else "25.11";
   };
 
-  kitty = lib.mkIf (pkgs.stdenv.isDarwin) {
+  programs.kitty = lib.mkIf isDarwin {
     enable = true;
     font = {
       name = "Terminess Nerd Font";
@@ -40,7 +41,7 @@ in
       ../modules/xdg.nix
       ../modules/nix_settings.nix
     ]
-    ++ lib.optional (!pkgs.stdenv.isDarwin) ../modules/theme.nix;
+    ++ lib.optional (!isDarwin) [ ../modules/theme.nix ];
 
   nixpkgs = if standalone
   then {
diff --git a/users/root.nix b/users/root.nix
@@ -1,25 +1,27 @@
 {
+  pkgs,
+  lib,
+  isDarwin ? false,
   ...
 }: let
     inherit ( import ../lib/dotfiles.nix ) dotfiles;
 in {
-  environment.pathsToLink = [
+  environment.pathsToLink = if (!isDarwin)
+    then [
     "/share/applications"
-    "/share/xdg-desktop-portal"
-  ];
+    /share/xdg-desktop-portal
+  ] else [];
+
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
 
-
     users.root = { pkgs, config, ... }: {
       home.username = "root";
-      home.homeDirectory = "/root";
-      home.stateVersion = "25.11";
+      home.homeDirectory = if isDarwin then  "/var/root" else "/root";
+      home.stateVersion = if isDarwin then "25.05" else "25.11";
 
-      imports = [
-        ../modules/xdg.nix
-      ];
+      imports = [ ] ++ lib.optionals (!isDarwin) [ ../modules/xdg.nix ];
 
       home.file = let
         mkDotfileLink = path: {