cosmic updates

This commit is contained in:
RingOfStorms (Joshua Bell) 2024-10-10 16:42:35 -05:00
parent 913cff0ffa
commit e5ade464b9
6 changed files with 24 additions and 11 deletions

View file

@ -136,14 +136,18 @@
in in
(lib.nixosSystem { (lib.nixosSystem {
modules = modules =
[ [ cosmic.nixosModules.default ]
cosmic.nixosModules.default
./hosts/configuration.nix
]
++ ylib.umport { ++ ylib.umport {
path = lib.fileset.maybeMissing ./modules; path = lib.fileset.maybeMissing ./modules;
recursive = true; recursive = true;
}; }
++ ylib.umport {
path = lib.fileset.maybeMissing ./modules_post;
recursive = true;
}
++ [
./hosts/configuration.nix
];
specialArgs = inputs // { specialArgs = inputs // {
inherit ylib; inherit ylib;
settings = settings =

View file

@ -2,6 +2,7 @@
cosmic, cosmic,
config, config,
lib, lib,
pkgs,
settings, settings,
... ...
}: }:
@ -28,5 +29,6 @@ in
# Enable cosmic # Enable cosmic
services.desktopManager.cosmic.enable = true; services.desktopManager.cosmic.enable = true;
services.displayManager.cosmic-greeter.enable = true; services.displayManager.cosmic-greeter.enable = true;
environment.cosmic.excludePackages = with pkgs; [ cosmic-edit cosmic-term cosmic-store ];
}; };
} }

View file

@ -15,6 +15,7 @@ in
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.extraSpecialArgs = { home-manager.extraSpecialArgs = {
nixConfig = config;
inherit settings; inherit settings;
inherit ylib; inherit ylib;
inherit (inputs) ragenix; inherit (inputs) ragenix;

View file

@ -2,6 +2,7 @@
pkgs, pkgs,
settings, settings,
lib, lib,
nixConfig,
... ...
}: }:
with lib.hm.gvariant; with lib.hm.gvariant;
@ -10,13 +11,13 @@ with lib.hm.gvariant;
# use `dconf dump /` before and after and diff the files for easy editing of dconf below # use `dconf dump /` before and after and diff the files for easy editing of dconf below
# > `dconf dump / > /tmp/dconf_dump_start && watch -n0.5 "dconf dump / > /tmp/dconf_dump_current && diff --color /tmp/dconf_dump_start /tmp/dconf_dump_current -U12"` # > `dconf dump / > /tmp/dconf_dump_start && watch -n0.5 "dconf dump / > /tmp/dconf_dump_current && diff --color /tmp/dconf_dump_start /tmp/dconf_dump_current -U12"`
# OR (Must be logged into user directly, no SU to user will work): `dconf watch /` # OR (Must be logged into user directly, no SU to user will work): `dconf watch /`
# OR get the exact converted config from `dconf dump / | dconf2nix | less` and search with forward slash # OR get the exact converted nixConfig from `dconf dump / | dconf2nix | less` and search with forward slash
# gnome.dconf-editor # gnome.dconf-editor
# gnomeExtensions.workspace-switch-wraparound # gnomeExtensions.workspace-switch-wraparound
#gnomeExtensions.forge # probably don"t need on this on tiny laptop but may explore this instead of sway for my desktop #gnomeExtensions.forge # probably don"t need on this on tiny laptop but may explore this instead of sway for my desktop
]; ];
dconf = { dconf = lib.mkIf (!nixConfig.mods.de_cosmic.enable) {
enable = true; enable = true;
settings = { settings = {
"org/gnome/desktop/session" = { "org/gnome/desktop/session" = {

View file

@ -1,6 +1,6 @@
{ pkgs, ... }: { pkgs, lib, nixConfig, ... }:
{ {
gtk = { gtk = lib.mkIf (!nixConfig.mods.de_cosmic.enable) {
enable = true; enable = true;
cursorTheme = { cursorTheme = {

View file

@ -1,4 +1,9 @@
{ pkgs, ... }:
{ {
home.packages = with pkgs; [ gnome.nautilus qimgv ]; pkgs,
lib,
nixConfig,
...
}:
{
home.packages = lib.mkIf (!nixConfig.mods.de_cosmic.enable) (with pkgs; [ gnome.nautilus qimgv ]);
} }