cleaned up a whole bunch

This commit is contained in:
Gerg-L 2023-05-25 22:58:18 -04:00
parent 2f04dc0e23
commit a959cf3e97
17 changed files with 199 additions and 220 deletions

View file

@ -5,23 +5,18 @@
lib,
self,
...
}: let
cfg = config.localModules.DE.dwm;
sp = inputs.suckless.packages.${pkgs.system};
in {
options.localModules.DE.dwm = {
enable = lib.mkEnableOption "";
};
}: {
options.localModules.DE.dwm.enable = lib.mkEnableOption "";
config = lib.mkIf cfg.enable {
config = lib.mkIf config.localModules.DE.dwm.enable {
services.gvfs.enable = true;
services.xserver = {
enable = true;
displayManager = {
sessionCommands = ''
${pkgs.feh}/bin/feh --bg-center ${self.packages.${pkgs.system}.images + /recursion.png}
${pkgs.numlockx}/bin/numlockx
${pkgs.picom}/bin/picom &
${lib.getExe pkgs.feh} --bg-center ${self.packages.${pkgs.system}.images + /recursion.png}
${lib.getExe pkgs.numlockx}
${lib.getExe pkgs.picom} &
'';
defaultSession = "none+dwm";
};
@ -48,10 +43,13 @@ in {
'';
};
};
environment.systemPackages = [
sp.dmenu
sp.dwm
sp.st
];
environment.systemPackages = builtins.attrValues {
inherit
(inputs.suckless.packages.${pkgs.system})
dmenu
dwm
st
;
};
};
}

View file

@ -3,40 +3,46 @@
lib,
pkgs,
...
}: let
cfg = config.localModules.DE.gnome;
in {
options.localModules.DE.gnome = {
enable = lib.mkEnableOption "";
};
config = lib.mkIf cfg.enable {
environment.gnome.excludePackages = [
pkgs.gnome-photos
pkgs.gnome-tour
pkgs.gnome-text-editor
pkgs.gnome-online-accounts
}: {
options.localModules.DE.gnome.enable = lib.mkEnableOption "";
config = lib.mkIf config.localModules.DE.gnome.enable {
environment = {
systemPackages = [pkgs.gnome.gnome-calculator];
gnome.excludePackages = builtins.attrValues {
inherit
(pkgs)
gnome-photos
gnome-tour
gnome-text-editor
gnome-online-accounts
;
inherit
(pkgs.gnome)
gnome-weather
gnome-shell
gnome-disk-utility
gnome-maps
gnome-clocks
gnome-remote-desktop
gnome-calendar
gnome-music
simple-scan
cheese # webcam tool
gedit # text editor
epiphany # web browser
geary # email reader
evince # document viewer
gnome-characters
totem # video player
tali # poker game
iagno # go game
hitori # sudoku game
atomix # puzzle game
;
};
};
pkgs.gnome.gnome-weather
pkgs.gnome.gnome-shell
pkgs.gnome.gnome-disk-utility
pkgs.gnome.gnome-maps
pkgs.gnome.gnome-clocks
pkgs.gnome.gnome-remote-desktop
pkgs.gnome.gnome-calendar
pkgs.gnome.gnome-music
pkgs.gnome.simple-scan
pkgs.gnome.cheese # webcam tool
pkgs.gnome.gedit # text editor
pkgs.gnome.epiphany # web browser
pkgs.gnome.geary # email reader
pkgs.gnome.evince # document viewer
pkgs.gnome.gnome-characters
pkgs.gnome.totem # video player
pkgs.gnome.tali # poker game
pkgs.gnome.iagno # go game
pkgs.gnome.hitori # sudoku game
pkgs.gnome.atomix # puzzle game
];
services.xserver = {
enable = true;
desktopManager.gnome.enable = true;

View file

@ -1,14 +1,13 @@
{
config,
lib,
pkgs,
...
}: let
cfg = config.localModules.DE.xfce;
in {
options.localModules.DE.xfce = {
enable = lib.mkEnableOption "";
};
config = lib.mkIf cfg.enable {
}: {
options.localModules.DE.xfce.enable = lib.mkEnableOption "";
config = lib.mkIf config.localModules.DE.xfce.enable {
environment.systemPackages = [pkgs.xfce.xfce4-whiskermenu-plugin];
services.xserver = {
enable = true;
desktopManager.xfce = {