nixos-dots

commit f079d86e48b376ae97909e9ad3b3c31f163fb17d
parent 004d73d2624cba68919ba769dfc398c00f194de1
Author: Milutin Popovic <milutin@popovic.xyz>
Date:   Sun,  8 Mar 2026 11:24:28 +0100

update mac config

Diffstat:
M
.gitignore
 | 
1
+
M
.sops.yaml
 | 
0

M
flake.lock
 | 
0

M
flake.nix
 | 
7
+++++--
M
justfile
 | 
2
+-
M
lib/dotfiles.nix
 | 
0

M
modules/firefox.nix
 | 
4
++--
M
modules/mbsync_timer.nix
 | 
0

M
modules/nix_settings.nix
 | 
0

M
modules/nm.nix
 | 
0

M
modules/packages.nix
 | 
0

M
modules/theme.nix
 | 
0

M
modules/xdg.nix
 | 
0

M
secrets.yaml
 | 
0

M
system/disk/disk-vm.nix
 | 
0

M
system/hardware/hardware-frame.nix
 | 
0

M
system/hardware/hardware-vm.nix
 | 
0

M
system/host/host-frame.nix
 | 
0

M
system/host/host-server.nix
 | 
0

M
system/host/mac.nix
 | 
5
+++--
M
users/mika.nix
 | 
12
+++++-------
M
users/r2d2.nix
 | 
0

M
users/root.nix
 | 
0

23 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 *qcow2
 result
+.DS_Store
diff --git a/.sops.yaml b/.sops.yaml
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -169,8 +169,11 @@
       mika =
         let
           system = builtins.currentSystem;
-          pkgs   = nixpkgs.legacyPackages.${system};
-          isDarwin = builtins.currentSystem == "aarch64-darwin";
+          pkgs =
+            if system == darwinSystem
+            then pkgsDarwin
+            else pkgsLinux;
+          isDarwin = system == darwinSystem;
         in
         home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
diff --git a/justfile b/justfile
@@ -14,7 +14,7 @@ os_rollback:
     sudo nixos-rebuild switch --flake --rollback
 
 hm:
-    home-manager switch -b backup --flake ./#{{user}}
+    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
diff --git a/modules/firefox.nix b/modules/firefox.nix
@@ -23,7 +23,7 @@
       frame = {
         id = 0;
         name = "frame";
-        isDefault = false;
+        isDefault = true;
         settings = {
           "browser.toolbars.bookmarks.visibility" = "always";
           "browser.download.start_downloads_in_tmp_dir" = false;
@@ -33,7 +33,7 @@
       mulmon = {
         id = 1;
         name = "mulmon";
-        isDefault = true;
+        isDefault = false;
         settings = {
           "layout.css.devPixelsPerPx" = 0.9;
           "browser.toolbars.bookmarks.visibility" = "always";
diff --git a/modules/mbsync_timer.nix b/modules/mbsync_timer.nix
diff --git a/modules/nix_settings.nix b/modules/nix_settings.nix
diff --git a/modules/nm.nix b/modules/nm.nix
diff --git a/modules/packages.nix b/modules/packages.nix
diff --git a/modules/theme.nix b/modules/theme.nix
diff --git a/modules/xdg.nix b/modules/xdg.nix
diff --git a/secrets.yaml b/secrets.yaml
diff --git a/system/disk/disk-vm.nix b/system/disk/disk-vm.nix
diff --git a/system/hardware/hardware-frame.nix b/system/hardware/hardware-frame.nix
diff --git a/system/hardware/hardware-vm.nix b/system/hardware/hardware-vm.nix
diff --git a/system/host/host-frame.nix b/system/host/host-frame.nix
diff --git a/system/host/host-server.nix b/system/host/host-server.nix
diff --git a/system/host/mac.nix b/system/host/mac.nix
@@ -126,7 +126,7 @@
         show-recents = false;
         showhidden = true;
         persistent-apps = [ ];
-        tilesize = 30;
+        tilesize = 50;
         wvous-bl-corner = 1;
         wvous-br-corner = 1;
         wvous-tl-corner = 1;
@@ -136,10 +136,11 @@
     keyboard = {
       enableKeyMapping = true;
       # Remap §± to ~
+      nonUS.remapTilde = true;
       userKeyMapping = [
         {
-          HIDKeyboardModifierMappingDst = 30064771125;
           HIDKeyboardModifierMappingSrc = 30064771172;
+          HIDKeyboardModifierMappingDst = 30064771125;
         }
       ];
     };
diff --git a/users/mika.nix b/users/mika.nix
@@ -50,8 +50,8 @@ in
         source ${pkgs.zsh-system-clipboard}/share/zsh/zsh-system-clipboard/zsh-system-clipboard.zsh
       '';
     };
-  } // lib.optionalAttrs (!isDarwin ){
-    homeDirectory = "/home/mika/";
+  } // lib.optionalAttrs (!isDarwin || standalone){
+    homeDirectory = if isDarwin then "/Users/mika" else "/home/mika/";
   };
 
   programs.kitty = lib.mkIf isDarwin {
@@ -71,11 +71,9 @@ in
       ../modules/mbsync_timer.nix
       ../modules/firefox.nix
     ]
-    ++ lib.optionals standalone [
-      ../modules/xdg.nix
-      ../modules/nix_settings.nix
-    ]
-    ++ lib.optional (!isDarwin) [ ../modules/theme.nix ];
+    ++ lib.optionals standalone [ ../modules/nix_settings.nix ]
+    ++ lib.optionals (!isDarwin) [ ../modules/theme.nix ]
+    ++ lib.optionals (!isDarwin && standalone)  [../modules/xdg.nix];
 
   xdg.configFile = let
     filteredDirs = builtins.filter (dir: dir != "systemd") configDirs;
diff --git a/users/r2d2.nix b/users/r2d2.nix
diff --git a/users/root.nix b/users/root.nix