Compare commits

..

No commits in common. "1be48af602f3ba5d36acca02ea773ee0ef0a779f" and "c4db0959a2d33ef39a5d0b03015d4c17117363b1" have entirely different histories.

2 changed files with 56 additions and 52 deletions

View file

@ -85,10 +85,6 @@ def _upd(args: list):
run(["git", "pull"], cwd=path) run(["git", "pull"], cwd=path)
else: else:
args.remove("--no-pull") args.remove("--no-pull")
if "--lock" in args:
args.remove("--lock")
print(f"{c.BLUE}Updating {c.YELLOW}Nix Flake{c.BLUE} lock file{c.END}")
run(["nix", "flake", "update", *args], cwd=path)
if "--rewrite-hardware-configuration" in args: if "--rewrite-hardware-configuration" in args:
args.remove("--rewrite-hardware-configuration") args.remove("--rewrite-hardware-configuration")
print(f"{c.BLUE}Updating {c.YELLOW}NixOS{c.BLUE} hardware configuration file for {c.YELLOW}{gethostname()}{c.BLUE}{c.END}") print(f"{c.BLUE}Updating {c.YELLOW}NixOS{c.BLUE} hardware configuration file for {c.YELLOW}{gethostname()}{c.BLUE}{c.END}")
@ -115,6 +111,14 @@ def _upd(args: list):
print(f"{c.RED}WARNING: The --impure flag is set!{c.END}") print(f"{c.RED}WARNING: The --impure flag is set!{c.END}")
run(["sudo", "nixos-rebuild", subcommand, *args], cwd=path) run(["sudo", "nixos-rebuild", subcommand, *args], cwd=path)
@aliases.register
def _lock(args):
path = Path("/etc/nixos")
if path.exists():
c = colors.Colors
print(f"{c.BLUE}Updating {c.YELLOW}Nix Flake{c.BLUE} lock file{c.END}")
run(["nix", "flake", "update", *args], cwd=path)
@aliases.register @aliases.register
@aliases.return_command @aliases.return_command
def _edit(args): def _edit(args):

96
flake.lock generated
View file

@ -45,11 +45,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1738213515, "lastModified": 1738041275,
"narHash": "sha256-0cYr91WBMCmlPCKxZrH8habV9tkAA1SkeKPnI+A76WU=", "narHash": "sha256-4Oqq357Q//Ra5qV9PdPLMkdH0uFFxy1stQF8hTe8xEM=",
"owner": "lilyinstarlight", "owner": "lilyinstarlight",
"repo": "nixos-cosmic", "repo": "nixos-cosmic",
"rev": "ddbaf00ce2a74478278aa17459dda5c5893d998d", "rev": "36eabddc2d033f4fd31c53570db7e1e21591cba3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -421,11 +421,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738257949, "lastModified": 1737704314,
"narHash": "sha256-Q/xbvWHqCNcw+nDXgRaKH31fggZiA0Ciqs0t1H28fL8=", "narHash": "sha256-zta8jvOQ2wRCZmiwFEnS5iCulWAh8e+fLUlQxrgOBjM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7a457746847c9cb3a1e46e5bc86b205fbadf5da8", "rev": "a0428685572b134f6594e7d7f5db5e1febbab2d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -443,11 +443,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738228963, "lastModified": 1737704314,
"narHash": "sha256-Ee5hVHM7AWxaq7XJN6xiZztTZX8csdXernjqaTW5r9I=", "narHash": "sha256-zta8jvOQ2wRCZmiwFEnS5iCulWAh8e+fLUlQxrgOBjM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d963ed335b890a70ed53eecf14cdb21528eda9b8", "rev": "a0428685572b134f6594e7d7f5db5e1febbab2d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -518,11 +518,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738033138, "lastModified": 1737504076,
"narHash": "sha256-qlIM8A3bdL9c6PexhpS+QyZLO9y/8a3V75HVyJgDE5Q=", "narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "349a74c66c596ef97ee97b4d80a3ca61227b6120", "rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -533,11 +533,11 @@
}, },
"nix-flatpak": { "nix-flatpak": {
"locked": { "locked": {
"lastModified": 1738175805, "lastModified": 1736952876,
"narHash": "sha256-fPjaARmK522JLJ7wxFebxG4eE/3HHSmuAA78iAZ+A7g=", "narHash": "sha256-dJXuLP2CBkIG333L+Rb3e1D0oXHYbl0MgmKPGuvFuAI=",
"owner": "gmodena", "owner": "gmodena",
"repo": "nix-flatpak", "repo": "nix-flatpak",
"rev": "d4c75a33c4a7a16bf87cfd804fb5444a1ec53d49", "rev": "b6966d5fa96b0fae99a4da0b5bdfbb0a75f5c058",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -553,11 +553,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737861961, "lastModified": 1737257306,
"narHash": "sha256-LIRtMvAwLGb8pBoamzgEF67oKlNPz4LuXiRPVZf+TpE=", "narHash": "sha256-lEGgpA4kGafc76+Amnz+gh1L/cwUS2pePFlf22WEyh8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "79b7b8eae3243fc5aa9aad34ba6b9bbb2266f523", "rev": "744d330659e207a1883d2da0141d35e520eb87bd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -596,11 +596,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1738201509, "lastModified": 1737683312,
"narHash": "sha256-gyKBLziqn47BqpELlorHxlQTQxBS2GFQah2KNqh8Uzg=", "narHash": "sha256-Y3jubm5btIuVzVxfTgtsq8qQbiON0wOg+hwxjUS/N8k=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "1b54a1707f1388b457792736b9903980ab26afaf", "rev": "1f956a973c46701da8366418f2245352586bb4bc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -639,11 +639,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1738023785, "lastModified": 1737885640,
"narHash": "sha256-BPHmb3fUwdHkonHyHi1+x89eXB3kA1jffIpwPVJIVys=", "narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2b4230bf03deb33103947e2528cac2ed516c5c89", "rev": "4e96537f163fad24ed9eb317798a79afc85b51b7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -671,11 +671,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1738142207, "lastModified": 1737885589,
"narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9d3ae807ebd2981d593cddd0080856873139aa40", "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -703,11 +703,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1738142207, "lastModified": 1737632463,
"narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9d3ae807ebd2981d593cddd0080856873139aa40", "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -732,11 +732,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1738255431, "lastModified": 1737726662,
"narHash": "sha256-n0NCyg7JYGl7AcfDkYpB7RwtUGSxnX6WCqLqjaGMFU0=", "narHash": "sha256-VlGWJmmb82DNV4L6/UiiVEuFp7kgwyMljIgi0DKNCew=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "e4ed227f99be42cd0ce28b6ae0c85c306ef70d40", "rev": "16f92ff8a6fe3681a8286e377054296c585935f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -754,11 +754,11 @@
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1738256454, "lastModified": 1737736379,
"narHash": "sha256-vxU2VrAsmQ6XD6pOwIV63Yx7HXsliCybyrLG0D0XmB4=", "narHash": "sha256-SzUBVzIJSZE4AG/Fljc/aQ3+3YK/Hu0KXnh6K9N92qo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "5caeb6744cd9a201a82908f6deafac63b7ef234e", "rev": "30a6f0f8795d98d907a53cf8e06beca345fe3987",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -777,11 +777,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737924095, "lastModified": 1737372689,
"narHash": "sha256-9RO/IlxiE7bpY7GYsdDMNB533PnDOBo9UvYyXXqlN4c=", "narHash": "sha256-nH3zK2ki0fd5o5qvbGHxukE4qnOLJa1uCzoDObG5vrE=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "5efc9c966bb9bdad07a3c28667eac38b758c6f18", "rev": "570cc17bbc25650eb7d69e4fcda8cfd2f1656922",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -925,11 +925,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1738163270, "lastModified": 1737569578,
"narHash": "sha256-B/7Y1v4y+msFFBW1JAdFjNvVthvNdJKiN6EGRPnqfno=", "narHash": "sha256-6qY0pk2QmUtBT9Mywdvif0i/CLVgpCjMUn6g9vB+f3M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "59e618d90c065f55ae48446f307e8c09565d5ab0", "rev": "47addd76727f42d351590c905d9d1905ca895b82",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -941,11 +941,11 @@
}, },
"staging-next": { "staging-next": {
"locked": { "locked": {
"lastModified": 1738245746, "lastModified": 1737720347,
"narHash": "sha256-etDp3EzvIzSdYCI4tybEAP9IGw7uVgkOaHRLqPeXCrM=", "narHash": "sha256-F5XweBq33TV3y+rcX9eyS4/gssHhe1mXlfoVJ0Fgab4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "97fc6f36d0a5c2e03b89dc98b0ed86d6953da172", "rev": "28b95d785aeb6df101bbdf36f5a797b4206ce4a3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1008,11 +1008,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738070913, "lastModified": 1737483750,
"narHash": "sha256-j6jC12vCFsTGDmY2u1H12lMr62fnclNjuCtAdF1a4Nk=", "narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "bebf27d00f7d10ba75332a0541ac43676985dea3", "rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f",
"type": "github" "type": "github"
}, },
"original": { "original": {