ringofstorms/dotfiles
ringofstorms/dotfiles
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update imports

Browse source
This commit is contained in:
RingOfStorms (Joshua Bell) 2024-10-10 14:24:28 -05:00
parent bb8033d547
commit 6316fffeb1
3 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
flake.nix
View file

@ -51,6 +51,7 @@
{ {
self, self,
nypkgs, nypkgs,
cosmic,
joe_nixpkgs, joe_nixpkgs,
joe_home-manager, joe_home-manager,
gpdPocket3_nixpkgs, gpdPocket3_nixpkgs,
@ -89,9 +90,6 @@
inherit user; inherit user;
nixpkgs = gpdPocket3_nixpkgs; nixpkgs = gpdPocket3_nixpkgs;
home-manager = gpdPocket3_home-manager; home-manager = gpdPocket3_home-manager;
# There is no way to support top level conditional imports in modules using that module's options...
# so for now I have this hack until I want to make this more broad
uses_cosmic = true;
}; };
} }
{ {
@ -136,6 +134,7 @@
modules = modules =
[ [
./hosts/_common/configuration.nix ./hosts/_common/configuration.nix
cosmic.nixosModules.default
] ]
++ ylib.umport { ++ ylib.umport {
path = lib.fileset.maybeMissing ./modules; path = lib.fileset.maybeMissing ./modules;

2
hosts/gpdPocket3/configuration.nix
View file

@ -27,7 +27,7 @@
# ./stupid-keyboard-2.nix # ./stupid-keyboard-2.nix
]; ];
my_modules.de_cosmic.enable = true; mods.de_cosmic.enable = true;
# machine specific configuration # machine specific configuration
# ============================== # ==============================

12
modules/de_cosmic.nix
View file

@ -7,27 +7,25 @@
}: }:
with lib; with lib;
let let
# name = "de_cosmic"; name = "de_cosmic";
# cfg = config.my_modules.${name}; cfg = config.mods.${name};
in in
{ {
options = { options = {
my_modules.de_cosmic = { mods.${name} = {
enable = mkEnableOption (lib.mdDoc "Enable COSMIC desktop environment"); enable = mkEnableOption (lib.mdDoc "Enable COSMIC desktop environment");
}; };
}; };
# Import the module from nix flake https://github.com/lilyinstarlight/nixos-cosmic config = mkIf cfg.enable {
imports = optional settings.uses_cosmic cosmic.nixosModules.default;
config = mkIf config.my_modules.de_cosmic.enable {
# Use cosmic binary cache # Use cosmic binary cache
nix.settings = { nix.settings = {
substituters = [ "https://cosmic.cachix.org/" ]; substituters = [ "https://cosmic.cachix.org/" ];
trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ]; trusted-public-keys = [ "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" ];
}; };
# Enable cosmic
services.desktopManager.cosmic.enable = true; services.desktopManager.cosmic.enable = true;
services.displayManager.cosmic-greeter.enable = true; services.displayManager.cosmic-greeter.enable = true;
}; };