move to 21.11
This commit is contained in:
		
							parent
							
								
									61cc1354b3
								
							
						
					
					
						commit
						aec4771aba
					
				
							
								
								
									
										456
									
								
								flake.lock
									
									
									
									
									
								
							
							
						
						
									
										456
									
								
								flake.lock
									
									
									
									
									
								
							|  | @ -3,15 +3,15 @@ | |||
|     "agenix": { | ||||
|       "inputs": { | ||||
|         "nixpkgs": [ | ||||
|           "latest" | ||||
|           "nixos" | ||||
|         ] | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1620877075, | ||||
|         "narHash": "sha256-XvgTqtmQZHegu9UMDSR50gK5cHEM2gbnRH0qecmdN54=", | ||||
|         "lastModified": 1638319138, | ||||
|         "narHash": "sha256-ve33f4nTKQluyvm5URQwL019x0Fnrg8urqzvymNeD+s=", | ||||
|         "owner": "ryantm", | ||||
|         "repo": "agenix", | ||||
|         "rev": "e543aa7d68f222e1e771165da9e9a64b5bf7b3e3", | ||||
|         "rev": "52ea2f8c3231cc2b5302fa28c63588aacb77ea29", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|  | @ -20,6 +20,26 @@ | |||
|         "type": "github" | ||||
|       } | ||||
|     }, | ||||
|     "beautysh": { | ||||
|       "inputs": { | ||||
|         "flake-utils": "flake-utils", | ||||
|         "nixpkgs": "nixpkgs", | ||||
|         "poetry2nix": "poetry2nix" | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1630693543, | ||||
|         "narHash": "sha256-7Sly3ReaJZw60Qo0rpfN4jF6zy94nwQz6ENgUUFzJfg=", | ||||
|         "owner": "lovesegfault", | ||||
|         "repo": "beautysh", | ||||
|         "rev": "5609593961b70428f58d5c1b4b25cdda43b0d0bd", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|         "owner": "lovesegfault", | ||||
|         "repo": "beautysh", | ||||
|         "type": "github" | ||||
|       } | ||||
|     }, | ||||
|     "blank": { | ||||
|       "locked": { | ||||
|         "lastModified": 1625557891, | ||||
|  | @ -37,6 +57,7 @@ | |||
|     }, | ||||
|     "bud": { | ||||
|       "inputs": { | ||||
|         "beautysh": "beautysh", | ||||
|         "devshell": [ | ||||
|           "digga", | ||||
|           "devshell" | ||||
|  | @ -46,11 +67,11 @@ | |||
|         ] | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1627855680, | ||||
|         "narHash": "sha256-snDOrUp8nth2Vs3GeEXr7Xji+HaHy25htZLNvid/U3I=", | ||||
|         "lastModified": 1633877936, | ||||
|         "narHash": "sha256-+o3n6s7fR8dBGRldTGelyp2j3jSyTlrniOXwNfmMG20=", | ||||
|         "owner": "divnix", | ||||
|         "repo": "bud", | ||||
|         "rev": "612228a68d404d559405225427a5d8b3cef9d27c", | ||||
|         "rev": "15df091133ff95216c321b09be04905c0a0944c4", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|  | @ -62,15 +83,15 @@ | |||
|     "darwin": { | ||||
|       "inputs": { | ||||
|         "nixpkgs": [ | ||||
|           "latest" | ||||
|           "nixos" | ||||
|         ] | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1622060422, | ||||
|         "narHash": "sha256-hPVlvrAyf6zL7tTx0lpK+tMxEfZeMiIZ/A2xaJ41WOY=", | ||||
|         "lastModified": 1634994402, | ||||
|         "narHash": "sha256-xmlCVVOYGpZoxgOqsDOVF0B0ASrnbNGVAEzID9qh2xo=", | ||||
|         "owner": "LnL7", | ||||
|         "repo": "nix-darwin", | ||||
|         "rev": "007d700e644ac588ad6668e6439950a5b6e2ff64", | ||||
|         "rev": "44da835ac40dab5fd231298b59d83487382d2fab", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|  | @ -81,38 +102,34 @@ | |||
|     }, | ||||
|     "deploy": { | ||||
|       "inputs": { | ||||
|         "fenix": "fenix", | ||||
|         "flake-compat": "flake-compat", | ||||
|         "naersk": "naersk", | ||||
|         "nixpkgs": [ | ||||
|           "digga", | ||||
|           "nixpkgs" | ||||
|           "nixos" | ||||
|         ], | ||||
|         "utils": [ | ||||
|           "digga", | ||||
|           "flake-utils" | ||||
|         ] | ||||
|         "utils": "utils" | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1628068208, | ||||
|         "narHash": "sha256-akJBkj6os4bjO1drhketJvXNC21yPuy4ufL2pyius4M=", | ||||
|         "owner": "serokell", | ||||
|         "lastModified": 1638318651, | ||||
|         "narHash": "sha256-YsYBMa8Chtb6ccGZOVStReiZ33ZNmi7kNPLf/Ua2kY8=", | ||||
|         "owner": "input-output-hk", | ||||
|         "repo": "deploy-rs", | ||||
|         "rev": "d72174307d5b88ec24cc2e69e875228fe3d642ed", | ||||
|         "rev": "1d3a4f4681a98479219c628165bb6b3a12eae843", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|         "owner": "serokell", | ||||
|         "owner": "input-output-hk", | ||||
|         "repo": "deploy-rs", | ||||
|         "type": "github" | ||||
|       } | ||||
|     }, | ||||
|     "devshell": { | ||||
|       "locked": { | ||||
|         "lastModified": 1625086391, | ||||
|         "narHash": "sha256-IpNPv1v8s4L3CoxhwcgZIitGpcrnNgnj09X7TA0QV3k=", | ||||
|         "lastModified": 1637575296, | ||||
|         "narHash": "sha256-ZY8YR5u8aglZPe27+AJMnPTG6645WuavB+w0xmhTarw=", | ||||
|         "owner": "numtide", | ||||
|         "repo": "devshell", | ||||
|         "rev": "4b5ac7cf7d9a1cc60b965bb51b59922f2210cbc7", | ||||
|         "rev": "0e56ef21ba1a717169953122c7415fa6a8cd2618", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|  | @ -124,13 +141,16 @@ | |||
|     "digga": { | ||||
|       "inputs": { | ||||
|         "blank": "blank", | ||||
|         "deploy": "deploy", | ||||
|         "deploy": [ | ||||
|           "deploy" | ||||
|         ], | ||||
|         "devshell": "devshell", | ||||
|         "flake-utils": "flake-utils", | ||||
|         "flake-utils": "flake-utils_3", | ||||
|         "flake-utils-plus": "flake-utils-plus", | ||||
|         "home-manager": [ | ||||
|           "home" | ||||
|         ], | ||||
|         "latest": "latest", | ||||
|         "nixlib": [ | ||||
|           "nixos" | ||||
|         ], | ||||
|  | @ -140,11 +160,11 @@ | |||
|         ] | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1628211944, | ||||
|         "narHash": "sha256-2q1dNUzitVd0JNRHYTubbyb8ks3fL9hPJOvQgofxELE=", | ||||
|         "lastModified": 1638227261, | ||||
|         "narHash": "sha256-CbleULqH3NRnnLdwqHqi0qk1sEmhyXE8ZOzjofilGM4=", | ||||
|         "owner": "divnix", | ||||
|         "repo": "digga", | ||||
|         "rev": "760bb9c29063258ba547145de0ab96acd7eba4c0", | ||||
|         "rev": "1ce6cef4230f82cb986ef3d08d57a2e3a0e6e80d", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|  | @ -153,14 +173,49 @@ | |||
|         "type": "github" | ||||
|       } | ||||
|     }, | ||||
|     "fenix": { | ||||
|       "inputs": { | ||||
|         "nixpkgs": "nixpkgs_3", | ||||
|         "rust-analyzer-src": "rust-analyzer-src" | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1637303083, | ||||
|         "narHash": "sha256-e2A5JBjxYNpjoGd53K0oVUUaS9ojwOT5rnThyPNS46M=", | ||||
|         "owner": "nix-community", | ||||
|         "repo": "fenix", | ||||
|         "rev": "8294ceadbbbe1a886640bfcc15f5a02a2b471955", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|         "owner": "nix-community", | ||||
|         "repo": "fenix", | ||||
|         "type": "github" | ||||
|       } | ||||
|     }, | ||||
|     "flake-compat": { | ||||
|       "flake": false, | ||||
|       "locked": { | ||||
|         "lastModified": 1606424373, | ||||
|         "narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=", | ||||
|         "lastModified": 1627913399, | ||||
|         "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", | ||||
|         "owner": "edolstra", | ||||
|         "repo": "flake-compat", | ||||
|         "rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf", | ||||
|         "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|         "owner": "edolstra", | ||||
|         "repo": "flake-compat", | ||||
|         "type": "github" | ||||
|       } | ||||
|     }, | ||||
|     "flake-compat_2": { | ||||
|       "flake": false, | ||||
|       "locked": { | ||||
|         "lastModified": 1627913399, | ||||
|         "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", | ||||
|         "owner": "edolstra", | ||||
|         "repo": "flake-compat", | ||||
|         "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|  | @ -186,26 +241,82 @@ | |||
|     }, | ||||
|     "flake-utils-plus": { | ||||
|       "inputs": { | ||||
|         "flake-utils": [ | ||||
|           "digga", | ||||
|           "flake-utils" | ||||
|         ] | ||||
|         "flake-utils": "flake-utils_4" | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1627071952, | ||||
|         "narHash": "sha256-FhE0KOuI9Kl4eyGJXu4bh9fBP2hbxjnD1DlKHljCcYs=", | ||||
|         "owner": "gytis-ivaskevicius", | ||||
|         "lastModified": 1630859749, | ||||
|         "narHash": "sha256-qkoU2rIbbP2+T0dfcqXW35GCWNsi0Y1IgN9BELmt4Zo=", | ||||
|         "owner": "divnix", | ||||
|         "repo": "flake-utils-plus", | ||||
|         "rev": "51a82925db31073bc4822c9b538a0a3ebf1134b2", | ||||
|         "rev": "a4e267e3fc87e60c5029c6c3855935ff1ff3018e", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|         "owner": "gytis-ivaskevicius", | ||||
|         "ref": "staging", | ||||
|         "owner": "divnix", | ||||
|         "repo": "flake-utils-plus", | ||||
|         "type": "github" | ||||
|       } | ||||
|     }, | ||||
|     "flake-utils_2": { | ||||
|       "locked": { | ||||
|         "lastModified": 1638122382, | ||||
|         "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", | ||||
|         "owner": "numtide", | ||||
|         "repo": "flake-utils", | ||||
|         "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|         "owner": "numtide", | ||||
|         "repo": "flake-utils", | ||||
|         "type": "github" | ||||
|       } | ||||
|     }, | ||||
|     "flake-utils_3": { | ||||
|       "locked": { | ||||
|         "lastModified": 1638122382, | ||||
|         "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", | ||||
|         "owner": "numtide", | ||||
|         "repo": "flake-utils", | ||||
|         "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|         "owner": "numtide", | ||||
|         "repo": "flake-utils", | ||||
|         "type": "github" | ||||
|       } | ||||
|     }, | ||||
|     "flake-utils_4": { | ||||
|       "locked": { | ||||
|         "lastModified": 1638122382, | ||||
|         "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", | ||||
|         "owner": "numtide", | ||||
|         "repo": "flake-utils", | ||||
|         "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|         "owner": "numtide", | ||||
|         "repo": "flake-utils", | ||||
|         "type": "github" | ||||
|       } | ||||
|     }, | ||||
|     "flake-utils_5": { | ||||
|       "locked": { | ||||
|         "lastModified": 1631561581, | ||||
|         "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", | ||||
|         "owner": "numtide", | ||||
|         "repo": "flake-utils", | ||||
|         "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|         "owner": "numtide", | ||||
|         "repo": "flake-utils", | ||||
|         "type": "github" | ||||
|       } | ||||
|     }, | ||||
|     "home": { | ||||
|       "inputs": { | ||||
|         "nixpkgs": [ | ||||
|  | @ -213,27 +324,43 @@ | |||
|         ] | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1624228557, | ||||
|         "narHash": "sha256-wwOqe73BsrXfRv1PhyXQFNC8iTET50KvE/HitdkRgxs=", | ||||
|         "lastModified": 1638267006, | ||||
|         "narHash": "sha256-heZdDlD09rnoeEiZ4wKfbXNDkO5I9qVFvX9d790h/XE=", | ||||
|         "owner": "nix-community", | ||||
|         "repo": "home-manager", | ||||
|         "rev": "35a24648d155843a4d162de98c17b1afd5db51e4", | ||||
|         "rev": "3e93c4e8b2b479c712b7c20a428993b459118842", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|         "owner": "nix-community", | ||||
|         "ref": "release-21.05", | ||||
|         "ref": "release-21.11", | ||||
|         "repo": "home-manager", | ||||
|         "type": "github" | ||||
|       } | ||||
|     }, | ||||
|     "latest": { | ||||
|       "locked": { | ||||
|         "lastModified": 1627942574, | ||||
|         "narHash": "sha256-guUcGRWvY2mfiVSet2x/zeHIyflm2wgglj0ldg0mMio=", | ||||
|         "lastModified": 1638198142, | ||||
|         "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=", | ||||
|         "owner": "nixos", | ||||
|         "repo": "nixpkgs", | ||||
|         "rev": "c464dc811babfe316ed4ab7bbc12351122e69dd7", | ||||
|         "rev": "8a308775674e178495767df90c419425474582a1", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|         "owner": "nixos", | ||||
|         "ref": "nixos-unstable", | ||||
|         "repo": "nixpkgs", | ||||
|         "type": "github" | ||||
|       } | ||||
|     }, | ||||
|     "latest_2": { | ||||
|       "locked": { | ||||
|         "lastModified": 1638376152, | ||||
|         "narHash": "sha256-ucgLpVqhFnClH7YRUHBHnmiOd82RZdFR3XJt36ks5fE=", | ||||
|         "owner": "nixos", | ||||
|         "repo": "nixpkgs", | ||||
|         "rev": "6daa4a5c045d40e6eae60a3b6e427e8700f1c07f", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|  | @ -246,77 +373,65 @@ | |||
|     "naersk": { | ||||
|       "inputs": { | ||||
|         "nixpkgs": [ | ||||
|           "latest" | ||||
|           "nixos" | ||||
|         ] | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1622810282, | ||||
|         "narHash": "sha256-4wmvM3/xfD0hCdNDIXVzRMfL4yB1J+DjH6Zte2xbAxk=", | ||||
|         "lastModified": 1638203339, | ||||
|         "narHash": "sha256-Sz3iCvbWrVWOD/XfYQeRJgP/7MVYL3/VKsNXvDeWBFc=", | ||||
|         "owner": "nmattia", | ||||
|         "repo": "naersk", | ||||
|         "rev": "e8061169e1495871b56be97c5c51d310fae01374", | ||||
|         "rev": "c3e56b8a4ffb6d906cdfcfee034581f9a8ece571", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|         "owner": "nmattia", | ||||
|         "ref": "master", | ||||
|         "repo": "naersk", | ||||
|         "type": "github" | ||||
|       } | ||||
|     }, | ||||
|     "naersk_2": { | ||||
|       "inputs": { | ||||
|         "nixpkgs": [ | ||||
|           "latest" | ||||
|         ] | ||||
|       }, | ||||
|     "nixlib": { | ||||
|       "locked": { | ||||
|         "lastModified": 1623927034, | ||||
|         "narHash": "sha256-sGxlmfp5eXL5sAMNqHSb04Zq6gPl+JeltIZ226OYN0w=", | ||||
|         "owner": "nmattia", | ||||
|         "repo": "naersk", | ||||
|         "rev": "e09c320446c5c2516d430803f7b19f5833781337", | ||||
|         "lastModified": 1638059559, | ||||
|         "narHash": "sha256-cCGV2TCDLN+iwHxoplk4uZOvc7TqdlsW5nBVcu943IU=", | ||||
|         "owner": "nix-community", | ||||
|         "repo": "nixpkgs.lib", | ||||
|         "rev": "44e0fa2ab408508a60dd4f213d75fd0c64262dde", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|         "owner": "nmattia", | ||||
|         "repo": "naersk", | ||||
|         "owner": "nix-community", | ||||
|         "repo": "nixpkgs.lib", | ||||
|         "type": "github" | ||||
|       } | ||||
|     }, | ||||
|     "nixos": { | ||||
|       "locked": { | ||||
|         "lastModified": 1628203131, | ||||
|         "narHash": "sha256-jQgXeJ9NQQS0Eobb/qQOvS+RRULkqRikAeXkkFKOPDA=", | ||||
|         "lastModified": 1638442392, | ||||
|         "narHash": "sha256-6FFbew4MfkdwcdM8Tzpm91uxBJsGKFZHkFDiDPKlgdM=", | ||||
|         "owner": "nixos", | ||||
|         "repo": "nixpkgs", | ||||
|         "rev": "178da37860823d35e801c7df2f73d7866d3d598a", | ||||
|         "rev": "6525c02d2b1692a3bcd457ff8943ce55b9c129da", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|         "owner": "nixos", | ||||
|         "ref": "release-21.05", | ||||
|         "ref": "release-21.11", | ||||
|         "repo": "nixpkgs", | ||||
|         "type": "github" | ||||
|       } | ||||
|     }, | ||||
|     "nixos-generators": { | ||||
|       "inputs": { | ||||
|         "nixlib": [ | ||||
|           "digga", | ||||
|           "nixlib" | ||||
|         ], | ||||
|         "nixpkgs": [ | ||||
|           "digga", | ||||
|           "blank" | ||||
|         ] | ||||
|         "nixlib": "nixlib", | ||||
|         "nixpkgs": "nixpkgs_4" | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1624973746, | ||||
|         "narHash": "sha256-11JbJRduNwyf556gndGErR5/12ceyHOHBfEuha5Vws4=", | ||||
|         "lastModified": 1637655461, | ||||
|         "narHash": "sha256-kXZPbclN3gKwjhp2/RYFDFpAsSBwzX1iLF4EcnHZsPQ=", | ||||
|         "owner": "nix-community", | ||||
|         "repo": "nixos-generators", | ||||
|         "rev": "022ef440af8dc237ab1f59fa363cb1e25783ec3e", | ||||
|         "rev": "05a3eb158a9c7746a5d463726d7f7cccf07500e4", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|  | @ -327,11 +442,11 @@ | |||
|     }, | ||||
|     "nixos-hardware": { | ||||
|       "locked": { | ||||
|         "lastModified": 1625333638, | ||||
|         "narHash": "sha256-M6J9RN60XJyv6nUfDFCwnz5aVjhe8+GJnV8Q9VpdQQQ=", | ||||
|         "lastModified": 1638440530, | ||||
|         "narHash": "sha256-kmoNW+RmSka988iWvSrkiAxO8g6D76O0gW2cIIhL6U8=", | ||||
|         "owner": "nixos", | ||||
|         "repo": "nixos-hardware", | ||||
|         "rev": "41775780a0b6b32b3d32dcc32bb9bc6df809062d", | ||||
|         "rev": "4c9f07277bd4bc29a051ff2a0ca58c6403e3881a", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|  | @ -340,14 +455,76 @@ | |||
|         "type": "github" | ||||
|       } | ||||
|     }, | ||||
|     "nixpkgs": { | ||||
|       "locked": { | ||||
|         "lastModified": 1638565206, | ||||
|         "narHash": "sha256-5z7RBRw0qh3REJieanK3PkMHl0EuzZr2efZqAz44Bjg=", | ||||
|         "owner": "NixOS", | ||||
|         "repo": "nixpkgs", | ||||
|         "rev": "f9a1652a858329525c143450db2474ef439cf6c1", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|         "owner": "NixOS", | ||||
|         "ref": "nixos-unstable-small", | ||||
|         "repo": "nixpkgs", | ||||
|         "type": "github" | ||||
|       } | ||||
|     }, | ||||
|     "nixpkgs_2": { | ||||
|       "locked": { | ||||
|         "lastModified": 1638585354, | ||||
|         "narHash": "sha256-wzt6GBJNriOPEeHSZ6SdmESBmAZYlXPIFbVjZjRqsGc=", | ||||
|         "owner": "NixOS", | ||||
|         "repo": "nixpkgs", | ||||
|         "rev": "77dc4eecc2c8c9b99f9715224f3ff139cfe5dea4", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|         "owner": "NixOS", | ||||
|         "repo": "nixpkgs", | ||||
|         "type": "github" | ||||
|       } | ||||
|     }, | ||||
|     "nixpkgs_3": { | ||||
|       "locked": { | ||||
|         "lastModified": 1636976544, | ||||
|         "narHash": "sha256-9ZmdyoRz4Qu8bP5BKR1T10YbzcB9nvCeQjOEw2cRKR0=", | ||||
|         "owner": "nixos", | ||||
|         "repo": "nixpkgs", | ||||
|         "rev": "931ab058daa7e4cd539533963f95e2bb0dbd41e6", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|         "owner": "nixos", | ||||
|         "ref": "nixos-unstable", | ||||
|         "repo": "nixpkgs", | ||||
|         "type": "github" | ||||
|       } | ||||
|     }, | ||||
|     "nixpkgs_4": { | ||||
|       "locked": { | ||||
|         "lastModified": 1638432899, | ||||
|         "narHash": "sha256-iZ+rgyRx3JVyylXYxSyW01liDWEn+O8cKnin6cMzOFU=", | ||||
|         "owner": "NixOS", | ||||
|         "repo": "nixpkgs", | ||||
|         "rev": "56cbe42f1668338d05febfbb866e32f2c865609a", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|         "owner": "NixOS", | ||||
|         "ref": "nixpkgs-unstable", | ||||
|         "repo": "nixpkgs", | ||||
|         "type": "github" | ||||
|       } | ||||
|     }, | ||||
|     "nur": { | ||||
|       "locked": { | ||||
|         "lastModified": 1626378135, | ||||
|         "narHash": "sha256-koC6DBYmLCrgXA+AMHVaODf1uHYPmvcFygHfy3eg6vI=", | ||||
|         "owner": "nix-community", | ||||
|         "repo": "NUR", | ||||
|         "path": "/nix/store/6mfkswqi67m35qwv0vh7kpk8rypbl2rq-source", | ||||
|         "rev": "00c2ec8f0bbdf0cfb2135bde55fbae5d6b64aa6d", | ||||
|         "type": "github" | ||||
|         "type": "path" | ||||
|       }, | ||||
|       "original": { | ||||
|         "id": "nur", | ||||
|  | @ -356,26 +533,18 @@ | |||
|     }, | ||||
|     "nvfetcher": { | ||||
|       "inputs": { | ||||
|         "flake-compat": [ | ||||
|           "digga", | ||||
|           "deploy", | ||||
|           "flake-compat" | ||||
|         ], | ||||
|         "flake-utils": [ | ||||
|           "digga", | ||||
|           "flake-utils-plus", | ||||
|           "flake-utils" | ||||
|         ], | ||||
|         "flake-compat": "flake-compat_2", | ||||
|         "flake-utils": "flake-utils_5", | ||||
|         "nixpkgs": [ | ||||
|           "latest" | ||||
|           "nixos" | ||||
|         ] | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1627523399, | ||||
|         "narHash": "sha256-j9CgnUQpWcb8OB4LRzPW8BdxvmoROJptgptDlPA8Heo=", | ||||
|         "lastModified": 1634524567, | ||||
|         "narHash": "sha256-v9ZTZj1WNQaaVfs1P1mUPuh518mmwpqszj1EjdeGUmc=", | ||||
|         "owner": "berberman", | ||||
|         "repo": "nvfetcher", | ||||
|         "rev": "fb8f2cc770ad3dd3e29d7ba3004692d4d53fba9b", | ||||
|         "rev": "807513f4bbd0e3b5863f4c3b91f8ac846ed6da9b", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|  | @ -384,43 +553,72 @@ | |||
|         "type": "github" | ||||
|       } | ||||
|     }, | ||||
|     "poetry2nix": { | ||||
|       "inputs": { | ||||
|         "flake-utils": "flake-utils_2", | ||||
|         "nixpkgs": "nixpkgs_2" | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1625240517, | ||||
|         "narHash": "sha256-2E1gaOP+bCplhf3kliVQWK5N1NV2h06mkJk2KTiRTJQ=", | ||||
|         "owner": "nix-community", | ||||
|         "repo": "poetry2nix", | ||||
|         "rev": "e40e8ed0e8c11e709e4c8c7c20174facd265a021", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|         "owner": "nix-community", | ||||
|         "repo": "poetry2nix", | ||||
|         "type": "github" | ||||
|       } | ||||
|     }, | ||||
|     "root": { | ||||
|       "inputs": { | ||||
|         "agenix": "agenix", | ||||
|         "blank": [ | ||||
|           "digga", | ||||
|           "blank" | ||||
|         ], | ||||
|         "bud": "bud", | ||||
|         "darwin": "darwin", | ||||
|         "deploy": [ | ||||
|           "digga", | ||||
|           "deploy" | ||||
|         ], | ||||
|         "deploy": "deploy", | ||||
|         "digga": "digga", | ||||
|         "flake-utils": [ | ||||
|           "digga", | ||||
|           "flake-utils" | ||||
|         ], | ||||
|         "flake-utils-plus": [ | ||||
|           "digga", | ||||
|           "flake-utils-plus" | ||||
|         ], | ||||
|         "home": "home", | ||||
|         "latest": "latest", | ||||
|         "naersk": "naersk_2", | ||||
|         "nixlib": [ | ||||
|           "digga", | ||||
|           "nixlib" | ||||
|         ], | ||||
|         "latest": "latest_2", | ||||
|         "naersk": "naersk", | ||||
|         "nixos": "nixos", | ||||
|         "nixos-hardware": "nixos-hardware", | ||||
|         "nixpkgs": [ | ||||
|           "nixos" | ||||
|         ], | ||||
|         "nur": "nur", | ||||
|         "nvfetcher": "nvfetcher" | ||||
|       } | ||||
|     }, | ||||
|     "rust-analyzer-src": { | ||||
|       "flake": false, | ||||
|       "locked": { | ||||
|         "lastModified": 1637268320, | ||||
|         "narHash": "sha256-lxB1r+7cmZisiGLx0tZ2LaC6X/EcQTbRIWZfnLIIgs4=", | ||||
|         "owner": "rust-analyzer", | ||||
|         "repo": "rust-analyzer", | ||||
|         "rev": "f0da9406bcbde1bc727242b481d8de825e84f59a", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|         "owner": "rust-analyzer", | ||||
|         "ref": "nightly", | ||||
|         "repo": "rust-analyzer", | ||||
|         "type": "github" | ||||
|       } | ||||
|     }, | ||||
|     "utils": { | ||||
|       "locked": { | ||||
|         "lastModified": 1637014545, | ||||
|         "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", | ||||
|         "owner": "numtide", | ||||
|         "repo": "flake-utils", | ||||
|         "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|         "owner": "numtide", | ||||
|         "repo": "flake-utils", | ||||
|         "type": "github" | ||||
|       } | ||||
|     } | ||||
|   }, | ||||
|   "root": "root", | ||||
|  |  | |||
							
								
								
									
										38
									
								
								flake.nix
									
									
									
									
									
								
							
							
						
						
									
										38
									
								
								flake.nix
									
									
									
									
									
								
							|  | @ -1,53 +1,44 @@ | |||
| { | ||||
|   description = "A highly structured configuration database."; | ||||
| 
 | ||||
|   nixConfig.extra-experimental-features = "nix-command flakes ca-references"; | ||||
|   nixConfig.extra-experimental-features = "nix-command flakes"; | ||||
|   nixConfig.extra-substituters = "https://nrdxp.cachix.org https://nix-community.cachix.org"; | ||||
|   nixConfig.extra-trusted-public-keys = "nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="; | ||||
| 
 | ||||
|   inputs = | ||||
|     { | ||||
|       nixos.url = "github:nixos/nixpkgs/release-21.05"; | ||||
|       nixos.url = "github:nixos/nixpkgs/release-21.11"; | ||||
|       latest.url = "github:nixos/nixpkgs/nixos-unstable"; | ||||
| 
 | ||||
|       digga.url = "github:divnix/digga"; | ||||
|       digga.inputs.nixpkgs.follows = "nixos"; | ||||
|       digga.inputs.nixlib.follows = "nixos"; | ||||
|       digga.inputs.home-manager.follows = "home"; | ||||
|       digga.inputs.deploy.follows = "deploy"; | ||||
| 
 | ||||
|       bud.url = "github:divnix/bud"; | ||||
|       bud.inputs.nixpkgs.follows = "nixos"; | ||||
|       bud.inputs.devshell.follows = "digga/devshell"; | ||||
| 
 | ||||
|       home.url = "github:nix-community/home-manager/release-21.05"; | ||||
|       home.url = "github:nix-community/home-manager/release-21.11"; | ||||
|       home.inputs.nixpkgs.follows = "nixos"; | ||||
| 
 | ||||
|       darwin.url = "github:LnL7/nix-darwin"; | ||||
|       darwin.inputs.nixpkgs.follows = "latest"; | ||||
|       darwin.inputs.nixpkgs.follows = "nixos"; | ||||
| 
 | ||||
|       deploy.follows = "digga/deploy"; | ||||
|       deploy.url = "github:input-output-hk/deploy-rs"; | ||||
|       deploy.inputs.nixpkgs.follows = "nixos"; | ||||
| 
 | ||||
|       agenix.url = "github:ryantm/agenix"; | ||||
|       agenix.inputs.nixpkgs.follows = "latest"; | ||||
|       agenix.inputs.nixpkgs.follows = "nixos"; | ||||
| 
 | ||||
|       nvfetcher.url = "github:berberman/nvfetcher"; | ||||
|       nvfetcher.inputs.nixpkgs.follows = "latest"; | ||||
|       nvfetcher.inputs.flake-compat.follows = "digga/deploy/flake-compat"; | ||||
|       nvfetcher.inputs.flake-utils.follows = "digga/flake-utils-plus/flake-utils"; | ||||
|       nvfetcher.inputs.nixpkgs.follows = "nixos"; | ||||
| 
 | ||||
|       naersk.url = "github:nmattia/naersk"; | ||||
|       naersk.inputs.nixpkgs.follows = "latest"; | ||||
|       naersk.inputs.nixpkgs.follows = "nixos"; | ||||
| 
 | ||||
|       nixos-hardware.url = "github:nixos/nixos-hardware"; | ||||
| 
 | ||||
|       # start ANTI CORRUPTION LAYER | ||||
|       # remove after https://github.com/NixOS/nix/pull/4641 | ||||
|       nixpkgs.follows = "nixos"; | ||||
|       nixlib.follows = "digga/nixlib"; | ||||
|       blank.follows = "digga/blank"; | ||||
|       flake-utils-plus.follows = "digga/flake-utils-plus"; | ||||
|       flake-utils.follows = "digga/flake-utils"; | ||||
|       # end ANTI CORRUPTION LAYER | ||||
|     }; | ||||
| 
 | ||||
|   outputs = | ||||
|  | @ -73,7 +64,6 @@ | |||
|           nixos = { | ||||
|             imports = [ (digga.lib.importOverlays ./overlays) ]; | ||||
|             overlays = [ | ||||
|               digga.overlays.patchedNix | ||||
|               nur.overlay | ||||
|               agenix.overlay | ||||
|               nvfetcher.overlay | ||||
|  | @ -99,8 +89,8 @@ | |||
|           hostDefaults = { | ||||
|             system = "x86_64-linux"; | ||||
|             channelName = "nixos"; | ||||
|             imports = [ (digga.lib.importModules ./modules) ]; | ||||
|             externalModules = [ | ||||
|             imports = [ (digga.lib.importExportableModules ./modules) ]; | ||||
|             exportedModules = [ | ||||
|               { lib.our = self.lib; } | ||||
|               digga.nixosModules.bootstrapIso | ||||
|               digga.nixosModules.nixConfig | ||||
|  | @ -137,8 +127,8 @@ | |||
|         }; | ||||
| 
 | ||||
|         home = { | ||||
|           imports = [ (digga.lib.importModules ./users/modules) ]; | ||||
|           externalModules = [ ]; | ||||
|           imports = [ (digga.lib.importExportableModules ./users/modules) ]; | ||||
|           exportedModules = [ ]; | ||||
|           importables = rec { | ||||
|             profiles = digga.lib.rakeLeaves ./users/profiles; | ||||
|             suites = with profiles; rec { | ||||
|  |  | |||
|  | @ -7,7 +7,7 @@ | |||
|     #profiles.users.profiles.desktop | ||||
|     profiles.users.profiles.email | ||||
|     profiles.users.profiles.cal | ||||
|     profiles.wireguard | ||||
|     #profiles.wireguard | ||||
|     profiles.mossnet-hosts | ||||
|   ] ++ suites.curve; | ||||
| 
 | ||||
|  | @ -20,7 +20,7 @@ | |||
|   # enable adb  | ||||
|   # TODO move this (it's for KaiOS WebIDE devShell?) | ||||
|   programs.adb.enable = true; | ||||
|   virtualisation.docker.enable = true; # temp for KaiOS hack | ||||
|   #virtualisation.docker.enable = true; # temp for KaiOS hack | ||||
|   services.udev.extraRules = '' | ||||
|     # Qualcomm EDL | ||||
|     SUBSYSTEMS=="usb", ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9008", MODE="0666", GROUP="plugdev" | ||||
|  |  | |||
|  | @ -20,6 +20,7 @@ in | |||
|       iputils | ||||
|       jq | ||||
|       manix | ||||
|       tree | ||||
|       moreutils | ||||
|       nix-index | ||||
|       nmap | ||||
|  | @ -88,7 +89,7 @@ in | |||
|         # modern cli tools  | ||||
|         ls = "exa"; | ||||
|         cat = "bat"; | ||||
|         unzip = "unzip"; | ||||
|         unzip = "aunpack"; | ||||
|         copy = "xclip -selection clipboard"; | ||||
|         paste = "xclip -selection clipboard -o"; | ||||
| 
 | ||||
|  | @ -115,7 +116,7 @@ in | |||
|         nepl = "n repl '<nixpkgs>'"; | ||||
|         srch = "ns nixos"; | ||||
|         orch = "ns override"; | ||||
|         nrb = ifSudo "sudo nixos-rebuild"; | ||||
|         nrb = ifSudo "sudo nixos-rebuild switch --flake '/etc/nixos/#curve'"; | ||||
|         mn = '' | ||||
|           manix "" | grep '^# ' | sed 's/^# \(.*\) (.*/\1/;s/ (.*//;s/^# //' | sk --preview="manix '{}'" | xargs manix | ||||
|         ''; | ||||
|  | @ -196,7 +197,8 @@ in | |||
|   }; | ||||
| 
 | ||||
|   programs.gnupg.agent.enable = true; | ||||
|   programs.gnupg.agent.pinentryFlavor = "curses"; | ||||
|   #programs.gnupg.agent.pinentryFlavor = "curses"; | ||||
|   programs.gnupg.agent.pinentryFlavor = "gnome3"; | ||||
| 
 | ||||
|   services.earlyoom.enable = true; | ||||
| 
 | ||||
|  |  | |||
|  | @ -3,5 +3,6 @@ | |||
|     172.16.11.240 mossnet.lan | ||||
|     172.16.11.240 links.mossnet.lan | ||||
|     172.16.11.240 read.mossnet.lan | ||||
|     172.16.11.240 stats.mossnet.lan | ||||
|   ''; | ||||
| } | ||||
|  |  | |||
|  | @ -37,6 +37,9 @@ let | |||
|     tasklib | ||||
|     pynvim | ||||
|     six | ||||
|     #pyls-mypy  | ||||
|     #pyls-isort  | ||||
|     #pyls-black | ||||
|     # other python packages you want | ||||
|   ];  | ||||
|   python-with-my-packages = pkgs.python3.withPackages my-python-packages; | ||||
|  | @ -73,7 +76,7 @@ in | |||
| 				vimwiki | ||||
| 				coc-nvim | ||||
| 				coc-json | ||||
| 				coc-python | ||||
| 				coc-pyright | ||||
| 				coc-pairs | ||||
| 				coc-emmet | ||||
| 				LanguageClient-neovim | ||||
|  | @ -89,7 +92,7 @@ in | |||
| 				taskwiki | ||||
| 				vim-zettel | ||||
| 				#vimwiki-sync | ||||
|         #telescope-nvim | ||||
|         telescope-nvim | ||||
|         # Clojure stuff | ||||
|         conjure | ||||
|         vim-sexp | ||||
|  |  | |||
|  | @ -1,4 +1,4 @@ | |||
| { pkgs, extraModulesPath, ... }: | ||||
| { pkgs, extraModulesPath, inputs, ... }: | ||||
| let | ||||
| 
 | ||||
|   hooks = import ./hooks; | ||||
|  | @ -47,12 +47,9 @@ in | |||
|     (linter editorconfig-checker) | ||||
|     # (docs python3Packages.grip) too many deps | ||||
|     (docs mdbook) | ||||
|     (devos inputs.deploy.packages.${pkgs.system}.deploy-rs) | ||||
|   ] | ||||
| 
 | ||||
|   ++ lib.optional | ||||
|     (pkgs ? deploy-rs) | ||||
|     (devos deploy-rs.deploy-rs) | ||||
| 
 | ||||
|   ++ lib.optional | ||||
|     (system != "i686-linux") | ||||
|     (devos cachix) | ||||
|  |  | |||
|  | @ -4,6 +4,18 @@ | |||
|   # TODO modularize | ||||
|   #imports = [ ./xdg.nix ]; | ||||
| 
 | ||||
|   services = { | ||||
|     gnome.gnome-keyring.enable = true; | ||||
|     upower.enable = true; | ||||
| 
 | ||||
|     dbus = { | ||||
|       enable = true; | ||||
|       packages = [ pkgs.gnome3.dconf ]; | ||||
|     }; | ||||
|   }; | ||||
|     | ||||
|   security.pam.services.sddm.enableGnomeKeyring = true; | ||||
| 
 | ||||
|   home-manager.users.anish.xdg.enable = true; # This doesn't seem to do anything so we have below | ||||
|   home-manager.users.anish.xdg.configHome = "/home/anish/.config"; # TODO bad hard coded | ||||
|   environment.sessionVariables = rec { | ||||
|  | @ -29,6 +41,7 @@ | |||
|     sublime-music | ||||
|     calibre | ||||
|     nheko | ||||
|     scrot | ||||
|     newsflash | ||||
|     zeal | ||||
|     xclip | ||||
|  |  | |||
|  | @ -3,7 +3,6 @@ | |||
|     enable = true; | ||||
|     nix-direnv = { | ||||
|       enable = true; | ||||
|       enableFlakes = true; | ||||
|     }; | ||||
|   }; | ||||
| } | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue