bumped revs; removed unnecessary flake imports
This commit is contained in:
parent
6a2b1631f2
commit
4a83351844
5 changed files with 43 additions and 55 deletions
69
flake.lock
generated
69
flake.lock
generated
|
@ -8,11 +8,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741352980,
|
||||
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
|
||||
"lastModified": 1743550720,
|
||||
"narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
|
||||
"rev": "c621e8422220273271f52058f618c94e405bb0f5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -53,43 +53,27 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729958008,
|
||||
"narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
|
||||
"lastModified": 1748294338,
|
||||
"narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "ixx",
|
||||
"rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
|
||||
"rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NuschtOS",
|
||||
"ref": "v0.0.6",
|
||||
"ref": "v0.0.8",
|
||||
"repo": "ixx",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1742669843,
|
||||
"narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=",
|
||||
"lastModified": 1748406211,
|
||||
"narHash": "sha256-B3BsCRbc+x/d0WiG1f+qfSLUy+oiIfih54kalWBi+/M=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1e5b653dff12029333a6546c11e108ede13052eb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1742606399,
|
||||
"narHash": "sha256-NAxwF5cjgh8o5aylhePXWNQETCWYaTpNvdO2bMfINpQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0740f6f238767d4caf9afe774d3e88105766dfc6",
|
||||
"rev": "3d1f29646e4b57ed468d60f9d286cde23a8d1707",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -102,15 +86,16 @@
|
|||
"nixvim": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nuschtosSearch": "nuschtosSearch"
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nuschtosSearch": "nuschtosSearch",
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742732006,
|
||||
"narHash": "sha256-ZIBMfPNb/hfoFf79MRnhDXGKl0yGhjlYEpy3+/jbxFI=",
|
||||
"lastModified": 1748521000,
|
||||
"narHash": "sha256-EnXH5PIrZBoe8U09hPQr2kOuPTZSqAJy78DqUVLmWXg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "7776e37b67e7875c3cd56d9d20fd050798071706",
|
||||
"rev": "a9e45072d82374dd3f0d971795e7d7f99e5bc6c2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -129,11 +114,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742659553,
|
||||
"narHash": "sha256-i/JCrr/jApVorI9GkSV5to+USrRCa0rWuQDH8JSlK2A=",
|
||||
"lastModified": 1748298102,
|
||||
"narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"rev": "508752835128a3977985a4d5225ff241f7756181",
|
||||
"rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -144,7 +129,6 @@
|
|||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixvim": "nixvim"
|
||||
}
|
||||
},
|
||||
|
@ -162,6 +146,21 @@
|
|||
"repo": "default",
|
||||
"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"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
|
22
flake.nix
22
flake.nix
|
@ -2,30 +2,16 @@
|
|||
description = "Opinionated Nixvim config as a flake";
|
||||
|
||||
inputs = {
|
||||
## nixvim uses it's own version, so this is only
|
||||
## for explicitly installed packages and non nixvim config
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
|
||||
nixvim = {
|
||||
url = "github:nix-community/nixvim";
|
||||
};
|
||||
|
||||
nixvim.url = "github:nix-community/nixvim";
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, ... } @ inputs:
|
||||
# outputs = { self, nixpkgs, ... } @ inputs:
|
||||
outputs = { self, ... } @ inputs:
|
||||
{
|
||||
nixosModules = rec {
|
||||
nixvim-config = { config, ... }:
|
||||
let
|
||||
# Get system from the importing module's context
|
||||
system = nixpkgs.lib.systems.elaborate config.nixpkgs.hostPlatform;
|
||||
pkgs = nixpkgs.legacyPackages.${system.system};
|
||||
in
|
||||
import ./default.nix {
|
||||
default = import ./default.nix {
|
||||
inherit inputs;
|
||||
inherit pkgs;
|
||||
};
|
||||
default = nixvim-config;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
programs.nixvim = {
|
||||
enable = config.nixvim-config.enable;
|
||||
|
||||
nixpkgs.config.allowUnfree = true; # For claude-code
|
||||
|
||||
defaultEditor = true;
|
||||
|
||||
globals = {
|
||||
|
|
|
@ -34,6 +34,7 @@
|
|||
|
||||
programs.nixvim = {
|
||||
plugins = {
|
||||
claude-code.enable = true;
|
||||
comment.enable = true;
|
||||
## needed by avante. already archived, so may need to migrate to snacks
|
||||
# dressing.enable = true;
|
||||
|
|
|
@ -122,7 +122,7 @@
|
|||
# custom_elements_ls.enable = true;
|
||||
denols = {
|
||||
enable = true;
|
||||
rootDir = "require('lspconfig').util.root_pattern('deno.json', 'deno.jsonc')";
|
||||
rootMarkers = [ "require('lspconfig').util.root_pattern('deno.json', 'deno.jsonc')" ];
|
||||
};
|
||||
dockerls.enable = true; # Docker
|
||||
eslint.enable = true;
|
||||
|
@ -156,7 +156,7 @@
|
|||
tailwindcss.enable = true;
|
||||
ts_ls = {
|
||||
enable = true;
|
||||
rootDir = "require('lspconfig').util.root_pattern('package.json')";
|
||||
rootMarkers = [ "require('lspconfig').util.root_pattern('package.json')" ];
|
||||
settings = {
|
||||
single_file_support = false;
|
||||
};
|
||||
|
|
Loading…
Add table
Reference in a new issue