ctucx.git: nixfiles

cleanup

diff --git a/configurations/programs/sway.nix b/configurations/programs/sway.nix
@@ -147,12 +147,12 @@
           "XF86AudioMicMute"          = "exec ${pkgs.pulseaudio}/bin/pactl set-source-mute @DEFAULT_SOURCE@ toggle";
 
           #laptop
-	      "XF86AudioPlay"             = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
+	        "XF86AudioPlay"             = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
           "XF86AudioNext"             = "exec ${pkgs.playerctl}/bin/playerctl next";
           "XF86AudioPrev"             = "exec ${pkgs.playerctl}/bin/playerctl previous";
 
           #desktop
-	      "XF86LaunchA"               = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
+	        "XF86LaunchA"               = "exec ${pkgs.playerctl}/bin/playerctl play-pause";
           "XF86MyComputer"            = "exec ${pkgs.playerctl}/bin/playerctl next";
           "XF86Search"                = "exec ${pkgs.playerctl}/bin/playerctl previous";
 

diff --git a/configurations/programs/swaylock.nix b/configurations/programs/swaylock.nix
@@ -7,11 +7,7 @@
     swaylock = {
       Unit = {
         Requisite = [ "graphical-session.target" ];
-        PartOf    = [
-          "lock.target"
-        ]  ++ (if config.networking.hostName == "stasicontainer" then [
-         "sleep.target"
-        ] else []);
+        PartOf    = [ "lock.target" "sleep.target" ];
       };
 
       Service = {

@@ -20,11 +16,7 @@
       };
 
       Install = {
-        WantedBy = [
-          "lock.target"
-        ]  ++ (if config.networking.hostName == "stasicontainer" then [
-         "sleep.target"
-        ] else []);
+        WantedBy = [ "lock.target" "sleep.target" ];
       };
     };
   };

diff --git a/machines/coladose/configuration.nix b/machines/coladose/configuration.nix
@@ -3,11 +3,13 @@
 {
   imports = [
     ./hardware-configuration.nix
+
     ../../configurations/mobile-device.nix
     ../../configurations/thunderbolt.nix
     ../../configurations/common.nix
-    ../../configurations/bluetooth.nix
+
     ../../configurations/desktop-sway.nix
+    ../../configurations/bluetooth.nix
     ../../configurations/sdr.nix
   ];
 

@@ -63,6 +65,11 @@
     };
   };
 
+  services = {
+    fwupd.enable         = true;
+    fprintd.enable       = true;
+  };
+
   home-manager.users.leah.home.stateVersion = "21.05";
   system.stateVersion = "21.05"; # Did you read the comment?
 }

diff --git a/machines/currywurst/configuration.nix b/machines/currywurst/configuration.nix
@@ -5,9 +5,11 @@
     ./hardware-configuration.nix
     ../../configurations/mobile-device.nix
     ../../configurations/thunderbolt.nix
+
     ../../configurations/common.nix
-    ../../configurations/bluetooth.nix
+
     ../../configurations/desktop-sway.nix
+    ../../configurations/bluetooth.nix
   ];
 
   hardware = {

@@ -29,10 +31,12 @@
     kernel.sysctl."kernel/sysrq"  = 1;
     kernelPackages                = pkgs.linuxKernel.packages.linux_5_16;
     kernelModules                 = [ "tpm-rng" "thunderbolt-net" ];
+
     extraModulePackages           = [
       pkgs.linuxKernel.packages.linux_5_16.acpi_call
       (pkgs.callPackage ./xmm7360.nix { kernel = pkgs.linux_5_16; })
     ];
+
     kernelParams = [
       "quiet"
       "scsi_mod.use_blk_mq=1"

@@ -65,7 +69,7 @@
 
     firewall = {
       enable = true;
-#      allowedTCPPorts = [ ];
+      allowedTCPPorts = [ 5201 ];
     };
   };