begin customization of gui

2 files changed, 6 insertions, 19 deletions

diff --git a/makefu/1systems/tsp.nix b/makefu/1systems/tsp.nix
index 3979b70b9..da7466d75 100644
--- a/makefu/1systems/tsp.nix
+++ b/makefu/1systems/tsp.nix
@@ -9,8 +9,10 @@
     [ # Include the results of the hardware scan.
       ../2configs/base.nix
       ../2configs/base-gui.nix
-      ../2configs/tp-x200.nix
+      ../2configs/tinc-basic-retiolum.nix
       ../2configs/sda-crypto-root.nix
+      # hardware specifics are in here
+      ../2configs/tp-x200.nix
     ];
   # not working in vm
   krebs.build.host = config.krebs.hosts.tsp;
@@ -26,24 +28,9 @@
     };
   };
 
-  krebs.retiolum = {
-    enable = true;
-    hosts = ../../Zhosts;
-    connectTo = [
-      "gum"
-      "pigstarter"
-      "fastpoke"
-    ];
-  };
-
-  # hardware specifics
-
-
   networking.firewall.rejectPackets = true;
   networking.firewall.allowPing = true;
 
-
-  # $ nix-env -qaP | grep wget
   environment.systemPackages = with pkgs; [
     vim
     jq
diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix
index 7f329c6ce..c4755c217 100644
--- a/makefu/2configs/base-gui.nix
+++ b/makefu/2configs/base-gui.nix
@@ -15,6 +15,8 @@ in
   services.xserver = {
     enable = true;
     layout = "us";
+    xkbVariant = "altgr-intl";
+    xkbOptions = "ctrl:nocaps";
 
     windowManager = {
       awesome.enable = true;
@@ -27,10 +29,8 @@ in
     desktopManager.xterm.enable = false;
   };
 
-  security.setuidPrograms = [ "slock" ];
-
   environment.systemPackages = [
-    pkgs.slock
+    pkgs.xlockmore
     pkgs.rxvt_unicode-with-plugins
   ];