diff --git a/flake.lock b/flake.lock
index 635c99a..443e291 100644
--- a/flake.lock
+++ b/flake.lock
@@ -108,24 +108,6 @@
"type": "github"
}
},
- "flake-utils_2": {
- "inputs": {
- "systems": "systems_2"
- },
- "locked": {
- "lastModified": 1731533236,
- "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
"ghostty": {
"inputs": {
"flake-compat": "flake-compat",
@@ -134,11 +116,11 @@
"zig": "zig"
},
"locked": {
- "lastModified": 1739069316,
- "narHash": "sha256-PscIOeOJwuBBbcaEGoyDrfnzxYI1UzZKIig/hJicKXo=",
+ "lastModified": 1739143498,
+ "narHash": "sha256-85TvsfDdOBfthR44rRJV9KXpj415StJqVyq+BBlLCvM=",
"owner": "ghostty-org",
"repo": "ghostty",
- "rev": "2c06ce761b5daea6670ac78a2e2342d755705223",
+ "rev": "a3e462bbba724bcf312fcd5edd12bb5e0251c853",
"type": "github"
},
"original": {
@@ -234,27 +216,6 @@
"type": "github"
}
},
- "jujutsu": {
- "inputs": {
- "flake-utils": "flake-utils_2",
- "nixpkgs": "nixpkgs",
- "rust-overlay": "rust-overlay"
- },
- "locked": {
- "lastModified": 1738805560,
- "narHash": "sha256-jGy+0VDxQrgNhj+eX06FRhPP31V8QZVAM4j4yBosAGE=",
- "owner": "jj-vcs",
- "repo": "jj",
- "rev": "613742dfbbd89324b25672a75ef8ce9e671ae0d3",
- "type": "github"
- },
- "original": {
- "owner": "jj-vcs",
- "ref": "v0.26.0",
- "repo": "jj",
- "type": "github"
- }
- },
"neovim-nightly-overlay": {
"inputs": {
"flake-compat": "flake-compat_2",
@@ -262,15 +223,15 @@
"git-hooks": "git-hooks",
"hercules-ci-effects": "hercules-ci-effects",
"neovim-src": "neovim-src",
- "nixpkgs": "nixpkgs_2",
+ "nixpkgs": "nixpkgs",
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1739060572,
- "narHash": "sha256-b66lHmfaZ4lKAG5VW8wC7fba2vUs6OMRlJumO4xMEfc=",
+ "lastModified": 1739145937,
+ "narHash": "sha256-1QL3KSEjc99+ISyzBHHaLGjRrPkLfsFiHZBc40kAiQ8=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
- "rev": "4452574d52632a36458cd9c80f6303f556460221",
+ "rev": "77482d0efef2807924c593947bdf16e303e79f42",
"type": "github"
},
"original": {
@@ -282,11 +243,11 @@
"neovim-src": {
"flake": false,
"locked": {
- "lastModified": 1739058097,
- "narHash": "sha256-QNlqRh8BnmSgJ6e5CRII9og+Z7fBfMAUbL3g66O8ZXg=",
+ "lastModified": 1739136210,
+ "narHash": "sha256-lq/xXRuVSf2ohTRCEgstJJGQX50S5C12WbYL5qj3MBU=",
"owner": "neovim",
"repo": "neovim",
- "rev": "59edd7c88a13d793501b88c55803da8a0ba7c739",
+ "rev": "59a171fd99a7452c8840eee55783fb6746994637",
"type": "github"
},
"original": {
@@ -317,11 +278,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1737557748,
- "narHash": "sha256-BaMuhctP1x00+8cBE2cJveJQb70/tWHI50MHj/ZrtOY=",
+ "lastModified": 1739019272,
+ "narHash": "sha256-7Fu7oazPoYCbDzb9k8D/DdbKrC3aU1zlnc39Y8jy/s8=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "606996d74f6e2a12635d41c1bf58bfc7ea3bb5ec",
+ "rev": "fa35a3c8e17a3de613240fea68f876e5b4896aec",
"type": "github"
},
"original": {
@@ -349,11 +310,11 @@
},
"nixpkgs-stable_2": {
"locked": {
- "lastModified": 1738843498,
- "narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=",
+ "lastModified": 1739055578,
+ "narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f",
+ "rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e",
"type": "github"
},
"original": {
@@ -396,22 +357,6 @@
}
},
"nixpkgs_2": {
- "locked": {
- "lastModified": 1739019272,
- "narHash": "sha256-7Fu7oazPoYCbDzb9k8D/DdbKrC3aU1zlnc39Y8jy/s8=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "fa35a3c8e17a3de613240fea68f876e5b4896aec",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixpkgs-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_3": {
"locked": {
"lastModified": 1739020877,
"narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
@@ -431,35 +376,13 @@
"inputs": {
"ghostty": "ghostty",
"home-manager": "home-manager",
- "jujutsu": "jujutsu",
"neovim-nightly-overlay": "neovim-nightly-overlay",
"nix-index-database": "nix-index-database",
- "nixpkgs": "nixpkgs_3",
+ "nixpkgs": "nixpkgs_2",
"nixpkgs-stable": "nixpkgs-stable_2",
"nixpkgs-unstable": "nixpkgs-unstable_2"
}
},
- "rust-overlay": {
- "inputs": {
- "nixpkgs": [
- "jujutsu",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1737685583,
- "narHash": "sha256-p+NVABRpGi+pT+xxf9HcLcFVxG6L+vEEy+NwzB9T0f8=",
- "owner": "oxalica",
- "repo": "rust-overlay",
- "rev": "eb64cbcc8eee0fa87ebded92805280d2ec97415a",
- "type": "github"
- },
- "original": {
- "owner": "oxalica",
- "repo": "rust-overlay",
- "type": "github"
- }
- },
"systems": {
"locked": {
"lastModified": 1681028828,
@@ -475,21 +398,6 @@
"type": "github"
}
},
- "systems_2": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
"treefmt-nix": {
"inputs": {
"nixpkgs": [
diff --git a/flake.nix b/flake.nix
index b1af46b..0eb9df5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,7 +15,6 @@
inputs = {
ghostty.url = "github:ghostty-org/ghostty";
- jujutsu.url = "github:jj-vcs/jj/v0.26.0";
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
diff --git a/home/common/nvim/default.nix b/home/common/nvim/default.nix
index f6deed1..850caf2 100644
--- a/home/common/nvim/default.nix
+++ b/home/common/nvim/default.nix
@@ -106,15 +106,19 @@ in
src = pkgs.fetchFromGitHub {
owner = "monkoose";
repo = "neocodeium";
- rev = "4da81528468b33585c411f31eb390dce573ccb14"; # v1.8.0
- hash = "sha256-1n9nNqBNwNDSzbAkm8eB4HZLNy5HmMg25jPwQAnW5OU=";
+ rev = "a2b5257c736886ec3ccbd961766f8ab9c82b2a72"; # 2025-02-04
+ hash = "sha256-mR2fzsdCVbh7nLcsSgQnhRivoKW6oFqJwuIYfz8OV0k=";
};
doCheck = false;
};
type = "lua";
config = ''
local neocodeium =require('neocodeium')
- neocodeium.setup()
+ neocodeium.setup({
+ show_label = false,
+ debounce = true,
+ silent = false,
+ })
vim.keymap.set("i", "<C-j>", neocodeium.accept, { remap = true })
vim.keymap.set("i", "<A-f>", neocodeium.accept, { remap = true })
vim.keymap.set("i", "<C-h>", neocodeium.cycle_or_complete, { remap = true })
diff --git a/home/common/nvim/init.lua b/home/common/nvim/init.lua
index 0b30e4f..a99fcad 100644
--- a/home/common/nvim/init.lua
+++ b/home/common/nvim/init.lua
@@ -10,6 +10,7 @@ vim.opt.guicursor =
"n-v-c:block,i-ci-ve:ver25,r-cr:hor20,o:hor50,a:blinkwait700-blinkoff400-blinkon250-Cursor/lCursor,sm:block-blinkwait175-blinkoff150-blinkon175"
vim.opt.laststatus = 0
vim.opt.number = false
+vim.opt.messagesopt = "wait:1000,history:50"
vim.opt.relativenumber = false
vim.opt.ruler = true
vim.opt.syntax = "on"
diff --git a/home/common/vcs.nix b/home/common/vcs.nix
index 4e3d18a..bc74bb3 100644
--- a/home/common/vcs.nix
+++ b/home/common/vcs.nix
@@ -136,6 +136,5 @@
programs.jujutsu = {
enable = true;
- package = inputs.jujutsu.packages.${pkgs.system}.default;
};
}