diff --git a/dotfiles/.gitconfig b/dotfiles/.gitconfig index 675627d..71123ff 100644 --- a/dotfiles/.gitconfig +++ b/dotfiles/.gitconfig @@ -17,7 +17,6 @@ [core] excludesfile = ~/.gitignore pager = delta - editor = vim [interactive] diffFilter = delta --color-only @@ -38,4 +37,4 @@ required = true [includeIf "gitdir:~/Repos/projects.blender.org/"] - path = ~/.config/git/blender.gitconfig + path = ~/.config/git/blender.gitconfig \ No newline at end of file diff --git a/nixos/flake.lock b/nixos/flake.lock index 6c155df..e38ab50 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -39,11 +39,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1738804720, - "narHash": "sha256-3bAR5ALk5AoFt4BlsQRdjSV6VVH6lbgtYdElb0A+qDc=", + "lastModified": 1737404254, + "narHash": "sha256-L8Lxp/WVdy9gKO2cXptphdP8cMsnGvZF5Noj8N3jLzI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "7868f1c54b7f8e09be194aaa0934791596df1ea1", + "rev": "f8ef9c97ac2f49d5c04dbf3b3d80a0490c05fefb", "type": "github" }, "original": { diff --git a/nixos/modules/ollama.nix b/nixos/modules/ollama.nix deleted file mode 100644 index 630b521..0000000 --- a/nixos/modules/ollama.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ ... }: - -{ - # 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 88f42e2..7142b56 100644 --- a/nixos/users.nix +++ b/nixos/users.nix @@ -12,7 +12,6 @@ ]; packages = with pkgs; [ vscodium - ungoogled-chromium thunderbird fastfetch ghostty @@ -72,5 +71,9 @@ virtualisation.docker = { enable = true; enableOnBoot = false; + rootless = { + enable = true; + setSocketVariable = true; + }; }; }