diff --git a/flake.lock b/flake.lock index 1d04e06..15516a3 100644 --- a/flake.lock +++ b/flake.lock @@ -61,22 +61,6 @@ "type": "github" } }, - "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-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -95,28 +79,6 @@ "type": "github" } }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "nixos-cosmic", - "nix-update", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "flake-utils": "flake-utils_2" @@ -278,53 +240,6 @@ "type": "github" } }, - "nix-update": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ], - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1726334963, - "narHash": "sha256-L8ICz9iELkvQl/ufdSWy9lRm8DLNpKDFxoeHQfPu4E8=", - "owner": "Mic92", - "repo": "nix-update", - "rev": "84d7535d076c5e06fba272738448c80698eb3d40", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "nix-update", - "type": "github" - } - }, - "nixos-cosmic": { - "inputs": { - "flake-compat": "flake-compat", - "nix-update": "nix-update", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable", - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1726352478, - "narHash": "sha256-NtCYjLQ19ZDg3WFbOG/giKqIh057NUO5FUjfZOZwd4w=", - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "rev": "c31de529857b3e0501c7999e47f0ef9d8e9b7bf8", - "type": "github" - }, - "original": { - "owner": "lilyinstarlight", - "repo": "nixos-cosmic", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1709961763, @@ -353,22 +268,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1725930920, - "narHash": "sha256-RVhD9hnlTT2nJzPHlAqrWqCkA7T6CYrP41IoVRkciZM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "44a71ff39c182edaf25a7ace5c9454e7cba2c658", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1725983898, @@ -493,7 +392,6 @@ "nh": "nh", "nix-gaming": "nix-gaming", "nix-inspect": "nix-inspect", - "nixos-cosmic": "nixos-cosmic", "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable" } @@ -514,27 +412,6 @@ "type": "github" } }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1726194362, - "narHash": "sha256-cM7zFscFqdsA5KohUUYndzIp20kUqjj39qnj6Voj+f8=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "a71b1240e29f1ec68612ed5306c328086bed91f9", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "slimlock": { "inputs": { "nixpkgs": [ @@ -596,28 +473,6 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixos-cosmic", - "nix-update", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719887753, - "narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "umu": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 9f6c1da..b740caf 100644 --- a/flake.nix +++ b/flake.nix @@ -28,10 +28,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixos-cosmic = { - url = "github:lilyinstarlight/nixos-cosmic"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { @@ -39,7 +35,6 @@ nixpkgs, home-manager, flake-utils, - nixos-cosmic, ... } @ inputs: let mkApp = flake-utils.lib.mkApp; @@ -56,15 +51,7 @@ # host defaults hostDefaults.system = "x86_64-linux"; - hostDefaults.modules = [ - { - nix.settings = { - substituters = ["https://cosmic.cachix.org/"]; - trusted-public-keys = ["cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="]; - }; - } - nixos-cosmic.nixosModules.default - ]; + hostDefaults.modules = []; hostDefaults.extraArgs = {inherit flake-utils;}; hostDefaults.specialArgs = { inherit inputs; diff --git a/system/waves/configuration.nix b/system/waves/configuration.nix index b212e7b..82047cf 100644 --- a/system/waves/configuration.nix +++ b/system/waves/configuration.nix @@ -310,8 +310,8 @@ geary # email reader evince # document viewer ]); - services.displayManager.cosmic-greeter.enable = false; - services.desktopManager.cosmic.enable = true; + # services.displayManager.cosmic-greeter.enable = false; + # services.desktopManager.cosmic.enable = true; # i18n time.timeZone = "America/Indiana/Indianapolis";