diff options
| -rw-r--r-- | flake.lock | 187 | ||||
| -rw-r--r-- | machines/vm-aarch64.nix | 4 | ||||
| -rw-r--r-- | mut/ghostty/config | 5 | ||||
| l--------- | mut/lf/icons | 2 | ||||
| -rw-r--r-- | mut/neovim/lua/my/init.lua | 94 | ||||
| -rw-r--r-- | mut/neovim/lua/my/settings.lua | 2 | ||||
| m--------- | mut/neovim/pack/plugins/start/blink.cmp | 0 | ||||
| m--------- | mut/neovim/pack/plugins/start/quicker.nvim | 0 | ||||
| -rw-r--r-- | profiles/core/neovim.nix | 6 | ||||
| -rw-r--r-- | profiles/graphical/suckless.nix | 3 |
10 files changed, 147 insertions, 156 deletions
@@ -23,11 +23,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1711973905, - "narHash": "sha256-UFKME/N1pbUtn+2Aqnk+agUt8CekbpuqwzljivfIme8=", + "lastModified": 1727447169, + "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=", "owner": "serokell", "repo": "deploy-rs", - "rev": "88b3059b020da69cbe16526b8d639bd5e0b51c8b", + "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76", "type": "github" }, "original": { @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1635273082, - "narHash": "sha256-EHiDP2jEa7Ai5ZwIf5uld9RVFcV77+2SUxjQXwJsJa0=", + "lastModified": 1733919067, + "narHash": "sha256-ZsL5pKwEDhcZhVJh+3IwgHus7kSW/N8qOlBscwB6BCI=", "owner": "kirelagin", "repo": "dns.nix", - "rev": "c7b9645da9c0ddce4f9de4ef27ec01bb8108039a", + "rev": "a23f43f9762aa96d3e35c8eeefa7610bd0cdf456", "type": "github" }, "original": { @@ -63,11 +63,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1724007622, - "narHash": "sha256-f9jHcgMdoPF4Pu2IdxnUoSG62XJpqyRXf+gCIg4dYkk=", + "lastModified": 1733703227, + "narHash": "sha256-5njR8Ha2FvELuRtcEKoQuQ8BKqSiZHDA3RJGYrPRDfg=", "owner": "drduh", "repo": "YubiKey-Guide", - "rev": "e218607c1f7c7573860f7e4d7bfd8ba1f8266736", + "rev": "166f838a437304872b12a38ad6f1066b7a2e65e5", "type": "github" }, "original": { @@ -127,11 +127,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -202,11 +202,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -255,11 +255,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1735535921, - "narHash": "sha256-cfsHww91bRA2Frni54+blIGZGU9/269vaWzeGcNRNN0=", + "lastModified": 1735658428, + "narHash": "sha256-vg5GRc6H1SjVpGbbtq9HLTAilztC+vq3dRmzlIYWVxo=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "87bd0bb744d6a1c45022aa39f21219d0b6ff3261", + "rev": "eaa872216b577d68c09bfa13758abdedaf4fa80e", "type": "github" }, "original": { @@ -282,11 +282,11 @@ ] }, "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", + "lastModified": 1734797603, + "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "type": "github" }, "original": { @@ -326,11 +326,11 @@ ] }, "locked": { - "lastModified": 1724947644, - "narHash": "sha256-MHHrHasTngp7EYQOObHJ1a/IsRF+wodHqOckhH6uZbk=", + "lastModified": 1733333617, + "narHash": "sha256-nMMQXREGvLOLvUa0ByhYFdaL0Jov0t1wzLbKjr05P2w=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "dba4367b9a9d9615456c430a6d6af716f6e84cef", + "rev": "56f8ea8d502c87cf62444bec4ee04512e8ea24ea", "type": "github" }, "original": { @@ -346,11 +346,11 @@ ] }, "locked": { - "lastModified": 1720734513, - "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", + "lastModified": 1735381016, + "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", "owner": "nix-community", "repo": "home-manager", - "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", + "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", "type": "github" }, "original": { @@ -366,14 +366,15 @@ "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_3", + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1729147490, - "narHash": "sha256-F0/iQVbbIFctMPwK4JEd4fxVzNwaq7NnD5oen59S24s=", + "lastModified": 1735605816, + "narHash": "sha256-n7c2VcDQN2C6vUV8/AfaZpHYWgvlbFcHErqf//hPwC8=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "e2047498667aeb24e8493ff430a20cff713915f4", + "rev": "bcd445a62280469b07354f1263bc1f136e64506a", "type": "github" }, "original": { @@ -385,11 +386,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1729121305, - "narHash": "sha256-c94xkA/RuszC4PfmB+MWqOo2vbO66GTO6XKer0mbltA=", + "lastModified": 1735598207, + "narHash": "sha256-T/UtvF0WSkXy4Lk0ZzCsqjp6At0SRmwTsRXDxJcFzMA=", "owner": "neovim", "repo": "neovim", - "rev": "852954ff6d96adce0158f74ca494fdcef3aa1921", + "rev": "e9c077d197a80a2ecd858821b18d0be3e3eb6d0b", "type": "github" }, "original": { @@ -431,34 +432,33 @@ "type": "github" } }, - "nixpkgs-stable": { + "nixpkgs-24_11": { "locked": { - "lastModified": 1733423277, - "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=", - "owner": "nixos", + "lastModified": 1734083684, + "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "e36963a147267afc055f7cf65225958633e536bf", + "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "type": "github" }, "original": { - "owner": "nixos", - "ref": "release-24.11", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "ref": "nixos-24.11", + "type": "indirect" } }, - "nixpkgs-stable_2": { + "nixpkgs-stable": { "locked": { - "lastModified": 1713434076, - "narHash": "sha256-+/p5edwlkqKZc6GDAQl+92Hoe1f3NNbUF9uj+X9H3pU=", - "owner": "NixOS", + "lastModified": 1733423277, + "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "8494ae076b7878d61a7d2d25e89a847fe8f8364c", + "rev": "e36963a147267afc055f7cf65225958633e536bf", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "release-23.11", + "owner": "nixos", + "ref": "release-24.11", "repo": "nixpkgs", "type": "github" } @@ -497,11 +497,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1728863046, - "narHash": "sha256-DZBO2465PL5V89e8hFSJewyH4QbCPpW3ssws7ckT/0A=", + "lastModified": 1735523292, + "narHash": "sha256-opBsbR/nrGxiiF6XzlVluiHYb6yN/hEwv+lBWTy9xoM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d4f247e89f6e10120f911e2e2d2254a050d0f732", + "rev": "6d97d419e5a9b36e6293887a89a078cf85f5a61b", "type": "github" }, "original": { @@ -513,11 +513,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1720768451, - "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { @@ -529,11 +529,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -544,11 +544,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1713284584, - "narHash": "sha256-rRuPBJD9+yjz7tY3xC/BvFUwloutynR9piiVE6fhGqo=", + "lastModified": 1731763621, + "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2b6ee326ad047870526d9a3ae88dfd0197da898d", + "rev": "c69a9bffbecde46b4b939465422ddc59493d3e4d", "type": "github" }, "original": { @@ -577,14 +577,14 @@ "blobs": "blobs", "flake-compat": "flake-compat_5", "nixpkgs": "nixpkgs_5", - "utils": "utils_2" + "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1714720456, - "narHash": "sha256-e0WFe1BHqX23ADpGBc4ZRu38Mg+GICCZCqyS6EWCbHc=", + "lastModified": 1735230346, + "narHash": "sha256-zgR8NTiNDPVNrfaiOlB9yHSmCqFDo7Ks2IavaJ2dZo4=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "41059fc548088e49e3ddb3a2b4faeb5de018e60f", + "rev": "dc0569066e79ae96184541da6fa28f35a33fbf7b", "type": "gitlab" }, "original": { @@ -595,15 +595,14 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_6", - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1713532771, - "narHash": "sha256-vfKxhYVMzG2tg48/1rewBoSLCrKIjQsG1j7Nm/Y2gf4=", + "lastModified": 1735468296, + "narHash": "sha256-ZjUjbvS06jf4fElOF4ve8EHjbpbRVHHypStoY8HGzk8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a929a011a09db735abc45a8a45d1ff7fdee62755", + "rev": "bcb8b65aa596866eb7e5c3e1a6cccbf5d1560b27", "type": "github" }, "original": { @@ -642,18 +641,24 @@ "type": "github" } }, - "systems_3": { + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "neovim-nightly-overlay", + "nixpkgs" + ] + }, "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "lastModified": 1735135567, + "narHash": "sha256-8T3K5amndEavxnludPyfj3Z1IkcFdRpR23q+T0BVeZE=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "9e09d30a644c57257715902efbb3adc56c79cf28", "type": "github" }, "original": { - "owner": "nix-systems", - "repo": "default", + "owner": "numtide", + "repo": "treefmt-nix", "type": "github" } }, @@ -675,24 +680,6 @@ "type": "github" } }, - "utils_2": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "zig": { "inputs": { "flake-compat": [ diff --git a/machines/vm-aarch64.nix b/machines/vm-aarch64.nix index 21c4a06..f0ee056 100644 --- a/machines/vm-aarch64.nix +++ b/machines/vm-aarch64.nix @@ -47,9 +47,9 @@ services.pcscd.enable = true; sops.age.keyFile = "${config.hm.xdg.configHome}/sops/age/keys.txt"; - my.shell = pkgs.zsh; + my.shell = pkgs.nushell; - environment.shells = [pkgs.bashInteractive pkgs.zsh]; + environment.shells = [pkgs.bashInteractive pkgs.zsh pkgs.nushell]; environment.pathsToLink = [ "/share/zsh" ]; programs.zsh.enable = true; diff --git a/mut/ghostty/config b/mut/ghostty/config index 259a616..dafa2b7 100644 --- a/mut/ghostty/config +++ b/mut/ghostty/config @@ -1,7 +1,7 @@ keybind = alt+k=scroll_page_fractional:-0.4 keybind = alt+j=scroll_page_fractional:+0.4 -keybind = alt+b=scroll_page_up -keybind = alt+f=scroll_page_down +# keybind = alt+b=scroll_page_up +# keybind = alt+f=scroll_page_down keybind = alt+c=copy_to_clipboard keybind = alt+v=paste_from_clipboard keybind = alt+shift+k=increase_font_size:1 @@ -10,3 +10,4 @@ keybind = alt+shift+j=decrease_font_size:1 keybind = ctrl+zero=unbind theme=GruvboxLuke window-decoration=false +confirm-close-surface=false diff --git a/mut/lf/icons b/mut/lf/icons index 147b137..42ddab4 120000 --- a/mut/lf/icons +++ b/mut/lf/icons @@ -1 +1 @@ -/nix/store/znw7za4drsyyarhvzp2gjy1aaz4iwnl1-home-manager-files/.config/lf/icons
\ No newline at end of file +/nix/store/n1xbv1dwkvsv7v96kbril3lys6aq7x63-home-manager-files/.config/lf/icons
\ No newline at end of file diff --git a/mut/neovim/lua/my/init.lua b/mut/neovim/lua/my/init.lua index 6b368fe..993519f 100644 --- a/mut/neovim/lua/my/init.lua +++ b/mut/neovim/lua/my/init.lua @@ -434,53 +434,53 @@ require("my.packages") -- file_types = { "markdown", "Avante" }, -- }, -- ft = { "markdown", "Avante" },}) -require('avante_lib').load() --- require('copilot').setup {} -require('avante').setup ({ - provider = "openai", - openai = { - model = "gpt-4o", - }, - behaviour = { - auto_suggestions = false, - auto_set_highlight_group = true, - auto_set_keymaps = true, - auto_apply_diff_after_generation = false, - support_paste_from_clipboard = false, - }, - mappings = { - --- @class AvanteConflictMappings - diff = { - ours = "co", - theirs = "ct", - all_theirs = "ca", - both = "cb", - cursor = "cc", - next = "]x", - prev = "[x", - }, - suggestion = { - accept = "<M-l>", - next = "<M-]>", - prev = "<M-[>", - dismiss = "<C-]>", - }, - jump = { - next = "]]", - prev = "[[", - }, - submit = { - normal = "<CR>", - insert = "<C-s>", - }, - sidebar = { - apply_all = "A", - apply_cursor = "a", - switch_windows = "<Tab>", - reverse_switch_windows = "<S-Tab>", - }, - }, -}) +-- require('avante_lib').load() +-- -- require('copilot').setup {} +-- require('avante').setup ({ +-- provider = "openai", +-- openai = { +-- model = "gpt-4o", +-- }, +-- behaviour = { +-- auto_suggestions = false, +-- auto_set_highlight_group = true, +-- auto_set_keymaps = true, +-- auto_apply_diff_after_generation = false, +-- support_paste_from_clipboard = false, +-- }, +-- mappings = { +-- --- @class AvanteConflictMappings +-- diff = { +-- ours = "co", +-- theirs = "ct", +-- all_theirs = "ca", +-- both = "cb", +-- cursor = "cc", +-- next = "]x", +-- prev = "[x", +-- }, +-- suggestion = { +-- accept = "<M-l>", +-- next = "<M-]>", +-- prev = "<M-[>", +-- dismiss = "<C-]>", +-- }, +-- jump = { +-- next = "]]", +-- prev = "[[", +-- }, +-- submit = { +-- normal = "<CR>", +-- insert = "<C-s>", +-- }, +-- sidebar = { +-- apply_all = "A", +-- apply_cursor = "a", +-- switch_windows = "<Tab>", +-- reverse_switch_windows = "<S-Tab>", +-- }, +-- }, +-- }) require("quicker").setup({ keys = { diff --git a/mut/neovim/lua/my/settings.lua b/mut/neovim/lua/my/settings.lua index 560fa18..a3c5144 100644 --- a/mut/neovim/lua/my/settings.lua +++ b/mut/neovim/lua/my/settings.lua @@ -63,3 +63,5 @@ vim.opt.winbar = "" vim.opt.hlsearch = false vim.opt.showtabline = 1 vim.opt.cmdheight = 1 + +vim.opt.shellpipe = "out+err>" diff --git a/mut/neovim/pack/plugins/start/blink.cmp b/mut/neovim/pack/plugins/start/blink.cmp new file mode 160000 +Subproject 5f442681df24fe705d1ee7ce5b4d435aa4b4dee diff --git a/mut/neovim/pack/plugins/start/quicker.nvim b/mut/neovim/pack/plugins/start/quicker.nvim new file mode 160000 +Subproject 87dae0f25733b7bd79b600a70ca38040db68ec0 diff --git a/profiles/core/neovim.nix b/profiles/core/neovim.nix index e3a141d..500260b 100644 --- a/profiles/core/neovim.nix +++ b/profiles/core/neovim.nix @@ -95,9 +95,9 @@ nvim-parinfer # ai :( - render-markdown - avante-nvim - nui-nvim + # render-markdown-nvim + # avante-nvim + # nui-nvim ]; }; }; diff --git a/profiles/graphical/suckless.nix b/profiles/graphical/suckless.nix index 8398f91..2f12756 100644 --- a/profiles/graphical/suckless.nix +++ b/profiles/graphical/suckless.nix @@ -91,7 +91,8 @@ enable = true; }; packages = with pkgs; [ - (nerdfonts.override {fonts = ["FiraCode" "JetBrainsMono"];}) + nerd-fonts.fira-code + nerd-fonts.jetbrains-mono ]; }; } |