From 6ab03d4cb5f4c9b4f328121d25b7e57ac2a9000d Mon Sep 17 00:00:00 2001
From: Bart van der Braak <bart@vanderbraak.nl>
Date: Sun, 26 Jan 2025 22:26:33 +0100
Subject: [PATCH 1/3] Make VIM default editor

---
 dotfiles/.gitconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dotfiles/.gitconfig b/dotfiles/.gitconfig
index 71123ff..675627d 100644
--- a/dotfiles/.gitconfig
+++ b/dotfiles/.gitconfig
@@ -17,6 +17,7 @@
 [core]
 	excludesfile = ~/.gitignore
 	pager = delta
+	editor = vim
 
 [interactive]
     diffFilter = delta --color-only
@@ -37,4 +38,4 @@
 	required = true
 
 [includeIf "gitdir:~/Repos/projects.blender.org/"]
-    path = ~/.config/git/blender.gitconfig
\ No newline at end of file
+    path = ~/.config/git/blender.gitconfig

From cce1e33c23dbc95068bc6721a419345cc1d95998 Mon Sep 17 00:00:00 2001
From: Bart van der Braak <bart@vanderbraak.nl>
Date: Thu, 6 Feb 2025 14:13:22 +0100
Subject: [PATCH 2/3] Ollama and update

---
 nixos/flake.lock         |  6 +++---
 nixos/modules/ollama.nix | 16 ++++++++++++++++
 nixos/users.nix          |  4 ----
 3 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 nixos/modules/ollama.nix

diff --git a/nixos/flake.lock b/nixos/flake.lock
index e38ab50..6c155df 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -39,11 +39,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1737404254,
-        "narHash": "sha256-L8Lxp/WVdy9gKO2cXptphdP8cMsnGvZF5Noj8N3jLzI=",
+        "lastModified": 1738804720,
+        "narHash": "sha256-3bAR5ALk5AoFt4BlsQRdjSV6VVH6lbgtYdElb0A+qDc=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "f8ef9c97ac2f49d5c04dbf3b3d80a0490c05fefb",
+        "rev": "7868f1c54b7f8e09be194aaa0934791596df1ea1",
         "type": "github"
       },
       "original": {
diff --git a/nixos/modules/ollama.nix b/nixos/modules/ollama.nix
new file mode 100644
index 0000000..630b521
--- /dev/null
+++ b/nixos/modules/ollama.nix
@@ -0,0 +1,16 @@
+{ ... }:
+
+{
+  # Add Ollama and OpenWebUI
+  services.ollama = {
+    enable = true;
+    loadModels = [ deepseek-r1:32b ];
+    acceleration = "rocm";
+    rocmOverrideGfx = "11.0.0";
+    environmentVariables = {
+      HSA_OVERRIDE_GFX_VERSION = "11.0.0";
+    };
+  };
+  
+  services.open-webui.enable = true;
+}
diff --git a/nixos/users.nix b/nixos/users.nix
index 7142b56..f1866e8 100644
--- a/nixos/users.nix
+++ b/nixos/users.nix
@@ -71,9 +71,5 @@
   virtualisation.docker = {
     enable = true;
     enableOnBoot = false;
-    rootless = {
-      enable = true;
-      setSocketVariable = true;
-    };
   };
 }

From 619995114504b1f9d6fa9907f85243d2c620297d Mon Sep 17 00:00:00 2001
From: Bart van der Braak <bart@vanderbraak.nl>
Date: Thu, 6 Feb 2025 14:14:12 +0100
Subject: [PATCH 3/3] Add ungoogled chromium

---
 nixos/users.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/users.nix b/nixos/users.nix
index f1866e8..88f42e2 100644
--- a/nixos/users.nix
+++ b/nixos/users.nix
@@ -12,6 +12,7 @@
     ];
     packages = with pkgs; [
       vscodium
+      ungoogled-chromium
       thunderbird
       fastfetch
       ghostty