This commit is contained in:
KaitoTLex 2024-10-29 21:15:36 -07:00
parent 6daaef0025
commit f416209832
2 changed files with 122 additions and 342 deletions

415
flake.lock generated
View file

@ -1,42 +1,52 @@
{ {
"nodes": { "nodes": {
"devshell": { "blink-cmp": {
"inputs": { "inputs": {
"fenix": "fenix",
"flake-parts": "flake-parts",
"nixpkgs": [ "nixpkgs": [
"nixvim",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1722113426, "lastModified": 1730224427,
"narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", "narHash": "sha256-Q3dbBWFOgV1mlNPui33Bn804E3fmgr7LEH/tx4rtESM=",
"owner": "numtide", "owner": "Saghen",
"repo": "devshell", "repo": "blink.cmp",
"rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", "rev": "6f0fc86f8fbb94ae23770c01dc2e3cf9e1886e99",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "numtide", "owner": "Saghen",
"repo": "devshell", "repo": "blink.cmp",
"type": "github"
}
},
"fenix": {
"inputs": {
"nixpkgs": [
"nixvim",
"blink-cmp",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1730097176,
"narHash": "sha256-ufvRff76Y19mkRsmx+mAnxKE9A9VaNWC2mVY6TwumOw=",
"owner": "nix-community",
"repo": "fenix",
"rev": "482b57f3f27a9336e0fbc62fa99ee0f624ccf4d0",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github" "type": "github"
} }
}, },
"flake-compat": { "flake-compat": {
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"revCount": 57,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
}
},
"flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -57,11 +67,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1726153070, "lastModified": 1727826117,
"narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -70,118 +80,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"nixvim",
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1726153070,
"narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"git-hooks": {
"inputs": {
"flake-compat": [
"nixvim",
"nixvim",
"flake-compat"
],
"gitignore": "gitignore",
"nixpkgs": [
"nixvim",
"nixvim",
"nixpkgs"
],
"nixpkgs-stable": [
"nixvim",
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1725513492,
"narHash": "sha256-tyMUA6NgJSvvQuzB7A1Sf8+0XCHyfSPRx/b00o6K0uo=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "7570de7b9b504cfe92025dd1be797bf546f66528",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixvim",
"git-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"haskell-tools": {
"flake": false,
"locked": {
"lastModified": 1726521542,
"narHash": "sha256-TyqjJohmIwuqMqy01H3sRRcm8okNeWtAfLqX2Ehr9mQ=",
"owner": "mrcjkb",
"repo": "haskell-tools.nvim",
"rev": "1edf2bb5ced056b5d3d1df783dd02041ce09b087",
"type": "github"
},
"original": {
"owner": "mrcjkb",
"repo": "haskell-tools.nvim",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -202,63 +100,18 @@
"type": "github" "type": "github"
} }
}, },
"home-manager_2": { "nixCats": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixvim",
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1726357542, "lastModified": 1730202844,
"narHash": "sha256-p4OrJL2weh0TRtaeu1fmNYP6+TOp/W2qdaIJxxQay4c=", "narHash": "sha256-M4IBPRz/oVlgEERPi5s4Oe3MzoZOSjYXVgjCdsk+YSM=",
"owner": "nix-community", "owner": "BirdeeHub",
"repo": "home-manager", "repo": "nixCats-nvim",
"rev": "e524c57b1fa55d6ca9d8354c6ce1e538d2a1f47f", "rev": "553caacfe4728ea3ca3671b7edeb9f6fb6025dc7",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "BirdeeHub",
"repo": "home-manager", "repo": "nixCats-nvim",
"type": "github"
}
},
"lsp-progress": {
"flake": false,
"locked": {
"lastModified": 1721008335,
"narHash": "sha256-OafRT5AnxRTOh7MYofRFjti0+pobKQihymZs/kr5w0A=",
"owner": "linrongbin16",
"repo": "lsp-progress.nvim",
"rev": "d5f4d28efe75ce636bfbe271eb45f39689765aab",
"type": "github"
},
"original": {
"owner": "linrongbin16",
"repo": "lsp-progress.nvim",
"type": "github"
}
},
"nix-darwin": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1726188813,
"narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "21fe31f26473c180390cfa81e3ea81aca0204c80",
"type": "github"
},
"original": {
"owner": "lnl7",
"repo": "nix-darwin",
"type": "github" "type": "github"
} }
}, },
@ -276,121 +129,83 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1725233747, "lastModified": 1727825735,
"narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1726463316, "lastModified": 1730045389,
"narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", "narHash": "sha256-4spSNTZ6h8Xmvrr9oqfuxc9jarasGj1QOcsgw8BfNd8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", "rev": "0fcb98acb6633445764dafe180e6833eb0f95208",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "blink-cmp": "blink-cmp",
"haskell-tools": "haskell-tools", "nixCats": "nixCats",
"lsp-progress": "lsp-progress",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixvim": "nixvim_2", "plugins-lsp-progress": "plugins-lsp-progress",
"render-markdown": "render-markdown", "plugins-typst-preview": "plugins-typst-preview"
"satellite": "satellite"
}, },
"locked": { "locked": {
"lastModified": 1727886157, "lastModified": 1730257706,
"narHash": "sha256-+gdybUe2sz3QF+pwVVJFz4uBlHjDyHWWpxhDMafBVvk=", "narHash": "sha256-+xyqOXiDT+k10Hsi2U4AvLMwka25nQrUYThz14A/HgM=",
"owner": "KaitoTLex", "owner": "youwen5",
"repo": "neovim-flake", "repo": "viminal2",
"rev": "77af044f5e51da9bdc03200a0607d3ee30c8c0d0", "rev": "25b63a02346342ea2525eb0ff9b06cd4d5bfd35e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "KaitoTLex", "owner": "youwen5",
"repo": "neovim-flake", "repo": "viminal2",
"type": "github" "type": "github"
} }
}, },
"nixvim_2": { "plugins-lsp-progress": {
"inputs": {
"devshell": "devshell",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts_2",
"git-hooks": "git-hooks",
"home-manager": "home-manager_2",
"nix-darwin": "nix-darwin",
"nixpkgs": [
"nixvim",
"nixpkgs"
],
"nuschtosSearch": "nuschtosSearch",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1726604448,
"narHash": "sha256-Y9myeRO551JhU5GLoczhHPMquhR0bhtq8Mih1TSu+l0=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "6cbf441c22b2c26a1561993f5993e20612a6df1c",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixvim",
"type": "github"
}
},
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixvim",
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1726392886,
"narHash": "sha256-9RtOuG7V8KG8IU8nZje5EQ1WSM/inr7+zb3tAgTiHDM=",
"owner": "NuschtOS",
"repo": "search",
"rev": "97d34b70deed4878fcb2449ac89dab717d72efa1",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"repo": "search",
"type": "github"
}
},
"render-markdown": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1726611009, "lastModified": 1721008335,
"narHash": "sha256-1SCsjCzE5XUGbj+rqruttD2gQEeAty1J6aoLcPwke0E=", "narHash": "sha256-OafRT5AnxRTOh7MYofRFjti0+pobKQihymZs/kr5w0A=",
"owner": "MeanderingProgrammer", "owner": "linrongbin16",
"repo": "render-markdown.nvim", "repo": "lsp-progress.nvim",
"rev": "5ff191f0c7457ede2fd30ecf76ab16c65118b4ee", "rev": "d5f4d28efe75ce636bfbe271eb45f39689765aab",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "MeanderingProgrammer", "owner": "linrongbin16",
"repo": "render-markdown.nvim", "repo": "lsp-progress.nvim",
"type": "github"
}
},
"plugins-typst-preview": {
"flake": false,
"locked": {
"lastModified": 1729754430,
"narHash": "sha256-oBJ+G4jTQw6+MF/SMwaTkGlLQuYLbaAFqJkexf45I1g=",
"owner": "chomosuke",
"repo": "typst-preview.nvim",
"rev": "06778d1b3d4d29c34f1faf80947b586f403689ba",
"type": "github"
},
"original": {
"owner": "chomosuke",
"repo": "typst-preview.nvim",
"type": "github" "type": "github"
} }
}, },
@ -402,25 +217,26 @@
"spicetify": "spicetify" "spicetify": "spicetify"
} }
}, },
"satellite": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725437627, "lastModified": 1730028316,
"narHash": "sha256-5WMKEsS9e9nTuylZ5pRPIW+G/52HKC1bjSdz3GvJg+8=", "narHash": "sha256-FsPsSjqnqMHBgDdM24DFLw4YOw0mFKYFJBcLaI6CvI8=",
"owner": "lewis6991", "owner": "rust-lang",
"repo": "satellite.nvim", "repo": "rust-analyzer",
"rev": "dfc2b220f4969ebc49b0f2a94ab6faae240705bd", "rev": "3b3a87fe9bd3f2a79942babc1d1e385b6805c384",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "lewis6991", "owner": "rust-lang",
"repo": "satellite.nvim", "ref": "nightly",
"repo": "rust-analyzer",
"type": "github" "type": "github"
} }
}, },
"spicetify": { "spicetify": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -438,43 +254,6 @@
"repo": "spicetify-nix", "repo": "spicetify-nix",
"type": "github" "type": "github"
} }
},
"systems": {
"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": [
"nixvim",
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1725271838,
"narHash": "sha256-VcqxWT0O/gMaeWTTjf1r4MOyG49NaNxW4GHTO3xuThE=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "9fb342d14b69aefdf46187f6bb80a4a0d97007cd",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -10,7 +10,7 @@
url = "github:Gerg-L/spicetify-nix"; url = "github:Gerg-L/spicetify-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixvim.url = "github:KaitoTLex/neovim-flake"; nixvim.url = "github:kaitotlex/vix1";
}; };
outputs = outputs =
@ -21,28 +21,29 @@
}@inputs: }@inputs:
{ {
formatter."x86_64-linux" = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style; formatter."x86_64-linux" = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;
nixosConfigurations.kuroko = nixpkgs.lib.nixosSystem{ nixosConfigurations.kuroko = nixpkgs.lib.nixosSystem {
specialArgs = { specialArgs = {
inherit inputs; inherit inputs;
}; };
system= "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./hosts/kuroko ./hosts/kuroko
home-manager.nixosModules.home-manager{ home-manager.nixosModules.home-manager
home-manager = { {
useGlobalPkgs = true; home-manager = {
useUserPackages = true; useGlobalPkgs = true;
backupFileExtension = "backup"; useUserPackages = true;
extraSpecialArgs = { backupFileExtension = "backup";
inherit inputs; extraSpecialArgs = {
}; inherit inputs;
users.kaitotlex = { };
imports = [ ./users/kaitotlex ]; users.kaitotlex = {
}; imports = [ ./users/kaitotlex ];
}; };
} };
]; }
}; ];
};
nixosConfigurations.shiroko = nixpkgs.lib.nixosSystem { nixosConfigurations.shiroko = nixpkgs.lib.nixosSystem {
specialArgs = { specialArgs = {
inherit inputs; inherit inputs;
@ -50,7 +51,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./hosts/shiroko ./hosts/shiroko
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager = { home-manager = {