diff --git a/flake.lock b/flake.lock index 95267a8..046ef44 100644 --- a/flake.lock +++ b/flake.lock @@ -135,11 +135,11 @@ ] }, "locked": { - "lastModified": 1757503661, - "narHash": "sha256-bBh9sAJn0x/EdCVA6NYj/hXpcW1YBLCRMgn8A2T1l2E=", + "lastModified": 1757578556, + "narHash": "sha256-w1PGkTGow5XzsjccV364No46rkuGxTqo7m/4cfhnkIk=", "owner": "nix-community", "repo": "home-manager", - "rev": "3c97248d6f896232355735e34bb518ae9f130c5d", + "rev": "b7112b12ea5b8c3aa6af344498ed9ca27dd03ba3", "type": "github" }, "original": { @@ -167,11 +167,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1757504730, - "narHash": "sha256-diAa8OhjHHNgOzItPpNRC+J6d424ZaX07KRB4Miv9pM=", + "lastModified": 1757576392, + "narHash": "sha256-2D+hoNVreDOgNsKVOiT7wcFymSWde/FvJZJ7XxK/0gE=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "aa98595ef54d9f1cdeb81ac4bc1494f99372cc61", + "rev": "e27f0c618d3a7ab9bef4673c4dd8281be5b000cf", "type": "github" }, "original": { @@ -183,11 +183,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1757507867, - "narHash": "sha256-558nWfmfZIBiuhiAdT7r6fEK3bi1fcqQA2DPa8cGS3s=", + "lastModified": 1757583189, + "narHash": "sha256-GTYpKwjm4DH4D0+JOd9w2ti8vL1pUsx0cduiMhKfyBQ=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "27e5ad549965f3d218a8931ed733f45f036d7e59", + "rev": "14ee4d57e151f8a1afbb819bf65be30761985166", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757507805, - "narHash": "sha256-yYe5M26PPLS8FU9ZM0sg7LXuG+qmnY6KTsniOfmpiKU=", + "lastModified": 1757582606, + "narHash": "sha256-FID2hNYl4fOGNqe9GPrupEj6hroaBlRXmWLKw2fQWGQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e48a0648d1307dff48da5f0535bc726059718162", + "rev": "e7d4920b8a3fd587bbc143ba9e75075acd644010", "type": "github" }, "original": { @@ -313,11 +313,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1757498201, - "narHash": "sha256-5ziMmnuTH8bWRgNV1NhvEs6W999a5QogIE4zvayaqOY=", + "lastModified": 1757539853, + "narHash": "sha256-KjDtDYGe6DqcCPZVPwRdpwpc/KCNmE3upQnjvFUiIXw=", "owner": "nix-community", "repo": "nixvim", - "rev": "c55042f7394a8c0494d779735c2a6a9d32151b4a", + "rev": "5b0a6eb34b94fe54c0759974962acc22d9c96d7b", "type": "github" }, "original": { diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix index 9c38498..db4a5e2 100644 --- a/modules/darwin/default.nix +++ b/modules/darwin/default.nix @@ -62,7 +62,7 @@ enable = true; username = user; entries = [ - {path = "/Applications/Orion.app/";} + {path = "/Applications/Zen.app/";} {path = "/${pkgs.ghostty-bin}/Applications/Ghostty.app/";} {path = "/System/Applications/Notes.app/";} {path = "/System/Applications/Music.app/";} diff --git a/modules/darwin/homebrew.nix b/modules/darwin/homebrew.nix index 9a6405e..d975569 100644 --- a/modules/darwin/homebrew.nix +++ b/modules/darwin/homebrew.nix @@ -2,7 +2,7 @@ homebrew = { enable = true; casks = [ - "orion" + "zen" ]; masApps = { "wipr2" = 1662217862; diff --git a/modules/darwin/system.nix b/modules/darwin/system.nix index 9f896d2..8b466d9 100644 --- a/modules/darwin/system.nix +++ b/modules/darwin/system.nix @@ -1,6 +1,7 @@ -{lib, ...}: { +{ system.defaults = { NSGlobalDomain = { + AppleInterfaceStyle = "Dark"; AppleShowAllExtensions = true; ApplePressAndHoldEnabled = false; KeyRepeat = 2; diff --git a/modules/home/jujutsu.nix b/modules/home/jujutsu.nix index fa8823e..8d3e8b2 100644 --- a/modules/home/jujutsu.nix +++ b/modules/home/jujutsu.nix @@ -10,6 +10,7 @@ tool = "delta"; }; ui = { + default-command = "status"; diff-formatter = ":git"; pager = ["delta" "--pager" "less -FRX"]; }; diff --git a/modules/home/neovim/autocmd.nix b/modules/home/neovim/autocmd.nix index a5993d6..da06064 100644 --- a/modules/home/neovim/autocmd.nix +++ b/modules/home/neovim/autocmd.nix @@ -23,25 +23,6 @@ pattern = "*"; command = "normal zR"; } - { - event = "LspAttach"; - group = "Christoph"; - callback.__raw = '' - function(e) - local opts = { buffer = e.buf } - vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts) - vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts) - vim.keymap.set("n", "vws", function() vim.lsp.buf.workspace_symbol() end, opts) - vim.keymap.set("n", "vd", function() vim.diagnostic.open_float() end, opts) - vim.keymap.set("n", "vca", function() vim.lsp.buf.code_action() end, opts) - vim.keymap.set("n", "vrr", function() vim.lsp.buf.references() end, opts) - vim.keymap.set("n", "vrn", function() vim.lsp.buf.rename() end, opts) - vim.keymap.set("i", "", function() vim.lsp.buf.signature_help() end, opts) - vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts) - vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts) - end - ''; - } ]; }; } diff --git a/modules/home/neovim/mappings.nix b/modules/home/neovim/mappings.nix index df873a9..9550a5c 100644 --- a/modules/home/neovim/mappings.nix +++ b/modules/home/neovim/mappings.nix @@ -114,7 +114,7 @@ { mode = "n"; key = "ld"; - action = ":lua vim.diagnostic.open_float()"; + action = ":lua vim.diagnostic.open_float({ severity = { min = vim.diagnostic.severity.HINT } })"; options.desc = "Diagnostics popup"; } { @@ -162,7 +162,7 @@ # other { mode = "n"; - key = "sj"; + key = "j"; action = ":lua require('mini.jump2d').start(require('mini.jump2d').builtin_opts.query)"; options.desc = "Jump to character"; } diff --git a/modules/home/neovim/plugins/lsp.nix b/modules/home/neovim/plugins/lsp.nix index aab792a..2acfb7d 100644 --- a/modules/home/neovim/plugins/lsp.nix +++ b/modules/home/neovim/plugins/lsp.nix @@ -32,7 +32,7 @@ }; cssls.enable = true; dockerls.enable = true; - elixirls.enable = true; + elixirls.enable = false; yamlls.enable = true; }; };