diff --git a/.gitignore b/.gitignore index 5dadaa3..126bc38 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,5 @@ tmp # nix build result results -diffs \ No newline at end of file +diffs +.locks \ No newline at end of file diff --git a/build-nixos.sh b/build-nixos.sh index 886bec9..c7269d2 100755 --- a/build-nixos.sh +++ b/build-nixos.sh @@ -1,6 +1,7 @@ #!/bin/sh -rm -f .built_via_skg +mkdir -p .locks +rm -f .locks/.built_via_skg sudo nixos-rebuild build --flake . -touch .built_via_skg +touch .locks/.built_via_skg nvd diff /run/current-system result \ No newline at end of file diff --git a/flake.lock b/flake.lock index 52daf3b..636c1b0 100644 --- a/flake.lock +++ b/flake.lock @@ -1,21 +1,5 @@ { "nodes": { - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1717312683, - "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", - "owner": "nix-community", - "repo": "flake-compat", - "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -125,31 +109,6 @@ "type": "github" } }, - "nixos-cosmic": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "unstable" - ], - "nixpkgs-stable": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1723080973, - "narHash": "sha256-p7kQ4yxruANLz0FLnqYdSvqyYGwBaT9nWs2J/nrVKA4=", - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "rev": "d8b2b9aee034c10ca67848653171f576f87434a8", - "type": "github" - }, - "original": { - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1722332872, @@ -187,7 +146,6 @@ "home-manager": "home-manager", "lix-module": "lix-module", "nix-darwin": "nix-darwin", - "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "systems": "systems_2", @@ -195,27 +153,6 @@ "unstable-home-manager": "unstable-home-manager" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722997267, - "narHash": "sha256-8Pncp8IKd0f0N711CRrCGTC4iLfBE+/5kaMqyWxnYic=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "d720bf3cebac38c2426d77ee2e59943012854cb8", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index f37a51c..d47c138 100644 --- a/flake.nix +++ b/flake.nix @@ -25,13 +25,6 @@ url = "github:LnL7/nix-darwin"; inputs.nixpkgs.follows = "nixpkgs"; }; - # <--- Cosmic Desktop Trials - nixos-cosmic = { - url = "github:lilyinstarlight/nixos-cosmic"; - inputs.nixpkgs.follows = "unstable"; - inputs.nixpkgs-stable.follows = "nixpkgs"; - }; - # Cosmic Desktop Trials ---/> }; outputs = @@ -44,9 +37,6 @@ , home-manager , unstable-home-manager , nix-darwin - # <--- Cosmic Desktop Trials - , nixos-cosmic - # Cosmic Desktop Trials ---/> }: let user = { @@ -203,18 +193,7 @@ enablePrometheusExporters = true; }; configuration = { ... }: { - # <--- Cosmic Desktop Trials - nix.settings = { - substituters = [ "https://cosmic.cachix.org/" ]; - trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; - }; - services.desktopManager.cosmic.enable = true; - services.displayManager.cosmic-greeter.enable = true; - # Cosmic Desktop Trials ---/> imports = [ - # <--- Cosmic Desktop Trials - nixos-cosmic.nixosModules.default - # Cosmic Desktop Trials ---/> nixos-hardware.nixosModules.framework-13-7040-amd (import ./hosts/fwbook.nix { user = user; diff --git a/switch-nixos.sh b/switch-nixos.sh index 6e5799e..b0ea799 100755 --- a/switch-nixos.sh +++ b/switch-nixos.sh @@ -1,6 +1,6 @@ #!/bin/sh -if [ ! -f .built_via_skg ]; then +if [ ! -f .locks/.built_via_skg ]; then ./build-nixos.sh echo "Do you want to continue? (y/N)" read -r answer @@ -14,4 +14,4 @@ fi sudo nixos-rebuild switch --flake . git cap -rm -f .built_via_skg +rm -f .locks/.built_via_skg