Merge branch 'main' of github.com:LarssonMartin1998/.dotfiles

flake.nix

@@ -133,36 +133,54 @@
 
       darwinConfigurations =
         let
-          baseDarwinConfig = makeSystemConfig {
-            name = "darwin";
-            system = "aarch64-darwin";
-            builder = nix-darwin.lib.darwinSystem;
-            extraModules = [
-              ./nix/system/darwin.nix
-              nix-homebrew.darwinModules.nix-homebrew
-              {
-                nix-homebrew = {
-                  enable = true;
-                  enableRosetta = true;
-                  user = "larssonmartin1998-mac";
-                  taps = {
-                    "homebrew/core" = homebrew-core;
-                    "homebrew/cask" = homebrew-cask;
-                    "homebrew/bundle" = homebrew-bundle;
-                    "nikitabobko/tap" = homebrew-nikitabobko;
+          makeDarwinSystem =
+            {
+              name,
+              user,
+              extraModules ? [ ],
+            }:
+            makeSystemConfig {
+              inherit name;
+              system = "aarch64-darwin";
+              builder = nix-darwin.lib.darwinSystem;
+
+              extraModules = [
+                ./nix/system/darwin.nix
+                nix-homebrew.darwinModules.nix-homebrew
+                {
+                  nix-homebrew = {
+                    enable = true;
+                    enableRosetta = true;
+                    user = user; # pass the user parameter
+                    taps = {
+                      "homebrew/core" = homebrew-core;
+                      "homebrew/cask" = homebrew-cask;
+                      "homebrew/bundle" = homebrew-bundle;
+                      "nikitabobko/tap" = homebrew-nikitabobko;
+                    };
+                    mutableTaps = false;
                   };
-                  mutableTaps = true;
-                };
-              }
-            ];
-            specialArgs = {
-              self = self;
+                }
+              ] ++ extraModules;
+
+              specialArgs = {
+                self = self;
+              };
             };
-          };
         in
         {
-          "darwin" = baseDarwinConfig;
-          "darwin_work" = baseDarwinConfig;
+          darwin = makeDarwinSystem {
+            name = "darwin";
+            user = "larssonmartin1998-mac";
+          };
+
+          darwin_work = makeDarwinSystem {
+            name = "darwin_work";
+            user = "martin.larsson";
+            extraModules = [
+              ./nix/system/darwin_work.nix
+            ];
+          };
         };
 
       homeConfigurations = {
@@ -187,7 +205,10 @@
         "darwin" = makeHomeConfig {
           name = "darwin";
           system = "aarch64-darwin";
-          extraModules = [ ./nix/pkgs/darwin.nix ];
+          extraModules = [
+            ./nix/pkgs/darwin.nix
+            ./nix/pkgs/darwin_personal.nix
+          ];
         };
 
         "darwin_work" = makeHomeConfig {

nix/home.nix

@@ -23,8 +23,6 @@
       jq
       starship
       fastfetch
-      clang
-      clang-tools
       nixfmt-rfc-style
       luajit
       zoxide

nix/local_home.nix

@@ -6,7 +6,7 @@
   # accordingly, and then commit it.
   home = {
     # Stub values for demonstration. Override these in local branch.
-    username = "nixos";
-    homeDirectory = "/home/nixos";
+    username = "martin.larsson";
+    homeDirectory = "/Users/martin.larsson";
   };
 }

nix/local_system.nix

@@ -3,6 +3,8 @@
 }:
 {
   system = {
-    stateVersion = "24.11";
+    stateVersion = 5;
   };
+  
+  nix-homebrew.user = "martin.larsson";
 }

nix/pkgs/darwin_personal.nix

@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+{
+  home = {
+    packages = with pkgs; [
+      clang
+      clang-tools
+    ];
+  };
+
+}

nix/pkgs/darwin_work.nix

@@ -8,6 +8,8 @@
       ]))
       pcre
       ccache
+      mkdocs
     ];
   };
+
 }

nix/pkgs/home.nix

@@ -112,8 +112,6 @@ in
       ninja
       tldr
       nerd-fonts.caskaydia-mono
-      clang
-      clang-tools
       lldb
       nodejs
       tree-sitter

nix/pkgs/linux.nix

@@ -4,6 +4,8 @@
     packages = with pkgs; [
       wl-clipboard-rs
       sway
+      clang
+      clang-tools
     ];
     file = {
       ".config/sway".source = ../sway;

nix/pkgs/wsl.nix

@@ -3,6 +3,8 @@
   home = {
     packages = with pkgs; [
       wslu
+      clang
+      clang-tools
     ];
   };
 }

nix/system/darwin.nix

@@ -65,7 +65,7 @@
       enableKeyMapping = true;
       nonUS.remapTilde = true;
       remapCapsLockToEscape = true;
-      swapLeftCtrlAndFn = true;
+      swapLeftCtrlAndFn = false;
     };
     activationScripts.applications.text =
       let

nix/system/darwin_work.nix

@@ -0,0 +1,11 @@
+{
+  ...
+}:
+{
+  homebrew = {
+    brews = [
+      "openjdk"
+      "llvm"
+    ];
+  };
+}

nvim/lua/format_handler.lua

@@ -27,7 +27,7 @@ function M.setup()
     end
 
     utils.set_keymap_list({
-        { "<leader>ff", function() M.format() end },
+        { "<leader>ff", function() M.format(true) end },
         { "<leader>fe", function() M.format_enable() end },
         { "<leader>fd", function() M.format_disable() end },
     })

nvim/lua/plugs/treesitter.lua

@@ -49,6 +49,7 @@ return {
                 "python",
                 "latex",
                 "typst",
+                "ruby",
             },
             sync_install = false,
             -- This can be updated to a list of languages instead of defaulting to true