gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

revert to stable

Browse source
This commit is contained in:
Gerg-L 2024-06-29 11:55:12 -04:00
parent 98c4d12843
commit 4f3b446721
Signed by: gerg-l
SSH key fingerprint: SHA256:FPYDHIkvMocr4wdmZXpgpJjsb2Tw6rASs2ISPbOb0KI
4 changed files with 432 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

467
flake.lock generated
View file

@ -1,5 +1,33 @@
{
"nodes": {
"cargo2nix": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_3",
"nixpkgs": [
"nix-janitor",
"nixpkgs"
],
"rust-overlay": [
"nix-janitor",
"rust-overlay"
]
},
"locked": {
"lastModified": 1712112199,
"narHash": "sha256-5ur7bE90d+6Ny6PzC/6R0bDAa6B1+gDAk2XIFSDfAjY=",
"owner": "cargo2nix",
"repo": "cargo2nix",
"rev": "da5f5d796af00fe818aa12f3b2d46a4800e6fec8",
"type": "github"
},
"original": {
"owner": "cargo2nix",
"ref": "release-0.12",
"repo": "cargo2nix",
"type": "github"
}
},
"crane": {
"inputs": {
"nixpkgs": [
@ -28,11 +56,11 @@
]
},
"locked": {
"lastModified": 1719582740,
"narHash": "sha256-s4WsLu2L8EzF5Hg2TkelFLVhKGL108AySnlw8voPe5U=",
"lastModified": 1720402389,
"narHash": "sha256-zJv6euDOrJWMHBhxfp/ay+Dvjwpe8YtMuEI5b09bxmo=",
"owner": "nix-community",
"repo": "disko",
"rev": "115311bc395f24c1b553338fec4b3aa28cbf5ae2",
"rev": "f1a00e7f55dc266ef286cc6fc8458fa2b5ca2414",
"type": "github"
},
"original": {
@ -94,6 +122,22 @@
}
},
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1650374568,
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1696426674,
@ -109,7 +153,39 @@
"type": "github"
}
},
"flake-compat_4": {
"flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_6": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_7": {
"flake": false,
"locked": {
"lastModified": 1696426674,
@ -167,6 +243,50 @@
"type": "github"
}
},
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": [
"nvim-flake",
"neovim-nightly",
"nixpkgs"
]
},
"locked": {
"lastModified": 1719994518,
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_4": {
"inputs": {
"nixpkgs-lib": [
"nvim-flake",
"neovim-nightly",
"hercules-ci-effects",
"nixpkgs"
]
},
"locked": {
"lastModified": 1712014858,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
"type": "github"
},
"original": {
"id": "flake-parts",
"type": "indirect"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
@ -200,6 +320,68 @@
"type": "github"
}
},
"flake-utils_3": {
"locked": {
"lastModified": 1653893745,
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"git-hooks": {
"inputs": {
"flake-compat": "flake-compat_6",
"gitignore": "gitignore_2",
"nixpkgs": [
"nvim-flake",
"neovim-nightly",
"nixpkgs"
],
"nixpkgs-stable": [
"nvim-flake",
"neovim-nightly",
"nixpkgs"
]
},
"locked": {
"lastModified": 1720450253,
"narHash": "sha256-1in42htN3g3MnE3/AO5Qgs6pMWUzmtPQ7s675brO8uw=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "2b6bd3c87d3a66fb0b8f2f06c985995e04b4fb96",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
@ -222,6 +404,52 @@
"type": "github"
}
},
"gitignore_2": {
"inputs": {
"nixpkgs": [
"nvim-flake",
"neovim-nightly",
"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"
}
},
"hercules-ci-effects": {
"inputs": {
"flake-parts": "flake-parts_4",
"nixpkgs": [
"nvim-flake",
"neovim-nightly",
"nixpkgs"
]
},
"locked": {
"lastModified": 1719226092,
"narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"type": "github"
}
},
"lanzaboote": {
"inputs": {
"crane": "crane",
@ -235,11 +463,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1718782018,
"narHash": "sha256-8SBmf7Sx5xMLzL4VGEU0fe8cuq0yMumdkXgOPXXD3Bo=",
"lastModified": 1719818887,
"narHash": "sha256-Bogl1pJlgby7OpR16jp8zwOWV7FHRxCsnNxHcisyIq0=",
"owner": "nix-community",
"repo": "lanzaboote",
"rev": "6fa7bc0522f71d3906a3788bbd80c344cd9c4523",
"rev": "0e6457c98547ec8866714d4222545e7e8c1ae429",
"type": "github"
},
"original": {
@ -266,11 +494,11 @@
},
"master": {
"locked": {
"lastModified": 1719636763,
"narHash": "sha256-96BzIHmzdonQefqa1oXcECkDKLvcjQ2I32aJWvrR8xU=",
"lastModified": 1720540455,
"narHash": "sha256-okp1J30YYwBXpT2pO7A5vv2amcgDyzMu0XLxCWhcOgE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3b15388bfe1d4b3aa8933ef5af832605b6ca8328",
"rev": "250ad58c1d94245a5221313348a497b0e1cc0ce3",
"type": "github"
},
"original": {
@ -280,19 +508,41 @@
"type": "github"
}
},
"neovim-nightly": {
"inputs": {
"flake-compat": "flake-compat_5",
"flake-parts": "flake-parts_3",
"git-hooks": "git-hooks",
"hercules-ci-effects": "hercules-ci-effects",
"neovim-src": "neovim-src",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1720483510,
"narHash": "sha256-IG/g4l/W0R2M/jxEyu/Sl3BmR/OK5D1jiahpc0wlpvE=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "b6b51915180e6d2eac488d6f882e4ba36bad380d",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"type": "github"
}
},
"neovim-src": {
"flake": false,
"locked": {
"lastModified": 1715815279,
"narHash": "sha256-Pf7ZlqPnr195NZb5ADzMVsXurPMjRZ+JMXf6JxvXArE=",
"lastModified": 1720478486,
"narHash": "sha256-66u+yzjk6NrFr2jj2svD3jwNX8P2B8/DNH9A51V4kh8=",
"owner": "neovim",
"repo": "neovim",
"rev": "9ca81b025990911c2a0dbda92af39ba84983bac3",
"rev": "fb6c059dc55c8d594102937be4dd70f5ff51614a",
"type": "github"
},
"original": {
"owner": "neovim",
"ref": "9ca81b025990911c2a0dbda92af39ba84983bac3",
"repo": "neovim",
"type": "github"
}
@ -331,11 +581,11 @@
]
},
"locked": {
"lastModified": 1719111455,
"narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=",
"lastModified": 1720334033,
"narHash": "sha256-X9pEvvHTVWJphhbUYqXvlLedOndNqGB7rvhSvL2CIgU=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6",
"rev": "685e40e1348007d2cf76747a201bab43d86b38cb",
"type": "github"
},
"original": {
@ -344,13 +594,37 @@
"type": "github"
}
},
"nix-janitor": {
"inputs": {
"cargo2nix": "cargo2nix",
"nixpkgs": [
"unstable"
],
"parts": "parts",
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1716802118,
"narHash": "sha256-KRXz2qUDWmyglXk56jL0twOQ3pWdpacddyVn95W7wl0=",
"owner": "Nobbz",
"repo": "nix-janitor",
"rev": "d49fd7486d5597d2e854154bf643e7f86c5f1f6c",
"type": "github"
},
"original": {
"owner": "Nobbz",
"ref": "d49fd7486d5597d2e854154bf643e7f86c5f1f6c",
"repo": "nix-janitor",
"type": "github"
}
},
"nixlib": {
"locked": {
"lastModified": 1719103869,
"narHash": "sha256-kbTUy+/lfjUrMfV7JkTJwxowsFhi9Tb3BdbiOcIGcsc=",
"lastModified": 1719708727,
"narHash": "sha256-XFNKtyirrGNdehpg7lMNm1skEcBApjqGhaHc/OI95HY=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "f820613f886cd1aa4bcfd1dbaa6c83c8a3dcd863",
"rev": "1bba8a624b3b9d4f68db94fb63aaeb46039ce9e6",
"type": "github"
},
"original": {
@ -367,11 +641,11 @@
]
},
"locked": {
"lastModified": 1719450236,
"narHash": "sha256-fh0l6pLvuTrTBakFMQfK7lwpjvWd5i+CFyVs8TMzPNo=",
"lastModified": 1720055043,
"narHash": "sha256-SKizewU4UeYrkZWPUjur8EoxscGoNb0pGcrNL4YzAIg=",
"owner": "nix-community",
"repo": "nixos-generators",
"rev": "1867f28f87fcf4e817f165003aff967a5280aaab",
"rev": "168b220231a70e47cc1f0919048fa5914415fb18",
"type": "github"
},
"original": {
@ -380,6 +654,22 @@
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1706487304,
"narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "90f456026d284c22b3e3497be980b2e47d0b28ac",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-23-11": {
"locked": {
"lastModified": 1717159533,
@ -396,6 +686,24 @@
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"dir": "lib",
"lastModified": 1688049487,
"narHash": "sha256-100g4iaKC9MalDjUW9iN6Jl/OocTDtXdeAj7pEGIRh4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4bc72cae107788bf3f24f30db2e2f685c9298dc9",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-regression": {
"locked": {
"lastModified": 1643052045,
@ -430,34 +738,50 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1719099622,
"narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=",
"lastModified": 1720282526,
"narHash": "sha256-dudRkHPRivMNOhd04YI+v4sWvn2SnN5ODSPIu5IVbco=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5e8e3b89adbd0be63192f6e645e0a54080004924",
"rev": "550ac3e955c30fe96dd8b2223e37e0f5d225c927",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-23.11",
"ref": "release-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1720368505,
"narHash": "sha256-5r0pInVo5d6Enti0YwUSQK4TebITypB42bWy5su3MrQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ab82a9612aa45284d4adf69ee81871a389669a9e",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nvim-flake": {
"inputs": {
"flake-compat": "flake-compat_3",
"neovim-src": "neovim-src",
"flake-compat": "flake-compat_4",
"neovim-nightly": "neovim-nightly",
"nixpkgs": [
"unstable"
]
},
"locked": {
"lastModified": 1719634777,
"narHash": "sha256-idpLzr1cWt4/MMECexokvmLzdZbcPzxMlNkn8qH7ZKA=",
"lastModified": 1720498718,
"narHash": "sha256-2fOBInm2+UWUHWOxg2DYjXXE4+aFsFPwBZe/U1I7vq8=",
"owner": "Gerg-L",
"repo": "nvim-flake",
"rev": "4c915cbcde2d607775564c249ece5b0fa9c6e52b",
"rev": "d105256eaaa8f662f32f4b839ab75b46a2e89a24",
"type": "github"
},
"original": {
@ -466,6 +790,24 @@
"type": "github"
}
},
"parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1688466019,
"narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": [
@ -533,13 +875,16 @@
"master": "master",
"nix": "nix",
"nix-index-database": "nix-index-database",
"nix-janitor": "nix-janitor",
"nixos-generators": "nixos-generators",
"nvim-flake": "nvim-flake",
"sops-nix": "sops-nix",
"spicetify-nix": "spicetify-nix",
"stable": "stable",
"suckless": "suckless",
"unstable": "unstable"
"unstable": [
"stable"
]
}
},
"rust-overlay": {
@ -567,6 +912,25 @@
"type": "github"
}
},
"rust-overlay_2": {
"inputs": {
"flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1715998563,
"narHash": "sha256-krjs9VkDoRrYNQVyCTXUGUfAJziCk0Fkki1ZnnmNgjk=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "4731829dec4859921bfc0e1548478207d6c9c8fa",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"sops-nix": {
"inputs": {
"nixpkgs": [
@ -575,11 +939,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1719268571,
"narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=",
"lastModified": 1720479166,
"narHash": "sha256-jqvhLDXzTLTHq9ZviFOpcTmXXmnbLfz7mWhgMNipMN4=",
"owner": "mic92",
"repo": "sops-nix",
"rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3",
"rev": "67035a355b1d52d2d238501f8cc1a18706979760",
"type": "github"
},
"original": {
@ -590,17 +954,17 @@
},
"spicetify-nix": {
"inputs": {
"flake-compat": "flake-compat_4",
"flake-compat": "flake-compat_7",
"nixpkgs": [
"unstable"
]
},
"locked": {
"lastModified": 1719636239,
"narHash": "sha256-mB5+b3etyGkR+siUgenRtG/D3zpEsnWWlc2jStUCXy4=",
"lastModified": 1720498310,
"narHash": "sha256-kRIOxSQawmW2s5xl+oz/aOzs8qLnJ5EYCOQVIRiNeGo=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
"rev": "e001562d36d808e238227e2e54d4fd8a6d40a5b1",
"rev": "3909a99ac614d6d35ef0f692b54bf06ad211b8a7",
"type": "github"
},
"original": {
@ -611,11 +975,11 @@
},
"stable": {
"locked": {
"lastModified": 1719426051,
"narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=",
"lastModified": 1720386169,
"narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd",
"rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
"type": "github"
},
"original": {
@ -660,19 +1024,18 @@
"type": "github"
}
},
"unstable": {
"systems_2": {
"locked": {
"lastModified": 1719254875,
"narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60",
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}

16
flake.nix
View file

@ -8,10 +8,11 @@
ref = "master";
};
unstable = {
type = "github";
owner = "NixOS";
repo = "nixpkgs";
ref = "nixos-unstable";
follows = "stable";
#type = "github";
#owner = "NixOS";
#repo = "nixpkgs";
#ref = "nixos-unstable";
};
stable = {
type = "github";
@ -57,6 +58,13 @@
repo = "lanzaboote";
inputs.nixpkgs.follows = "unstable";
};
nix-janitor = {
type = "github";
owner = "Nobbz";
repo = "nix-janitor";
ref = "d49fd7486d5597d2e854154bf643e7f86c5f1f6c";
inputs.nixpkgs.follows = "unstable";
};
#my own packages
spicetify-nix = {
type = "github";

5
modules/hardware.nix
View file

@ -9,9 +9,10 @@ in
};
config = lib.mkMerge [
(lib.mkIf (!cfg.gpuAcceleration.disable) {
hardware.graphics = {
hardware.opengl = {
enable = true;
enable32Bit = true;
driSupport = true;
driSupport32Bit = true;
};
})
(lib.mkIf (!cfg.sound.disable) {

4
modules/misc.nix
View file

@ -1,8 +1,8 @@
{
self',
lib,
config,
pkgs,
nix-janitor,
}:
{
options.local.allowedUnfree = lib.mkOption {
@ -32,7 +32,7 @@
nix-tree # view packages
pciutils # lspci
;
inherit (self'.packages) nix-janitor;
inherit (nix-janitor.packages) default;
}
);