bumped revs; removed unnecessary flake imports

This commit is contained in:
Ellis Rahhal 2025-05-29 14:20:00 -07:00
parent 6a2b1631f2
commit 4a83351844
5 changed files with 43 additions and 55 deletions

69
flake.lock generated
View file

@ -8,11 +8,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741352980, "lastModified": 1743550720,
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "rev": "c621e8422220273271f52058f618c94e405bb0f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -53,43 +53,27 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729958008, "lastModified": 1748294338,
"narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "ixx", "repo": "ixx",
"rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NuschtOS", "owner": "NuschtOS",
"ref": "v0.0.6", "ref": "v0.0.8",
"repo": "ixx", "repo": "ixx",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1742669843, "lastModified": 1748406211,
"narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", "narHash": "sha256-B3BsCRbc+x/d0WiG1f+qfSLUy+oiIfih54kalWBi+/M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1e5b653dff12029333a6546c11e108ede13052eb", "rev": "3d1f29646e4b57ed468d60f9d286cde23a8d1707",
"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",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -102,15 +86,16 @@
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"nuschtosSearch": "nuschtosSearch" "nuschtosSearch": "nuschtosSearch",
"systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1742732006, "lastModified": 1748521000,
"narHash": "sha256-ZIBMfPNb/hfoFf79MRnhDXGKl0yGhjlYEpy3+/jbxFI=", "narHash": "sha256-EnXH5PIrZBoe8U09hPQr2kOuPTZSqAJy78DqUVLmWXg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "7776e37b67e7875c3cd56d9d20fd050798071706", "rev": "a9e45072d82374dd3f0d971795e7d7f99e5bc6c2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -129,11 +114,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742659553, "lastModified": 1748298102,
"narHash": "sha256-i/JCrr/jApVorI9GkSV5to+USrRCa0rWuQDH8JSlK2A=", "narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "508752835128a3977985a4d5225ff241f7756181", "rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -144,7 +129,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs",
"nixvim": "nixvim" "nixvim": "nixvim"
} }
}, },
@ -162,6 +146,21 @@
"repo": "default", "repo": "default",
"type": "github" "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", "root": "root",

View file

@ -2,30 +2,16 @@
description = "Opinionated Nixvim config as a flake"; description = "Opinionated Nixvim config as a flake";
inputs = { inputs = {
## nixvim uses it's own version, so this is only nixvim.url = "github:nix-community/nixvim";
## for explicitly installed packages and non nixvim config
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixvim = {
url = "github:nix-community/nixvim";
}; };
}; # outputs = { self, nixpkgs, ... } @ inputs:
outputs = { self, ... } @ inputs:
outputs = { self, nixpkgs, ... } @ inputs:
{ {
nixosModules = rec { nixosModules = rec {
nixvim-config = { config, ... }: default = import ./default.nix {
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 {
inherit inputs; inherit inputs;
inherit pkgs;
}; };
default = nixvim-config;
}; };
}; };
} }

View file

@ -3,6 +3,8 @@
programs.nixvim = { programs.nixvim = {
enable = config.nixvim-config.enable; enable = config.nixvim-config.enable;
nixpkgs.config.allowUnfree = true; # For claude-code
defaultEditor = true; defaultEditor = true;
globals = { globals = {

View file

@ -34,6 +34,7 @@
programs.nixvim = { programs.nixvim = {
plugins = { plugins = {
claude-code.enable = true;
comment.enable = true; comment.enable = true;
## needed by avante. already archived, so may need to migrate to snacks ## needed by avante. already archived, so may need to migrate to snacks
# dressing.enable = true; # dressing.enable = true;

View file

@ -122,7 +122,7 @@
# custom_elements_ls.enable = true; # custom_elements_ls.enable = true;
denols = { denols = {
enable = true; 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 dockerls.enable = true; # Docker
eslint.enable = true; eslint.enable = true;
@ -156,7 +156,7 @@
tailwindcss.enable = true; tailwindcss.enable = true;
ts_ls = { ts_ls = {
enable = true; enable = true;
rootDir = "require('lspconfig').util.root_pattern('package.json')"; rootMarkers = [ "require('lspconfig').util.root_pattern('package.json')" ];
settings = { settings = {
single_file_support = false; single_file_support = false;
}; };