From a7f0cf0d47d0d86c1d5352103e4326d883b5a5cd Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Josh)" Date: Wed, 9 Oct 2024 18:26:08 -0500 Subject: [PATCH] cosmic? --- flake.nix | 12 +++++++++--- hosts/_common/components/cosmic.nix | 9 +++++++++ hosts/gpdPocket3/configuration.nix | 3 ++- 3 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 hosts/_common/components/cosmic.nix diff --git a/flake.nix b/flake.nix index a7e7b8b..abdd77b 100644 --- a/flake.nix +++ b/flake.nix @@ -9,19 +9,19 @@ # }; # Host flake pinning joe_nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; - joe_home-manager= { + joe_home-manager = { url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "joe_nixpkgs"; }; h002_nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; - h002_home-manager= { + h002_home-manager = { url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "h002_nixpkgs"; }; gpdPocket3_nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; - gpdPocket3_home-manager= { + gpdPocket3_home-manager = { url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "gpdPocket3_nixpkgs"; }; @@ -41,6 +41,12 @@ ringofstorms-nvim = { url = "git+https://git.joshuabell.xyz/nvim"; }; + + # COSMIC + nixos-cosmic = { + url = "github:lilyinstarlight/nixos-cosmic"; + inputs.nixpkgs.follows = "nixos-cosmic/nixpkgs"; + }; }; outputs = diff --git a/hosts/_common/components/cosmic.nix b/hosts/_common/components/cosmic.nix new file mode 100644 index 0000000..ebb1f09 --- /dev/null +++ b/hosts/_common/components/cosmic.nix @@ -0,0 +1,9 @@ +{ nixos-cosmic, pkgs, ... }: +{ + nix.settings = { + substituters = [ "https://cosmic.cachix.org/" ]; + trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; + }; + + imports = [ nixos-cosmic.nixosModules.default ]; +} diff --git a/hosts/gpdPocket3/configuration.nix b/hosts/gpdPocket3/configuration.nix index 36bed4d..72cde37 100644 --- a/hosts/gpdPocket3/configuration.nix +++ b/hosts/gpdPocket3/configuration.nix @@ -15,7 +15,8 @@ (settings.hostsDir + "/_common/components/font_jetbrainsmono.nix") (settings.hostsDir + "/_common/components/audio.nix") (settings.hostsDir + "/_common/components/home_manager.nix") - (settings.hostsDir + "/_common/components/gnome_wayland.nix") + # (settings.hostsDir + "/_common/components/gnome_wayland.nix") + (settings.hostsDir + "/_common/components/cosmic.nix") (settings.hostsDir + "/_common/components/docker.nix") (settings.hostsDir + "/_common/components/nebula.nix") # Users this machine has