odie
/
nixos-combined-flake
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: odie:b4f70cfed71b11383cbd7a49405720a340ccf326
Branches Tags
odie:develop
odie:wsl
..
compare: odie:b155715e4c4476e0b518a5d2f3bd7908ecdfa85a
Branches Tags
odie:develop
odie:wsl

No commits in common. "b4f70cfed71b11383cbd7a49405720a340ccf326" and "b155715e4c4476e0b518a5d2f3bd7908ecdfa85a" have entirely different histories.
b4f70cfed7 ... b155715e4c

14 changed files with 188 additions and 373 deletions
Show Stats Expand all files Collapse all files

415
flake.lock
View File

@ -17,21 +17,12 @@
} }
}, },
"catppuccin": { "catppuccin": {
"inputs": {
"catppuccin-v1_1": "catppuccin-v1_1",
"catppuccin-v1_2": "catppuccin-v1_2",
"home-manager": "home-manager",
"home-manager-stable": "home-manager-stable",
"nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable",
"nuscht-search": "nuscht-search"
},
"locked": { "locked": {
"lastModified": 1736069220, "lastModified": 1733900652,
"narHash": "sha256-76MaB3COao55nlhWmSmq9PKgu2iGIs54C1cAE0E5J6Y=", "narHash": "sha256-g2A9sNPPaumDzb2jNd2h8eiKzlwmlFzO1qymaq2GovU=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "8eada392fd6571a747e1c5fc358dd61c14c8704e", "rev": "f47bf8bbec54f721b0b5282e6bcfa85888b822dd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -40,34 +31,6 @@
"type": "github" "type": "github"
} }
}, },
"catppuccin-v1_1": {
"locked": {
"lastModified": 1734055249,
"narHash": "sha256-pCWJgwo77KD7EJpwynwKrWPZ//dwypHq2TfdzZWqK68=",
"rev": "7221d6ca17ac36ed20588e1c3a80177ac5843fa7",
"revCount": 326,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.1.1/0193bdc0-b045-7eed-bbec-95611a8ecdf5/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/catppuccin/nix/1.1.%2A.tar.gz"
}
},
"catppuccin-v1_2": {
"locked": {
"lastModified": 1734728407,
"narHash": "sha256-Let3uJo4YDyfqbqaw66dpZxhJB2TrDyZWSFd5rpPLJA=",
"rev": "23ee86dbf4ed347878115a78971d43025362fab1",
"revCount": 341,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.0/0193e5e0-33b7-7149-a362-bfe56b20f64e/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/catppuccin/nix/1.2.%2A.tar.gz"
}
},
"csleeptimer": { "csleeptimer": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
@ -102,11 +65,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735644329, "lastModified": 1728330715,
"narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "f7795ede5b02664b57035b3b757876703e2c3eac", "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -183,11 +146,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1736143030, "lastModified": 1733312601,
"narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -219,7 +182,9 @@
}, },
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": [
"systems"
]
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -236,17 +201,12 @@
} }
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": {
"systems": [
"systems"
]
},
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1644229661,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -271,23 +231,8 @@
} }
}, },
"flake-utils_4": { "flake-utils_4": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_5": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -310,14 +255,18 @@
"nixpkgs": [ "nixpkgs": [
"neovim-nightly-overlay", "neovim-nightly-overlay",
"nixpkgs" "nixpkgs"
],
"nixpkgs-stable": [
"neovim-nightly-overlay",
"nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1735882644, "lastModified": 1733665616,
"narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "narHash": "sha256-+XTFXYlFJBxohhMGLDpYdEnhUNdxN8dyTA8WAd+lh2A=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "rev": "d8c02f0ffef0ef39f6063731fc539d8c71eb463a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -336,14 +285,18 @@
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
],
"nixpkgs-stable": [
"nixvim",
"nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1735882644, "lastModified": 1733318908,
"narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "rev": "6f4e2a2112050951a314d2733a994fbab94864c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -447,11 +400,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735695978, "lastModified": 1733333617,
"narHash": "sha256-cwk53OX1S1bCFY09zydubZNmmwcx9l5XEba8mVYuNE4=", "narHash": "sha256-nMMQXREGvLOLvUa0ByhYFdaL0Jov0t1wzLbKjr05P2w=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "hercules-ci-effects", "repo": "hercules-ci-effects",
"rev": "f6233b5cfbada692d93a73d6ed35bdbfd0fdb9c4", "rev": "56f8ea8d502c87cf62444bec4ee04512e8ea24ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -463,58 +416,15 @@
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"catppuccin",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1734622215, "lastModified": 1733873195,
"narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", "narHash": "sha256-dTosiZ3sZ/NKoLKQ++v8nZdEHya0eTNEsaizNp+MUPM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", "rev": "f26aa4b76fb7606127032d33ac73d7d507d82758",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"home-manager-stable": {
"inputs": {
"nixpkgs": [
"catppuccin",
"nixpkgs-stable"
]
},
"locked": {
"lastModified": 1734366194,
"narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-24.11",
"repo": "home-manager",
"type": "github"
}
},
"home-manager_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1736277415,
"narHash": "sha256-kPDXF6cIPsVqSK08XF5EC6KM7BdMnM9vtJDzsnf+lLU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "5c4302313d9207f7ec0886d68f8ff4a3c71209a1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -524,34 +434,6 @@
} }
}, },
"ixx": { "ixx": {
"inputs": {
"flake-utils": [
"catppuccin",
"nuscht-search",
"flake-utils"
],
"nixpkgs": [
"catppuccin",
"nuscht-search",
"nixpkgs"
]
},
"locked": {
"lastModified": 1729958008,
"narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
"owner": "NuschtOS",
"repo": "ixx",
"rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"ref": "v0.0.6",
"repo": "ixx",
"type": "github"
}
},
"ixx_2": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
"nixvim", "nixvim",
@ -582,11 +464,11 @@
"lazydev": { "lazydev": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1734714787, "lastModified": 1732489623,
"narHash": "sha256-ZaAkGTwEBoOjy6RyIPKFLJswxfOu886bN899UakXAv0=", "narHash": "sha256-ErX0dCyAVRn5wtlXVnbEYku2dicIkFySdlsqg5vrWoA=",
"owner": "folke", "owner": "folke",
"repo": "lazydev.nvim", "repo": "lazydev.nvim",
"rev": "8620f82ee3f59ff2187647167b6b47387a13a018", "rev": "f59bd14a852ca43db38e3662395354cb2a9b13e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -632,11 +514,11 @@
"luavit-meta": { "luavit-meta": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1735631530, "lastModified": 1732058720,
"narHash": "sha256-x1qZyBRxe9DbqyGg2doTSO5HsxHRuStSSSUCzHXRLyk=", "narHash": "sha256-c6AFyWwWzG8WyhFqo8F3+aa8mZYtRrdPizmwf9a5yQk=",
"owner": "Bilal2453", "owner": "Bilal2453",
"repo": "luvit-meta", "repo": "luvit-meta",
"rev": "55709f183b0742a7e4f47688c284f81148ad4dc0", "rev": "57d464c4acb5c2e66bd4145060f5dc9e96a7bbb7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -680,11 +562,11 @@
"neorg": { "neorg": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1736265148, "lastModified": 1733872345,
"narHash": "sha256-6tDeAKAqAXZhT0dr2oFP4x6l8sJ1AL135PaZIe6ZsgY=", "narHash": "sha256-6pUwWfsJ0TmToGU7Bvaeobnj2vuIqwd4w3TDdTvQZSk=",
"owner": "nvim-neorg", "owner": "nvim-neorg",
"repo": "neorg", "repo": "neorg",
"rev": "bc660d6e2f3b5985ab6eaa02288efe418a1ce99a", "rev": "62671a7b03a1f38a6e5e03b006a9b6f8d804be0e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -707,11 +589,11 @@
"norg-meta": "norg-meta" "norg-meta": "norg-meta"
}, },
"locked": { "locked": {
"lastModified": 1736298855, "lastModified": 1734078148,
"narHash": "sha256-TpTtasMBcXvm5Hyyq9gNXfkFG5mH7suLHQPbZ0aKedI=", "narHash": "sha256-W3MlwXmWDMJoWwp6N+874Eh7ksq43yBXmm5HCTCLvjQ=",
"owner": "nvim-neorg", "owner": "nvim-neorg",
"repo": "nixpkgs-neorg-overlay", "repo": "nixpkgs-neorg-overlay",
"rev": "c215b161e019938802e71611359bd3a98ad3b973", "rev": "1f1d248bd728946582a13e29de4638131af4f66b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -755,11 +637,11 @@
"neorg_2": { "neorg_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1736265148, "lastModified": 1733872345,
"narHash": "sha256-6tDeAKAqAXZhT0dr2oFP4x6l8sJ1AL135PaZIe6ZsgY=", "narHash": "sha256-6pUwWfsJ0TmToGU7Bvaeobnj2vuIqwd4w3TDdTvQZSk=",
"owner": "nvim-neorg", "owner": "nvim-neorg",
"repo": "neorg", "repo": "neorg",
"rev": "bc660d6e2f3b5985ab6eaa02288efe418a1ce99a", "rev": "62671a7b03a1f38a6e5e03b006a9b6f8d804be0e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -785,11 +667,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1736233375, "lastModified": 1733903671,
"narHash": "sha256-I6fqKdaoKOVU33SyPv+MuxWRiOs+PXQTO94aCLA3rAc=", "narHash": "sha256-pztctU+iwx4zh1TrGAmnrZOv9ud8/tRjlObXmZnbRbo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "721f5f602b876a3ee21be04f68ab3cedf162e7f6", "rev": "331e9c8200a2413f891b9dd762fc179ce6d335f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -801,11 +683,11 @@
"neovim-src": { "neovim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1736193797, "lastModified": 1733850961,
"narHash": "sha256-5S4RnwKfa5nn/r+8OsMtfgD6TEA5P6cWKti76A0zIMc=", "narHash": "sha256-GpdTTQ1g7tERjY/rzGZtiWd5eAqKsTtPJN/LEBkTU0E=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "b6ab294838421afb6932c52dd6e6d35d571e621d", "rev": "3f1d09bc94d02266d6fa588a2ccd1be1ca084cf7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -841,11 +723,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736085891, "lastModified": 1733570843,
"narHash": "sha256-bTl9fcUo767VaSx4Q5kFhwiDpFQhBKna7lNbGsqCQiA=", "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "ba9b3173b0f642ada42b78fb9dfc37ca82266f6c", "rev": "a35b08d09efda83625bef267eb24347b446c80b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -867,11 +749,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736300827, "lastModified": 1733709556,
"narHash": "sha256-u+EDWFGKrJgLB6c0i26UqDSN5zc5+bvKf9OS80rkH7s=", "narHash": "sha256-u0ll0DDrKlO7tiLGGtmphv3wFy5ReDuf0USo/OlfROU=",
"owner": "Infinidoge", "owner": "Infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "b475c4229266709644047fd91c30600bcf38c5f1", "rev": "8d11f147df83fe137d3d94f6f3646e3a52bec855",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -905,11 +787,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1736283893, "lastModified": 1733861262,
"narHash": "sha256-BG1FfTexFwNty5VhYjaQLMR6CMPfI3QRcaZrFQYu2EM=", "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "4f339f6be2b61662f957c2ee9eda0fa597d8a6d6", "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -923,16 +805,19 @@
"flake-compat": [ "flake-compat": [
"flake-compat" "flake-compat"
], ],
"flake-utils": [
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1736095716, "lastModified": 1733854371,
"narHash": "sha256-csysw/Szu98QDiA2lhWk9seYOyCebeVEWL89zh1cduM=", "narHash": "sha256-K9qGHniYBbjqVcEiwXyiofj/IFf78L5F0/FCf+CKyr0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "63c3b4ed1712a3a0621002cd59bfdc80875ecbb0", "rev": "dee4425dcee3149475ead0cb6a616b8a028c5888",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -943,11 +828,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1734424634, "lastModified": 1734649271,
"narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -959,14 +844,14 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1735774519, "lastModified": 1733096140,
"narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
} }
}, },
"nixpkgs-lib_2": { "nixpkgs-lib_2": {
@ -984,34 +869,18 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": {
"locked": {
"lastModified": 1734600368,
"narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1734649271, "lastModified": 1644486793,
"narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -1034,27 +903,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1644486793, "lastModified": 1734141057,
"narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", "narHash": "sha256-z8KMwCFX9W0KyUfIpdN9Qx9/JAsd6KyF4A96EuDW3S8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1882c6b7368fd284ad01b0a5b5601ef136321292",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1736303332,
"narHash": "sha256-TI4mH4g8n3Q30l2l6I7oPCAsCk1ztNTMV0H9I3geC5k=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d7d3f1b52838e997732722024153aac2ea4a45c2", "rev": "9a5c9fb07412bf180b6c91d12b4bfaa06596f92c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1084,11 +937,11 @@
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1736292108, "lastModified": 1734103614,
"narHash": "sha256-0mGe0okcNDKp0A9lS/birSP0Z5oheqgrXzQeolHM9U8=", "narHash": "sha256-H5JN0fajkKZLir/GN6QHmLsR3cW+/EIOR+W/VmwHKfI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "0ebc64a2328fc0a0532f9544eb6c6e297135962e", "rev": "c181014422fa9261db06fc9b5ecbf67f42c30ec3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1100,8 +953,8 @@
"norg": { "norg": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1672582520, "lastModified": 1672582520,
@ -1121,8 +974,8 @@
"norg-meta": { "norg-meta": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1713028366, "lastModified": 1713028366,
@ -1202,11 +1055,11 @@
"treefmt-nix": "treefmt-nix_3" "treefmt-nix": "treefmt-nix_3"
}, },
"locked": { "locked": {
"lastModified": 1736309469, "lastModified": 1733903948,
"narHash": "sha256-f08QTp9siJkwGOWT7uY2AREvkbxY0oHSyGvDlE5qCx8=", "narHash": "sha256-baC/RU5e8DYqnLHOaujXtyR6CYH7zbBMNC2HDUN1evs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "2856877385d0fce64ac7d5cd08740de3c00b8927", "rev": "40794120f4a3369d84c0b4862d49476f127e0f7b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1215,44 +1068,21 @@
"type": "github" "type": "github"
} }
}, },
"nuscht-search": {
"inputs": {
"flake-utils": "flake-utils",
"ixx": "ixx",
"nixpkgs": [
"catppuccin",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733773348,
"narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=",
"owner": "NuschtOS",
"repo": "search",
"rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"repo": "search",
"type": "github"
}
},
"nuschtosSearch": { "nuschtosSearch": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_4",
"ixx": "ixx_2", "ixx": "ixx",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1735854821, "lastModified": 1733411491,
"narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", "narHash": "sha256-315rJ7O9cOllPDaFscnJhcMleORHbxon0Kq9LAKJ5p4=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "836908e3bddd837ae0f13e215dd48767aee355f0", "rev": "68e9fad70d95d08156cf10a030bd39487bed8ffe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1311,7 +1141,7 @@
}, },
"packwiz": { "packwiz": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1734972138, "lastModified": 1734972138,
@ -1375,10 +1205,10 @@
"csleeptimer": "csleeptimer", "csleeptimer": "csleeptimer",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils",
"gokosync": "gokosync", "gokosync": "gokosync",
"guihua": "guihua", "guihua": "guihua",
"home-manager": "home-manager_2", "home-manager": "home-manager",
"lazydev": "lazydev", "lazydev": "lazydev",
"luavit-meta": "luavit-meta", "luavit-meta": "luavit-meta",
"minecraft-server-flake": "minecraft-server-flake", "minecraft-server-flake": "minecraft-server-flake",
@ -1391,7 +1221,7 @@
"nixgl": "nixgl", "nixgl": "nixgl",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_4",
"nixvim": "nixvim", "nixvim": "nixvim",
"norg": "norg_2", "norg": "norg_2",
"norg-meta": "norg-meta_2", "norg-meta": "norg-meta_2",
@ -1402,7 +1232,7 @@
"nvim-spell-de-utf8-suggestions": "nvim-spell-de-utf8-suggestions", "nvim-spell-de-utf8-suggestions": "nvim-spell-de-utf8-suggestions",
"raspberry-pi-nix": "raspberry-pi-nix", "raspberry-pi-nix": "raspberry-pi-nix",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"systems": "systems_3", "systems": "systems_2",
"vim-mcfunction": "vim-mcfunction" "vim-mcfunction": "vim-mcfunction"
} }
}, },
@ -1515,11 +1345,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736203741, "lastModified": 1736064798,
"narHash": "sha256-eSjkBwBdQk+TZWFlLbclF2rAh4JxbGg8az4w/Lfe7f4=", "narHash": "sha256-xJRN0FmX9QJ6+w8eIIIxzBU1AyQcLKJ1M/Gp6lnSD20=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c9c88f08e3ee495e888b8d7c8624a0b2519cb773", "rev": "5dc08f9cc77f03b43aacffdfbc8316807773c930",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1558,21 +1388,6 @@
"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"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -1581,11 +1396,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736154270, "lastModified": 1733761991,
"narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1602,11 +1417,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736115332, "lastModified": 1733440889,
"narHash": "sha256-FBG9d7e0BTFfxVdw4b5EmNll2Mv7hfRc54hbB4LrKko=", "narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "1788ca5acd4b542b923d4757d4cfe4183cc6a92d", "rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
flake.nix
View File

@ -166,6 +166,7 @@
url = "github:nix-community/NixOS-WSL"; url = "github:nix-community/NixOS-WSL";
inputs = { inputs = {
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
flake-compat.follows = "flake-compat"; flake-compat.follows = "flake-compat";
}; };
}; };

2
modules/home-manager/games/default.nix
View File

@ -8,7 +8,7 @@ with lib; {
config = { config = {
games = { games = {
unnethack.enable = mkDefault false; unnethack.enable = mkDefault true;
dsda-doom.enable = mkDefault true; dsda-doom.enable = mkDefault true;
woof.enable = mkDefault true; woof.enable = mkDefault true;
eternity.enable = mkDefault true; eternity.enable = mkDefault true;

2
modules/home-manager/shell/yazi/default.nix
View File

@ -1,7 +1,7 @@
_: { _: {
programs = { programs = {
yazi = { yazi = {
enable = false; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
}; };
}; };

23
modules/nixos/base/nixos/default.nix
View File

@ -1,40 +1,32 @@
{ inputs, overlays, lib, config, ... }: { { inputs, overlays, ... }: {
nixpkgs = { nixpkgs = {
config.allowUnfree = true; config.allowUnfree = true;
inherit overlays; inherit overlays;
}; };
nix = nix = {
let registry.nixpkgs.flake = inputs.nixpkgs;
flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;
in
{
optimise = { optimise = {
automatic = true; automatic = true;
}; };
channel.enable = false;
registry = lib.mapAttrs (_: flake: { inherit flake; }) flakeInputs;
nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
settings = { settings = {
trusted-users = [ "root" "@wheel" ]; trusted-users = [ "root" "@wheel" ];
experimental-features = [ "nix-command" "flakes" ]; experimental-features = [ "nix-command" "flakes" ];
auto-optimise-store = true; auto-optimise-store = true;
substituters = [ substituters = [
"http://nix-cache.gaja-group.intranet:5000" #"http://nix-cache.gaja-group.intranet:5000"
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
"https://cache.nixos.org"
]; ];
trusted-public-keys = [ trusted-public-keys = [
"nix-cache.gaja-group.intranet:EcUsafvI9NUrnab3DA71s2PGjAYMgct0FOvCwdYuStw=" #"nix-cache.gaja-group.intranet:EcUsafvI9NUrnab3DA71s2PGjAYMgct0FOvCwdYuStw="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
]; ];
nix-path = config.nix.nixPath;
}; };
gc = { gc = {
automatic = true; automatic = true;
dates = "weekly"; dates = "weekly";
options = "--delete-older-than 30d"; options = "--delete-older-than 30d";
}; };
/*
buildMachines = [ buildMachines = [
{ {
hostName = "nix-cache.gaja-group.intranet"; hostName = "nix-cache.gaja-group.intranet";
@ -44,7 +36,7 @@
# replace the previous line by, e.g., # replace the previous line by, e.g.,
systems = [ "x86_64-linux" "aarch64-linux" ]; systems = [ "x86_64-linux" "aarch64-linux" ];
maxJobs = 4; maxJobs = 4;
speedFactor = 2; speedFactor = 1;
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
mandatoryFeatures = [ ]; mandatoryFeatures = [ ];
} }
@ -54,5 +46,6 @@
extraOptions = '' extraOptions = ''
builders-use-substitutes = true builders-use-substitutes = true
''; '';
*/
}; };
} }

4
modules/nixos/base/raspberry-pi/default.nix
View File

@ -4,8 +4,8 @@
}; };
config = lib.mkIf config.hardware.raspberry-pi.enable { config = lib.mkIf config.hardware.raspberry-pi.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
libraspberrypi #libraspberrypi
raspberrypi-eeprom #raspberrypi-eeprom
]; ];
}; };
} }

2
modules/nixos/mediacenter/default.nix
View File

@ -2,7 +2,7 @@ _:
{ {
imports = [ imports = [
./kodi ./kodi
#./jellyfin ./jellyfin
./gokosync ./gokosync
]; ];
} }

2
modules/nixvim/default.nix
View File

@ -57,14 +57,12 @@
{ {
plugin = neorg-telescope; plugin = neorg-telescope;
} }
/*
{ {
plugin = pkgs.vimUtils.buildVimPlugin { plugin = pkgs.vimUtils.buildVimPlugin {
name = "guihua"; name = "guihua";
src = inputs.guihua; src = inputs.guihua;
}; };
} }
*/
{ {
plugin = pkgs.vimUtils.buildVimPlugin { plugin = pkgs.vimUtils.buildVimPlugin {
name = "luavit-meta"; name = "luavit-meta";

2
modules/nixvim/plugins/lsp/languages/rust.nix
View File

@ -14,6 +14,6 @@
}; };
}; };
}; };
crates.enable = true; crates-nvim.enable = true;
}; };
} }

6
profiles/home-manager/odie@asgard/home.nix
View File

@ -1,4 +1,5 @@
{ inputs { pkgs
, inputs
, outputs , outputs
, vars , vars
, ... , ...
@ -39,5 +40,8 @@
sessionVariables = { sessionVariables = {
PATH = "/home/${vars.username}/bin:$PATH"; PATH = "/home/${vars.username}/bin:$PATH";
}; };
packages = with pkgs; [
nix-serve
];
}; };
} }

1
profiles/home-manager/odie@pi0/home.nix
View File

@ -1,6 +1,7 @@
{ outputs, ... }: { { outputs, ... }: {
imports = [ imports = [
outputs.homeManagerModules.base outputs.homeManagerModules.base
outputs.homeManagerModules.shell
outputs.homeManagerModules.user outputs.homeManagerModules.user
]; ];
} }

14
profiles/nixos/pi0/configuration.nix
View File

@ -19,23 +19,26 @@ let
in in
{ {
imports = [ imports = [
#inputs.nixos-hardware.nixosModules.raspberry-pi-4 inputs.nixos-hardware.nixosModules.raspberry-pi-4
outputs.nixosModules.base outputs.nixosModules.base
outputs.nixosModules.home-manager outputs.nixosModules.home-manager
outputs.nixosModules.mediacenter outputs.nixosModules.mediacenter
outputs.nixosModules.sops outputs.nixosModules.sops
outputs.nixosModules.raspberry-pi outputs.nixosModules.raspberry-pi
./hardware-configuration.nix ./hardware-configuration.nix
] ] ++ map (name: (import ../../../lib/genSslCert.nix {
++ map (name: (import ../../../lib/genSslCert.nix {
inherit name; inherit name;
inherit (config.services.haproxy) user; inherit (config.services.haproxy) user;
dataDir = haproxy.certDir; dataDir = haproxy.certDir;
domain = name; domain = name;
wantedBy = [ "haproxy.service" ]; wantedBy = [ "haproxy.service" ];
Before = [ "haproxy.service" ]; Before = [ "haproxy.service" ];
})) haproxy.domains })) haproxy.domains;
;
nixpkgs.crossSystem = {
# target platform
system = "riscv64-linux";
};
networking = { networking = {
inherit (vars) hostName domain; inherit (vars) hostName domain;
@ -68,6 +71,7 @@ in
libraspberrypi libraspberrypi
raspberrypi-eeprom raspberrypi-eeprom
libcec libcec
kitty
nfs-utils nfs-utils
]; ];

5
profiles/nixos/pi0/hardware-configuration.nix
View File

@ -87,8 +87,7 @@
}; };
}; };
}; };
system.stateVersion = "25.05"; system.stateVersion = "23.11";
nixpkgs.hostPlatform.system = "aarch64-linux"; #nixpkgs.hostPlatform.system = "aarch64-linux";
#nixpkgs.buildPlatform.system = "x86_64-linux";
} }

8
remote-deploy.sh
View File

@ -4,7 +4,7 @@ set -e
HOSTNAME=$1 HOSTNAME=$1
GC_FORCE_UNMAP_ON_GCOLLECT=1 nix build -L ".#nixosConfigurations.${HOSTNAME}.config.system.build.toplevel" nix build -L ".#nixosConfigurations.${HOSTNAME}.config.system.build.toplevel"
#nix copy --no-check-sigs --to "ssh-ng://root@${HOSTNAME}" "./result" nix copy --no-check-sigs --to "ssh-ng://root@${HOSTNAME}" "./result"
#ssh "root@${HOSTNAME}" nix-env -p /nix/var/nix/profiles/system --set "$(readlink ./result)" ssh "root@${HOSTNAME}" nix-env -p /nix/var/nix/profiles/system --set "$(readlink ./result)"
#ssh "root@${HOSTNAME}" /nix/var/nix/profiles/system/bin/switch-to-configuration switch ssh "root@${HOSTNAME}" /nix/var/nix/profiles/system/bin/switch-to-configuration switch