updated private

configuration.nix

@@ -41,7 +41,7 @@
   };
 
   services.xserver.xkb = {
-    options = "caps:swapescape";
+    options = "caps:escape,compose:102,shift:both_capslock,eurosign:e";
     layout = "us";
     variant = "altgr-intl";
     };

gridlock.nix

@@ -34,6 +34,11 @@
     ROC_ENABLE_PRE_VEGA = "1";
   };
   hardware.opengl.driSupport = true;
+
+
+  programs.sway.enable = true;
+  services.xserver.displayManager.defaultSession = lib.mkForce "sway";
+  services.xserver.windowManager.i3.enable = lib.mkForce false;
   # Configure network proxy if necessary
   # networking.proxy.default = "http://user:password@proxy:port/";
   # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";

junk.nix

@@ -32,31 +32,49 @@
   };
   
 
-  containers."jumphost" = {
-    autoStart = true;
-    privateNetwork = true;
-    hostBridge = "br0";
-    config = {config, pkgs, lib, ... }: {
-      networking.useDHCP = lib.mkForce true;
-      services.endlessh = {
-        enable = true;
-        port = 22;
-        openFirewall = true;
+  containers = {
+    "jumphost" = {
+      autoStart = false;
+      privateNetwork = true;
+      hostBridge = "br0";
+      config = {config, pkgs, lib, ... }: {
+        networking.useDHCP = lib.mkForce true;
+        services.endlessh = {
+          enable = true;
+          port = 22;
+          openFirewall = true;
+        };
+        services.openssh = {
+          enable = true;
+          ports = [ 2022 ];
+          settings.PasswordAuthentication = false;
+        };
+        users.users."jump" = {
+          name = "jump";
+          isNormalUser = true;
+        };
+        services.fail2ban.enable = true;
       };
-      services.openssh = {
-        enable = true;
-        ports = [ 2022 ];
-        settings.PasswordAuthentication = false;
+    };
+    "nextcloud" = {
+      autoStart = true;
+      privateNetwork = true;
+      hostBridge = "br0";
+      config = {config, lib, pkgs, ... }: {
+        networking.useDHCP = lib.mkForce true;
       };
-      users.users."jump" = {
-        name = "jump";
-        isNormalUser = true;
+    };
+    "gnunet" = {
+      autoStart = true;
+      privateNetwork = true;
+      hostBridge = "br0";
+      config = {config, lib, pkgs, ...}: {
+        networking.useDHCP = lib.mkForce true;
+        services.gnunet.enable = true;
       };
-      services.fail2ban.enable = true;
     };
   };
 
-
   # Open ports in the firewall.
   networking.firewall.allowedTCPPorts = [ 53589 ];
   networking.firewall.allowedUDPPorts = [ 9200 ];

workstation.nix

@@ -1,6 +1,11 @@
 { config, lib, pkgs, ... }:
 
 {
+
+  imports = [
+    private/workstation.nix
+  ];
+
   fileSystems = {
     "/home".options = [ "compress=lzo" ];
     "/etc/nixos" = {
@@ -38,12 +43,15 @@
 #    SUBVOLUME = /home;
 #    ALLOW_USERS = [ "vi" ];
 #  };
-  programs.xwayland.enable = true;
+#  programs.xwayland.enable = true;
   services.xserver.enable = true;
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.displayManager.defaultSession = "sway";
+#  services.xserver.displayManager.gdm.enable = true;
+  services.xserver.displayManager.defaultSession = "none+i3";
   services.xserver.displayManager.autoLogin.user = "vi";
   services.xserver.displayManager.autoLogin.enable = true;
+  services.xserver.displayManager.lightdm.enable = true;
+  services.xserver.windowManager.i3.enable = true;
+  services.xserver.windowManager.i3.package = pkgs.i3-rounded;
 
   services.udisks2.enable = true;
   services.printing.enable = true;
@@ -62,7 +70,6 @@
     nerdfonts
   ];
 
-  programs.sway.enable = true;
 
   services.gnome.gnome-keyring.enable = true;
   services.pipewire.enable = true;
@@ -72,7 +79,7 @@
 
   powerManagement.enable = true;
   environment.systemPackages = with pkgs; [
-    swayfx
+  #  swayfx
     wget
     vim
     wev
@@ -81,5 +88,20 @@
     htop
     bindfs
     vivaldi
+    signal-desktop
   ];
+  networking.firewall = {
+    allowedUDPPortRanges = [
+      {
+        from = 1714;
+        to = 1764;
+      }
+    ];
+    allowedTCPPortRanges = [
+      {
+        from = 1714;
+        to = 1764;
+      }
+    ];
+  };
 }

x230.nix

@@ -5,7 +5,6 @@
     [ # Include the results of the hardware scan.
       <nixos-hardware/lenovo/thinkpad/x230>
       ./workstation.nix
-      private/x230.nix
     ];
 
   # Use the GRUB 2 boot loader.
@@ -34,8 +33,8 @@
         CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
         CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
 
-        START_CHARGE_THRESH_BAT0 = "90"; 
-        STOP_CHARGE_THRESH_BAT0 = "95";
+        START_CHARGE_THRESH_BAT0 = "75"; 
+        STOP_CHARGE_THRESH_BAT0 = "90";
       };
   };
   powerManagement.powertop.enable = true;
@@ -48,4 +47,8 @@
   services.logind.lidSwitch = "suspend-then-hibernate";
   systemd.sleep.extraConfig = "HibernateDelaySec=1h";
 #  services.upower.enable = true;
+#  fileSystems."nas".options = [ "noauto" ];
+  programs.sway.enable = true;
+  services.xserver.displayManager.defaultSession = lib.mkForce "sway";
+  services.xserver.windowManager.i3.enable = lib.mkForce false;
 }