Compare commits

...

3 Commits

Author SHA1 Message Date
bdaf004472 Fix warnings from updating 2025-12-06 19:54:28 -05:00
e6ebf14016 Move to unstable nixpkgs only 2025-12-06 19:52:39 -05:00
90c7861da6 Update flake 2025-12-06 19:49:27 -05:00
3 changed files with 33 additions and 119 deletions

View File

@@ -1,4 +1,4 @@
{ pkgs, pkgs-unstable, inputs, ... }: { pkgs, inputs, ... }:
{ {
colorschemes.tokyonight.enable = true; colorschemes.tokyonight.enable = true;
@@ -109,12 +109,14 @@
neo-tree = { neo-tree = {
enable = true; enable = true;
closeIfLastWindow = true; settings = {
filesystem = { close_if_last_window = true;
filteredItems = { filesystem = {
visible = true; filtered_items = {
hideDotfiles = false; visible = true;
hideGitignored = false; hide_dotfiles = false;
hide_gItignored = false;
};
}; };
}; };
}; };
@@ -153,7 +155,7 @@
enable = true; enable = true;
settings = { settings = {
server = { server = {
cmd = [ "${pkgs-unstable.rust-analyzer}/bin/rust-analyzer" ]; cmd = [ "${pkgs.rust-analyzer}/bin/rust-analyzer" ];
}; };
}; };
}; };
@@ -162,10 +164,12 @@
mkdnflow = { mkdnflow = {
enable = true; enable = true;
mappings = { settings = {
MkdnEnter = { mappings = {
key = "<CR>"; MkdnEnter = {
modes = [ "n" "v" "i" ]; key = "<CR>";
modes = [ "n" "v" "i" ];
};
}; };
}; };
}; };

113
flake.lock generated
View File

@@ -8,11 +8,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1754487366, "lastModified": 1763759067,
"narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -39,24 +39,6 @@
"type": "github" "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"
}
},
"hml": { "hml": {
"flake": false, "flake": false,
"locked": { "locked": {
@@ -73,46 +55,18 @@
"type": "github" "type": "github"
} }
}, },
"ixx": {
"inputs": {
"flake-utils": [
"nixvim",
"nuschtosSearch",
"flake-utils"
],
"nixpkgs": [
"nixvim",
"nuschtosSearch",
"nixpkgs"
]
},
"locked": {
"lastModified": 1754860581,
"narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=",
"owner": "NuschtOS",
"repo": "ixx",
"rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"ref": "v0.1.1",
"repo": "ixx",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1755704039, "lastModified": 1764950072,
"narHash": "sha256-gKlP0LbyJ3qX0KObfIWcp5nbuHSb5EHwIvU6UcNBg2A=", "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9cb344e96d5b6918e94e1bca2d9f3ea1e9615545", "rev": "f61125a668a320878494449750330ca58b78c557",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.05", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -123,15 +77,14 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nuschtosSearch": "nuschtosSearch", "systems": "systems_2"
"systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1755900473, "lastModified": 1765043977,
"narHash": "sha256-UxpKQvD3dTT4/ueJBDccmHeHfnuUD+864Mzu8GPJZig=", "narHash": "sha256-Gcdn1s/ynXRFNqInTcYltAi1gqgmTKw8Hw6OSfFNWMY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "18a1b5126f917fbcd65397b9ee429387fdbd51a6", "rev": "b65233d5f9736cf8d8fe9d4652e1faf610b574bc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -140,29 +93,6 @@
"type": "github" "type": "github"
} }
}, },
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils_2",
"ixx": "ixx",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1755555503,
"narHash": "sha256-WiOO7GUOsJ4/DoMy2IC5InnqRDSo2U11la48vCCIjjY=",
"owner": "NuschtOS",
"repo": "search",
"rev": "6f3efef888b92e6520f10eae15b86ff537e1d2ea",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"repo": "search",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
@@ -202,29 +132,14 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"typst-preview": { "typst-preview": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1755810917, "lastModified": 1756817529,
"narHash": "sha256-hE5HPsuskOSqJ1KYp9/eCL5K90fRhMBe6t+skr+wyrI=", "narHash": "sha256-5cQcrOWn6VXHSPegAJgaYgYfYke8N7VRhUiJv4shtKw=",
"owner": "al-kot", "owner": "al-kot",
"repo": "typst-preview.nvim", "repo": "typst-preview.nvim",
"rev": "8759307163ef59698ff443e3784ad6a7af4ea484", "rev": "3d0e5991c14099425ac002af30cdb3dc167e5587",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -1,7 +1,6 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
@@ -21,17 +20,13 @@
}; };
}; };
outputs = { self, nixpkgs, nixpkgs-unstable, flake-utils, nixvim, ... }@inputs: outputs = { self, nixpkgs, flake-utils, nixvim, ... }@inputs:
flake-utils.lib.eachDefaultSystem (system: flake-utils.lib.eachDefaultSystem (system:
let let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
}; };
pkgs-unstable = import nixpkgs-unstable {
inherit system;
};
nixvimLib = nixvim.lib.${system}; nixvimLib = nixvim.lib.${system};
nixvimModule = import ./config.nix; nixvimModule = import ./config.nix;
@@ -39,7 +34,7 @@
nvim = nixvim.legacyPackages.${system}.makeNixvimWithModule { nvim = nixvim.legacyPackages.${system}.makeNixvimWithModule {
module = nixvimModule; module = nixvimModule;
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs pkgs-unstable; inherit inputs;
}; };
}; };
in in