diff --git a/flake.lock b/flake.lock
index 9faad31..9935da9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -159,11 +159,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1776169885,
-        "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=",
+        "lastModified": 1776877367,
+        "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9",
+        "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57",
         "type": "github"
       },
       "original": {
@@ -190,11 +190,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1776434932,
-        "narHash": "sha256-gyqXNMgk3sh+ogY5svd2eNLJ6oEwzbAeaoBrrxD0lKk=",
+        "lastModified": 1777077449,
+        "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c7f47036d3df2add644c46d712d14262b7d86c0c",
+        "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160",
         "type": "github"
       },
       "original": {
@@ -206,11 +206,11 @@
     },
     "nixpkgs-wsl-stable": {
       "locked": {
-        "lastModified": 1776434932,
-        "narHash": "sha256-gyqXNMgk3sh+ogY5svd2eNLJ6oEwzbAeaoBrrxD0lKk=",
+        "lastModified": 1777077449,
+        "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c7f47036d3df2add644c46d712d14262b7d86c0c",
+        "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160",
         "type": "github"
       },
       "original": {
@@ -257,11 +257,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776119890,
-        "narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=",
+        "lastModified": 1776771786,
+        "narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd",
+        "rev": "bef289e2248991f7afeb95965c82fbcd8ff72598",
         "type": "github"
       },
       "original": {
diff --git a/hosts/work/common.nix b/hosts/work/common.nix
index f615702..a79dff4 100644
--- a/hosts/work/common.nix
+++ b/hosts/work/common.nix
@@ -17,7 +17,7 @@
 
   dot.llm = {
     enable = true;
-    claude-code.enable = true;
+    claude-code.enable = false;
     opencode.enable = true;
     opencode.enableConfig = true;
     opencode.workMode = true;
diff --git a/modules/home/dev.nix b/modules/home/dev.nix
index a06fc1c..bffe8a6 100644
--- a/modules/home/dev.nix
+++ b/modules/home/dev.nix
@@ -39,6 +39,7 @@ in
       home.packages = with pkgs; [
         visidata
         codespelunker
+        jq
       ];
     }
     
diff --git a/modules/home/git.nix b/modules/home/git.nix
index 498086e..d4133da 100644
--- a/modules/home/git.nix
+++ b/modules/home/git.nix
@@ -85,6 +85,14 @@
         tug = ["bookmark" "move" "--from" "heads(::@- & bookmarks())" "--to" "@-"];
         lg = ["log"];
         des = ["describe"];
+        sq = ["squash"];
+      };
+
+      ui = {
+        default-command = "log";
+        pager = "less -FRX";
+        diff-formatter = ":git";
+        merge-editor = "vimdiff";
       };
     };
   };
diff --git a/modules/home/opencode.nix b/modules/home/opencode.nix
index 8126ab9..5ac42ec 100644
--- a/modules/home/opencode.nix
+++ b/modules/home/opencode.nix
@@ -41,8 +41,8 @@ in
                 apiKey = config.sops.placeholder.langdock_api_key;
               };
               models = {
-                "gpt-5.2" = { name = "GPT-5.2"; };
-                "gpt-5-mini" = { name = "GPT-5 mini"; };
+                "gpt-5.4" = { name = "GPT-5.4"; };
+                "gpt-5.4-mini" = { name = "GPT-5.4 mini"; };
               };
             };
             anthropic = {
@@ -51,23 +51,24 @@ in
                 apiKey = config.sops.placeholder.langdock_api_key;
               };
               models = {
+                "claude-opus-4-7-default" = { name = "Opus 4.7"; };
                 "claude-opus-4-6-default" = { name = "Opus 4.6"; };
                 "claude-sonnet-4-6-default" = { name = "Sonnet 4.6"; };
                 "claude-haiku-4-5-20251001" = { name = "Haiku 4.5"; };
               };
-              whitelist = [ "claude-opus-4-6-default" "claude-sonnet-4-6-default" "claude-haiku-4-5-20251001"];
-            };
-            ollama = {
-              npm = "@ai-sdk/openai-compatible";
-              name = "Ollama (Local)";
-              options = {
-                baseURL = "http://192.168.11.23:11434/v1";
-              };
-              models = {
-                "qwen3-coder:30b" = { name = "Qwen 3 Coder 30B"; };
-                "codellama:34b-instruct" = { name = "CodeLlama 34B Instruct"; };
-              };
+              whitelist = ["claude-opus-4-7-default" "claude-opus-4-6-default" "claude-sonnet-4-6-default" "claude-haiku-4-5-20251001"];
             };
+            # ollama = {
+            #   npm = "@ai-sdk/openai-compatible";
+            #   name = "Ollama (Local)";
+            #   options = {
+            #     baseURL = "http://192.168.11.23:11434/v1";
+            #   };
+            #   models = {
+            #     "qwen3-coder:30b" = { name = "Qwen 3 Coder 30B"; };
+            #     "codellama:34b-instruct" = { name = "CodeLlama 34B Instruct"; };
+            #   };
+            # };
           };
         };
 
diff --git a/modules/nvim/lua/filetype.lua b/modules/nvim/lua/filetype.lua
index 99fbb8b..fbb4aa7 100644
--- a/modules/nvim/lua/filetype.lua
+++ b/modules/nvim/lua/filetype.lua
@@ -118,7 +118,7 @@ vim.api.nvim_create_autocmd('FileType', {
 
 require("conform").setup({
   go = {"gofmt"},
-  python = {"black"},
+  python = {"ruff"},
   rust = {"rustfmt"},
 
   format_on_save = {