Nebucatnetzer
/
nixos
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move various modules into the desktop module

This commit is contained in:
Andreas Zweili 2022-11-08 09:01:48 +01:00
parent f27b8eb69a
commit adbff19191
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/desktop/default.nix
View File

@ -1,8 +1,17 @@
{ custom }: { pkgs, ... }:
{
imports = [
(import "${custom.inputs.self}/modules/docker" { inherit custom; })
(import "${custom.inputs.self}/modules/droidcam" { inherit custom; })
(import "${custom.inputs.self}/modules/email" { inherit custom; })
(import "${custom.inputs.self}/modules/eog" { inherit custom; })
(import "${custom.inputs.self}/modules/espanso" { inherit custom; })
"${custom.inputs.self}/modules/hunspell"
(import "${custom.inputs.self}/modules/libimobiledevice" { inherit custom; })
(import "${custom.inputs.self}/modules/nix-direnv" { inherit custom; })
(import "${custom.inputs.self}/modules/pipewire" { inherit custom; })
"${custom.inputs.self}/modules/scripts"
"${custom.inputs.self}/modules/tmux"
];
networking = {
networkmanager.enable = true;

4
systems/desktop-vm/default.nix
View File

@ -2,11 +2,7 @@
{
imports = [
(import "${custom.inputs.self}/modules/desktop" { inherit custom; })
(import "${custom.inputs.self}/modules/docker" { inherit custom; })
(import "${custom.inputs.self}/modules/espanso" { inherit custom; })
"${custom.inputs.self}/modules/logs-share"
(import "${custom.inputs.self}/modules/nix-direnv" { inherit custom; })
"${custom.inputs.self}/modules/tmux"
];
boot.initrd.availableKernelModules = [
"ata_piix"

9
systems/gwyn/default.nix
View File

@ -8,18 +8,9 @@
"${custom.inputs.self}/hardware/nvidia"
"${custom.inputs.self}/hardware/dvd"
(import "${custom.inputs.self}/modules/desktop" { inherit custom; })
(import "${custom.inputs.self}/modules/docker" { inherit custom; })
(import "${custom.inputs.self}/modules/droidcam" { inherit custom; })
(import "${custom.inputs.self}/modules/email" { inherit custom; })
(import "${custom.inputs.self}/modules/eog" { inherit custom; })
(import "${custom.inputs.self}/modules/espanso" { inherit custom; })
"${custom.inputs.self}/modules/lockscreen"
"${custom.inputs.self}/modules/logs-share"
(import "${custom.inputs.self}/modules/nix-direnv" { inherit custom; })
(import "${custom.inputs.self}/modules/pipewire" { inherit custom; })
"${custom.inputs.self}/modules/scripts"
"${custom.inputs.self}/modules/tlp"
"${custom.inputs.self}/modules/tmux"
(import "${custom.inputs.self}/modules/restic" { inherit custom; })
];
boot.initrd.availableKernelModules = [