unexplrd/nixos-blueprint
2
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

too lazy to describe

Browse Source 
Signed-off-by: unexplrd <unexplrd@linerds.us>
This commit is contained in:
unexplrd
2025-03-20 19:58:38 +02:00
parent ef76c91365
commit 1d46820135
13 changed files with 839 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

321
flake.lock generated
View File

@ -108,11 +108,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1742376042,
"narHash": "sha256-sh09UPmrumfAEMeo50JLhGEkN/4FmEA6ad2KV5HXcos=",
"lastModified": 1742457865,
"narHash": "sha256-pSs0DuhXhXgjpIj+R+KitAcFYbHTiHmMqdYYhVPI4+Q=",
"owner": "numtide",
"repo": "blueprint",
"rev": "33e0f1c491e9f4c446e142f8b9edd23be43d188a",
"rev": "7ae8756a68c662d551e354beb537f365b80e5108",
"type": "github"
},
"original": {
@ -150,11 +150,11 @@
]
},
"locked": {
"lastModified": 1742347728,
"narHash": "sha256-wpAF+eNdPN21hwVirBXSsRDeWtTflkhsZL5zhGy6uB8=",
"lastModified": 1742387616,
"narHash": "sha256-gZTYYQKZAIkaAWxoKQT8hqYgAmZVXrMCQOKUaxhw3TU=",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "f8371934a154aad05f0f8f3f6ddaccb00f1b91e8",
"rev": "f2173f809f677746245e78ba57668f4bf91fdd69",
"type": "github"
},
"original": {
@ -345,6 +345,24 @@
"type": "github"
}
},
"flake-utils_3": {
"inputs": {
"systems": "systems_6"
},
"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"
}
},
"flakey-profile": {
"locked": {
"lastModified": 1712898590,
@ -491,11 +509,11 @@
]
},
"locked": {
"lastModified": 1742326330,
"narHash": "sha256-Tumt3tcMXJniSh7tw2gW+WAnVLeB3WWm+E+yYFnLBXo=",
"lastModified": 1742489436,
"narHash": "sha256-891PjWxlkKMEn4dK9rrqTV6py/lf7xFD0d5B2bM0A18=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "22a36aa709de7dd42b562a433b9cefecf104a6ee",
"rev": "fc189507bc0bc74b3794ee6912a5b80de8dfcc0c",
"type": "github"
},
"original": {
@ -601,11 +619,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1742341588,
"narHash": "sha256-IlkAyfErpnTEUpjGhECfGp3t3HgF8KHBrJquOCdjp3M=",
"lastModified": 1742468927,
"narHash": "sha256-3CBAs8OF0etCIaa4p+VyuXfLrL1cvD5E3Dmigqg2YOo=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "c8d80a292012f036e1a1d3eb3b0501e3e3917872",
"rev": "7ea4fbf0ba034d947339b3a94a10da022eca1988",
"type": "github"
},
"original": {
@ -877,7 +895,7 @@
"narHash": "sha256-8oUT6D7VlsuLkms3zBsUaPBUoxucmFq62QdtyVpjq0Y=",
"rev": "ed7a2fa83145868ecb830d6b3c73ebfd81a9e911",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/ed7a2fa83145868ecb830d6b3c73ebfd81a9e911.tar.gz?rev=ed7a2fa83145868ecb830d6b3c73ebfd81a9e911"
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/ed7a2fa83145868ecb830d6b3c73ebfd81a9e911.tar.gz"
},
"original": {
"type": "tarball",
@ -901,11 +919,11 @@
"mysecrets": {
"flake": false,
"locked": {
"lastModified": 1742222377,
"narHash": "sha256-Yte1I7I7Zf4eeeIvHgRGNElTUdKEke5L3O3VlAFNxkc=",
"lastModified": 1742817436,
"narHash": "sha256-akQP3zkg+kd7DdK0DP1xD1yrlbYRt5topRksrYi+gfI=",
"ref": "refs/heads/main",
"rev": "aa1b7e2fb86c6c9f4557bcbe4071b7da0f3bef6f",
"revCount": 10,
"rev": "6cd790ab268e8680ce13a7a02683b3c139db6194",
"revCount": 11,
"type": "git",
"url": "ssh://gitea@gitea.linerds.us/unexplrd/nix-secrets"
},
@ -914,35 +932,6 @@
"url": "ssh://gitea@gitea.linerds.us/unexplrd/nix-secrets"
}
},
<<<<<<< Conflict 1 of 6
%%%%%%% Changes from base to side #1
"neve": {
"inputs": {
"flake-utils": "flake-utils_2",
- "nixpkgs": "nixpkgs",
+ "nixpkgs": [
+ "nixpkgs"
+ ],
"nixvim": [
"nixvim"
]
},
"locked": {
"lastModified": 1739966521,
"narHash": "sha256-s6CvPfUzrRgeRc1fKd5Vfy9E8BTfURdkt496vBLrWsU=",
"ref": "refs/heads/main",
"rev": "f6e966a7903639b4d019ecca6c0f6c334c6887c8",
"revCount": 9,
"type": "git",
"url": "https://gitea.linerds.us/unexplrd/Neve"
},
"original": {
"type": "git",
"url": "https://gitea.linerds.us/unexplrd/Neve"
}
},
+++++++ Contents of side #2
>>>>>>> Conflict 1 of 6 ends
"nix-flatpak": {
"locked": {
"lastModified": 1741903049,
@ -1004,15 +993,15 @@
"nixos-cosmic": {
"inputs": {
"flake-compat": "flake-compat_2",
"nixpkgs": "nixpkgs",
"nixpkgs": "nixpkgs_2",
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1742351419,
"narHash": "sha256-IC3jdMFJtLnwnjNyCeQ1o9Y8gEmDw5RQ7ZLIXf0u7fs=",
"lastModified": 1742395601,
"narHash": "sha256-WSoI4R/pY/8AY5ulSn03nry9KFGBGFRFcXjhBYYRYtI=",
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
"rev": "55c7223b2c739b4d948a4a84a8150cedcb779e53",
"rev": "7f8e9de5c8494d209bd618dad4ad81e98b19fabc",
"type": "github"
},
"original": {
@ -1023,25 +1012,12 @@
},
"nixpkgs": {
"locked": {
<<<<<<< Conflict 2 of 6
%%%%%%% Changes from base to side #1
- "lastModified": 0,
+ "lastModified": 1741379970,
"narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
- "path": "/nix/store/pqgpwakx0m4r75zg34954w5mwi5shg89-source",
- "type": "path"
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f",
+ "type": "github"
+++++++ Contents of side #2
"lastModified": 1741851582,
"narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6607cf789e541e7873d40d3a8f7815ea92204f32",
"type": "github"
>>>>>>> Conflict 2 of 6 ends
},
"original": {
"owner": "NixOS",
@ -1052,11 +1028,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1742136038,
"narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=",
"lastModified": 1742268799,
"narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341",
"rev": "da044451c6a70518db5b730fe277b70f494188f1",
"type": "github"
},
"original": {
@ -1068,11 +1044,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1742069588,
"narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=",
"lastModified": 1742288794,
"narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5",
"rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42",
"type": "github"
},
"original": {
@ -1084,47 +1060,6 @@
},
"nixpkgs_3": {
"locked": {
<<<<<<< Conflict 3 of 6
%%%%%%% Changes from base to side #1
- "lastModified": 1741379970,
- "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_4": {
- "locked": {
"lastModified": 1738797219,
"narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1da52dd49a127ad74486b135898da2cef8c62665",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
- "nixpkgs_5": {
+ "nixpkgs_4": {
"locked": {
"lastModified": 1740367490,
"narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
+++++++ Contents of side #2
"lastModified": 1742288794,
"narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=",
"owner": "NixOS",
@ -1146,7 +1081,6 @@
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
>>>>>>> Conflict 3 of 6 ends
"type": "github"
},
"original": {
@ -1156,34 +1090,25 @@
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1736320768,
"narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4bc9c909d9ac828a039f288cf872d16d38185db8",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": {
"inputs": {
"flake-parts": "flake-parts",
<<<<<<< Conflict 4 of 6
%%%%%%% Changes from base to side #1
- "nixpkgs": "nixpkgs_4",
+ "nixpkgs": "nixpkgs_3",
"nuschtosSearch": "nuschtosSearch"
},
"locked": {
"lastModified": 1741098523,
"narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "03065fd4708bfdf47dd541d655392a60daa25ded",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixvim",
"type": "github"
}
},
"nur": {
"inputs": {
"flake-parts": "flake-parts_2",
+++++++ Contents of side #2
>>>>>>> Conflict 4 of 6 ends
"nixpkgs": [
"stylix",
"nixpkgs"
@ -1241,17 +1166,10 @@
"nix-flatpak": "nix-flatpak",
"nix-index-database": "nix-index-database",
"nixos-cosmic": "nixos-cosmic",
<<<<<<< Conflict 5 of 6
+++++++ Contents of side #1
"nixpkgs": "nixpkgs_2",
"nixvim": "nixvim",
%%%%%%% Changes from base to side #2
"nixpkgs": "nixpkgs_3",
- "nixvim": "nixvim",
>>>>>>> Conflict 5 of 6 ends
"nixpkgs": "nixpkgs_3",
"sops-nix": "sops-nix",
"stylix": "stylix",
"walker": "walker"
"way-edges": "way-edges"
}
},
"rust-analyzer-src": {
@ -1271,6 +1189,24 @@
"type": "github"
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1741573199,
"narHash": "sha256-A2sln1GdCf+uZ8yrERSCZUCqZ3JUlOv1WE2VFqqfaLQ=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "c777dc8a1e35407b0e80ec89817fe69970f4e81a",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"sops-nix": {
"inputs": {
"nixpkgs": [
@ -1278,11 +1214,11 @@
]
},
"locked": {
"lastModified": 1742239755,
"narHash": "sha256-ptn8dR4Uat3UUadGYNnB7CIH9SQm8mK69D2A/twBUXQ=",
"lastModified": 1742406979,
"narHash": "sha256-r0aq70/3bmfjTP+JZs4+XV5SgmCtk1BLU4CQPWGtA7o=",
"owner": "mic92",
"repo": "sops-nix",
"rev": "787afce414bcce803b605c510b60bf43c11f4b55",
"rev": "1770be8ad89e41f1ed5a60ce628dd10877cb3609",
"type": "github"
},
"original": {
@ -1313,11 +1249,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1742299802,
"narHash": "sha256-enlpX8hwrfmjv/dHTKWzAB5Cwt1Kr6+ptikjX3Ob+FY=",
"lastModified": 1742496983,
"narHash": "sha256-UpJrU0DEhNLVZwL/RPVOEUHCG6iDOVDoYelkmgS4V38=",
"owner": "danth",
"repo": "stylix",
"rev": "ff9ae322bcaeccabc65812390000276455331123",
"rev": "7e9906679d384472849272e5a5eef7adbdb1d87f",
"type": "github"
},
"original": {
@ -1401,55 +1337,21 @@
"type": "github"
}
},
<<<<<<< Conflict 6 of 6
%%%%%%% Changes from base to side #1
"systems_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_7": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
+ "systems_8": {
+ "locked": {
+ "lastModified": 1689347949,
+ "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+ "owner": "nix-systems",
+ "repo": "default-linux",
+ "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default-linux",
+ "type": "github"
+ }
+ },
+++++++ Contents of side #2
>>>>>>> Conflict 6 of 6 ends
"systems_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"tinted-foot": {
"flake": false,
"locked": {
@ -1554,24 +1456,25 @@
"type": "github"
}
},
"walker": {
"way-edges": {
"inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_8"
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1740745001,
"narHash": "sha256-XZEIwnwOYgb1wECvT83HB314bd/JBYwSaTaj2EeqWrc=",
"owner": "abenz1267",
"repo": "walker",
"rev": "350d5e078b997b5ca07eda39e207048ee26bbb9d",
"lastModified": 1742175527,
"narHash": "sha256-h9lxapVT5A1a5iGXvd4iS/xLAcntCxxfSIIzvupJJoc=",
"owner": "way-edges",
"repo": "way-edges",
"rev": "01947f9686a69104f941d9c13f8973f58080fcbb",
"type": "github"
},
"original": {
"owner": "abenz1267",
"repo": "walker",
"owner": "way-edges",
"repo": "way-edges",
"type": "github"
}
},