Compare commits

...

5 commits

Author SHA1 Message Date
f3c04248cf
[chore] flake.lock: update inputs
All checks were successful
/ check (push) Successful in 20s
/ build (audiomenu) (push) Successful in 2s
/ build (docs) (push) Successful in 2s
/ build (jpassmenu) (push) Successful in 2s
/ build (nixosConfigurations.vm.config.system.build.toplevel) (push) Successful in 1s
/ build (nvim) (push) Successful in 1s
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/1719f27dd95fd4206afb9cec9f415b539978827e' (2024-09-30)
  → 'github:NixOS/nixpkgs/6e6b3dd395c3b1eb9be9f2d096383a8d05add030' (2024-10-04)
• Updated input 'nixvim':
    'github:nix-community/nixvim/5f4a4b47597d3b9ac26c41ff4e8da28fa662f200' (2024-09-29)
  → 'github:nix-community/nixvim/6594472fd275f6dcf5a9fba4a83d2f7fa2cf2b8a' (2024-10-05)
• Updated input 'nixvim/treefmt-nix':
    'github:numtide/treefmt-nix/879b29ae9a0378904fbbefe0dadaed43c8905754' (2024-09-27)
  → 'github:numtide/treefmt-nix/4446c7a6fc0775df028c5a3f6727945ba8400e64' (2024-10-03)
• Updated input 'unstable':
    'github:NixOS/nixpkgs/06cf0e1da4208d3766d898b7fdab6513366d45b9' (2024-09-29)
  → 'github:NixOS/nixpkgs/bc947f541ae55e999ffdb4013441347d83b00feb' (2024-10-04)
2024-10-06 03:04:55 +02:00
215b8f99e5
feat(nvim): enable lsp-lines
All checks were successful
/ check (push) Successful in 20s
/ build (audiomenu) (push) Successful in 1s
/ build (docs) (push) Successful in 1s
/ build (jpassmenu) (push) Successful in 1s
/ build (nixosConfigurations.vm.config.system.build.toplevel) (push) Successful in 1s
/ build (nvim) (push) Successful in 1s
Pretty lines when lsp-ing
2024-10-06 00:07:42 +02:00
78d61c2dba
fix(nvim): pull silicon from unstable, it has been fixed 2024-10-06 00:07:15 +02:00
fd2f052420
chore(nvim): update vendored plugins 2024-10-05 22:38:10 +02:00
9ea7a2248f
fix(devenv): the new versions are incompatible with lix
All checks were successful
/ check (push) Successful in 20s
/ build (audiomenu) (push) Successful in 1s
/ build (docs) (push) Successful in 1s
/ build (jpassmenu) (push) Successful in 1s
/ build (nixosConfigurations.vm.config.system.build.toplevel) (push) Successful in 1s
/ build (nvim) (push) Successful in 1s
This incompatibility has been fixed, but no new version of lix has been
released.
2024-10-05 13:55:32 +02:00
5 changed files with 19 additions and 20 deletions

24
flake.lock generated
View file

@ -260,11 +260,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1727672256,
"narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=",
"lastModified": 1728067476,
"narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1719f27dd95fd4206afb9cec9f415b539978827e",
"rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030",
"type": "github"
},
"original": {
@ -292,11 +292,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1727645871,
"narHash": "sha256-Os3PAThU5XliKkKa+SHsFyV/EsCHogHcYONmpzb6500=",
"lastModified": 1728145679,
"narHash": "sha256-qd1nr2b+WUiyzJva650LBX/3hDBru0ZSVxKHSm1BE0w=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "5f4a4b47597d3b9ac26c41ff4e8da28fa662f200",
"rev": "6594472fd275f6dcf5a9fba4a83d2f7fa2cf2b8a",
"type": "github"
},
"original": {
@ -373,11 +373,11 @@
]
},
"locked": {
"lastModified": 1727431250,
"narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=",
"lastModified": 1727984844,
"narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "879b29ae9a0378904fbbefe0dadaed43c8905754",
"rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64",
"type": "github"
},
"original": {
@ -388,11 +388,11 @@
},
"unstable": {
"locked": {
"lastModified": 1727634051,
"narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
"lastModified": 1728018373,
"narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9",
"rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
"type": "github"
},
"original": {

View file

@ -193,7 +193,7 @@ in
};
neovimAsManPager = lib.mkEnableOption "neovim as the man pager";
extraPackages = mkExtraPackagesOption "dev" [
[ "devenv" ] # a devshell alternative
# FIXME: readd on new lix version with fix [ "devenv" ] # a devshell alternative
[ "jq" ] # json parser
[ "just" ] # just a command runner
[ "typos" ] # low false positive rate typo checker

View file

@ -10,12 +10,12 @@
final: prev: {
nvim-silicon = buildVimPlugin {
pname = "nvim-silicon";
version = "2024-07-30";
version = "2024-08-31";
src = fetchFromGitHub {
owner = "michaelrommel";
repo = "nvim-silicon";
rev = "feb882f04c992b797daa118101a239fb3bedfc04";
sha256 = "03dy4q2dbgiyydi9wvpij6s2aggdpr3lgd9cqqv0i2m1m0qb9gad";
rev = "9fe6001dc8cad4d9c53bcfc8649e3dc76ffa169c";
sha256 = "1qczi06yndkr2pmwidlkgmk0395x189sznvscn4fnr96jx58j5yl";
};
meta.homepage = "https://github.com/michaelrommel/nvim-silicon/";
};

View file

@ -205,6 +205,7 @@ in
mode = "symbol";
extraOptions.maxwidth = 50;
};
lsp-lines.enable = true;
lualine = {
enable = true;
settings.options.theme = lib.mkForce "gruvbox";

View file

@ -53,13 +53,11 @@
];
# Formatting & linters
extraPackages = [
# Rust 1.80.0 broke it, waiting for https://github.com/Aloxaf/silicon/pull/254 to be accepted
pkgs.silicon
pkgs.unstable.alejandra
pkgs.unstable.luajitPackages.jsregexp
pkgs.unstable.shfmt
pkgs.unstable.silicon
pkgs.unstable.statix
pkgs.unstable.stylua
pkgs.unstable.shfmt
pkgs.unstable.taplo
pkgs.unstable.typos
pkgs.unstable.yamlfmt