worble/nixos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
worble
2025-06-30 00:01:06 +01:00
parent dbbfc3d8ff ed349bd4e6
commit 739518cdac
24 changed files with 1216 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
flake.lock generated
View File

@@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1745812220,
"narHash": "sha256-hotBG0EJ9VmAHJYF0yhWuTVZpENHvwcJ2SxvIPrXm+g=",
"lastModified": 1750040002,
"narHash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=",
"owner": "nix-community",
"repo": "disko",
"rev": "d0c543d740fad42fe2c035b43c9d41127e073c78",
"rev": "7f1857b31522062a6a00f88cbccf86b43acceed1",
"type": "github"
},
"original": {
@@ -45,20 +45,40 @@
]
},
"locked": {
"lastModified": 1745557122,
"narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=",
"lastModified": 1749154018,
"narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1",
"rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-24.11",
"ref": "release-25.05",
"repo": "home-manager",
"type": "github"
}
},
"nix-index-database": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1749960154,
"narHash": "sha256-EWlr9MZDd+GoGtZB4QsDzaLyaDQPGnRY03MFp6u2wSg=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "424a40050cdc5f494ec45e46462d288f08c64475",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-index-database",
"type": "github"
}
},
"nix-system-graphics": {
"inputs": {
"nixpkgs": [
@@ -85,11 +105,19 @@
"nixpkgs": "nixpkgs"
},
"locked": {
<<<<<<< HEAD
"lastModified": 1745978191,
"narHash": "sha256-DC9GhExyUbJKbBMgs+YA4fuUzOqUPuA6pR0mDI3MELk=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
"rev": "72da67da783674ef82032f4d5bcf686a7ccd8776",
=======
"lastModified": 1750039657,
"narHash": "sha256-Vrh5PDskpJ2kEumHbncffZxWQGr2pK88oTOFtBUWG74=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
"rev": "54ce2a0e930383535c632aad39b22205fa430be0",
>>>>>>> ed349bd4e6f56043a44e9d1cf136e47bfd30f99b
"type": "github"
},
"original": {
@@ -100,11 +128,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1745955289,
"narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=",
"lastModified": 1750083401,
"narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b",
"rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad",
"type": "github"
},
"original": {
@@ -132,11 +160,19 @@
},
"nixpkgs-unstable": {
"locked": {
<<<<<<< HEAD
"lastModified": 1745930157,
"narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
=======
"lastModified": 1749794982,
"narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
>>>>>>> ed349bd4e6f56043a44e9d1cf136e47bfd30f99b
"type": "github"
},
"original": {
@@ -148,16 +184,24 @@
},
"nixpkgs_2": {
"locked": {
<<<<<<< HEAD
"lastModified": 1745921652,
"narHash": "sha256-hEAvEN+y/OQ7wA7+u3bFJwXSe8yoSf2QaOMH3hyTJTQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b000159bba69b0106a42f65e52dbf27f77aca9d3",
=======
"lastModified": 1750005367,
"narHash": "sha256-h/aac1dGLhS3qpaD2aZt25NdKY7b+JT0ZIP2WuGsJMU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3",
>>>>>>> ed349bd4e6f56043a44e9d1cf136e47bfd30f99b
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.11",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
@@ -166,6 +210,7 @@
"inputs": {
"disko": "disko",
"home-manager": "home-manager",
"nix-index-database": "nix-index-database",
"nix-system-graphics": "nix-system-graphics",
"nix-vscode-extensions": "nix-vscode-extensions",
"nixos-hardware": "nixos-hardware",
@@ -181,11 +226,11 @@
]
},
"locked": {
"lastModified": 1744139528,
"narHash": "sha256-ABIcmxzf8399pJzXqHzShXtzw7iC+zxjhOxp/qS0fQk=",
"lastModified": 1748252092,
"narHash": "sha256-6nL55wvV7SthEXaXDiQo8xxkxQLAVcNBU21YJ7GJLm8=",
"owner": "numtide",
"repo": "system-manager",
"rev": "803322102ed51f29c250d4bff2973625adc4a521",
"rev": "c6850451ef769fd03d0ad5474f928b916aa23775",
"type": "github"
},
"original": {