aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--modules/client/default.nix3
-rw-r--r--modules/client/labwc/default.nix6
-rw-r--r--modules/client/xserver/default.nix (renamed from modules/common/xserver/default.nix)0
-rw-r--r--modules/common/default.nix8
4 files changed, 13 insertions, 4 deletions
diff --git a/modules/client/default.nix b/modules/client/default.nix
index f4216da..046f61f 100644
--- a/modules/client/default.nix
+++ b/modules/client/default.nix
@@ -2,9 +2,8 @@
imports = [
./1password
./bluetooth
+ # ./cinnamon
./flatpak
./labwc
- ./thunar
- ./waybar
];
}
diff --git a/modules/client/labwc/default.nix b/modules/client/labwc/default.nix
index 4344391..6512e7d 100644
--- a/modules/client/labwc/default.nix
+++ b/modules/client/labwc/default.nix
@@ -1,6 +1,12 @@
{ config, pkgs, ... }:
# Set up a complete labwc instance system-side
{
+ imports = [
+ ../thunar
+ ../waybar
+ ../xserver
+ ];
+
# Enable labwc
programs.labwc.enable = true;
diff --git a/modules/common/xserver/default.nix b/modules/client/xserver/default.nix
index 7249ae2..7249ae2 100644
--- a/modules/common/xserver/default.nix
+++ b/modules/client/xserver/default.nix
diff --git a/modules/common/default.nix b/modules/common/default.nix
index f34cd8f..1eead49 100644
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
{
imports =[
# names are self explanatory
@@ -11,7 +11,7 @@
./searx
./ssh
./users
- ./xserver
+ # ./xserver
];
nix = {
@@ -21,6 +21,10 @@
# Optimize storage
auto-optimise-store = true;
+
+ # substituters = lib.mkForce [ ];
+ # trusted-substituters = lib.mkForce [ ];
+ # require-sigs = false;
};
};
Directive (EU) 2019/790, Article 4(3); all rights regarding Text and Data Mining (TDM) are reserved.