From 3ff13ec31e1f2a65a0a8f5bde78b5d75d02ae3e0 Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Tue, 27 Feb 2024 15:36:23 -0800 Subject: [PATCH] cosmic module? --- flake.lock | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++- flake.nix | 27 ++++++++++--- 2 files changed, 129 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index d68dd25..bf300fb 100644 --- a/flake.lock +++ b/flake.lock @@ -169,6 +169,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1688025799, + "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", + "owner": "nix-community", + "repo": "flake-compat", + "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1673956053, @@ -184,6 +200,28 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nixos-cosmic", + "nix-update", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1698882062, + "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -339,6 +377,52 @@ "type": "github" } }, + "nix-update": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixos-cosmic", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1709051580, + "narHash": "sha256-pHGHuUL26CXt487r8WPAXyyGpHAVhEIRqhIiyffYT5o=", + "owner": "lilyinstarlight", + "repo": "nix-update", + "rev": "323a572c9a464647fd807e826a32ec2fb7396531", + "type": "github" + }, + "original": { + "owner": "lilyinstarlight", + "ref": "tmp/fixed", + "repo": "nix-update", + "type": "github" + } + }, + "nixos-cosmic": { + "inputs": { + "flake-compat": "flake-compat", + "nix-update": "nix-update", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709078564, + "narHash": "sha256-CVObY1ZslhN+qGdTQv+jZ0Bx5GAZMRFZEy79PiwRjkY=", + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "rev": "e184d6f870aa00426f7f392c8f9a7b9040702302", + "type": "github" + }, + "original": { + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1708594753, @@ -439,6 +523,7 @@ "helix": "helix", "home-manager": "home-manager", "jujutsu": "jujutsu", + "nixos-cosmic": "nixos-cosmic", "nixos-hardware": "nixos-hardware", "nixos-raspberrypi": "nixos-raspberrypi", "nixpkgs": "nixpkgs_2", @@ -506,7 +591,7 @@ "base16-kitty": "base16-kitty", "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_3" @@ -554,6 +639,28 @@ "repo": "default", "type": "github" } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixos-cosmic", + "nix-update", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1698438538, + "narHash": "sha256-AWxaKTDL3MtxaVTVU5lYBvSnlspOS0Fjt8GxBgnU0Do=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "5deb8dc125a9f83b65ca86cf0c8167c46593e0b1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 25f0880..17a863e 100644 --- a/flake.nix +++ b/flake.nix @@ -5,12 +5,22 @@ nixpkgs.url = "nixpkgs/nixos-unstable"; nixos-hardware.url = "nixos-hardware"; nixos-raspberrypi.url = "github:ramblurr/nixos-raspberrypi"; - home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; - helix.url = "github:helix-editor/helix"; - helix.inputs.nixpkgs.follows = "nixpkgs"; - jujutsu.url = "github:martinvonz/jj"; - jujutsu.inputs.nixpkgs.follows = "nixpkgs"; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + helix = { + url = "github:helix-editor/helix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + jujutsu = { + url = "github:martinvonz/jj"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nixos-cosmic = { + url = "github:lilyinstarlight/nixos-cosmic"; + inputs.nixpkgs.follows = "nixpkgs"; + }; stylix.url = "github:danth/stylix"; # aagl.url = "github:ezKEa/aagl-gtk-on-nix"; # aagl.inputs.nixpkgs.follows = "nixpkgs"; @@ -20,6 +30,8 @@ }; nixConfig = { + extra-substituters = ["https://cosmic.cachix.org/"]; + extra-trusted-public-keys = ["cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="]; }; outputs = { @@ -30,6 +42,7 @@ home-manager, helix, jujutsu, + nixos-cosmic, stylix, ... } @ inputs: { @@ -42,6 +55,7 @@ nixos-hardware.nixosModules.common-gpu-nvidia-nonprime ./systems/BASED.nix ./systems/NOcomputer.nix + nixos-cosmic.nixosModules.default ./users/tao.nix home-manager.nixosModules.home-manager stylix.nixosModules.stylix @@ -59,6 +73,7 @@ # inputs.nixos-hardware.nixosModules.framework-12th-gen-intel ./systems/BASED.nix ./systems/NOlaptop.nix + nixos-cosmic.nixosModules.default ./users/tao.nix home-manager.nixosModules.home-manager stylix.nixosModules.stylix