summary refs log tree commit diff stats
path: root/system
diff options
context:
space:
mode:
authorAlan Pearce2022-10-14 18:01:11 +0200
committerAlan Pearce2022-10-14 18:01:18 +0200
commit6e34ca8bda9cddcce1ea73f73b883a3ec8358678 (patch)
tree8c244fa50f03640b663b07dbe5ef74bc67d80833 /system
parentbf435de812836511a9ba580a66acf3cd235cd15c (diff)
downloadnixfiles-6e34ca8bda9cddcce1ea73f73b883a3ec8358678.tar.lz
nixfiles-6e34ca8bda9cddcce1ea73f73b883a3ec8358678.tar.zst
nixfiles-6e34ca8bda9cddcce1ea73f73b883a3ec8358678.zip
Reformat nix files
Diffstat (limited to 'system')
-rw-r--r--system/modules/nextdns.nix18
-rw-r--r--system/settings/gaming.nix8
-rw-r--r--system/settings/hardware/adb.nix5
-rw-r--r--system/settings/hardware/nvidia-gpu.nix4
-rw-r--r--system/settings/kubernetes.nix7
-rw-r--r--system/settings/programs/shell.nix9
-rw-r--r--system/settings/programs/window-manager.nix53
-rw-r--r--system/settings/satoshipay.nix5
-rw-r--r--system/settings/services/airplay-sink.nix1
9 files changed, 62 insertions, 48 deletions
diff --git a/system/modules/nextdns.nix b/system/modules/nextdns.nix
index fabfb7cc..b6e33728 100644
--- a/system/modules/nextdns.nix
+++ b/system/modules/nextdns.nix
@@ -14,20 +14,20 @@ let
     extraConfig = ''
       modules = { 'hints > iterate' }
       localTrees = policy.todnames({
-        'lan.',
-        'home.',
-        '10.in-addr.arpa.',
-        '172.in-addr.arpa.',
-        '192.in-addr.arpa.'
+      'lan.',
+      'home.',
+      '10.in-addr.arpa.',
+      '172.in-addr.arpa.',
+      '192.in-addr.arpa.'
       })
       hints.add_hosts()
       policy.add(policy.suffix(policy.FLAGS({'NO_CACHE'}), localTrees))
       policy.add(policy.suffix(policy.STUB({ '192.168.0.1', '192.168.1.1', '172.30.42.1', '10.0.0.1' }), localTrees))
       policy.add(policy.all(policy.TLS_FORWARD({
-        {'45.90.28.0', hostname='${identifyingPrefix}${cfg.configID}.dns1.nextdns.io'},
-        {'2a07:a8c0::', hostname='${identifyingPrefix}${cfg.configID}.dns1.nextdns.io'},
-        {'45.90.30.0', hostname='${identifyingPrefix}${cfg.configID}.dns2.nextdns.io'},
-        {'2a07:a8c1::', hostname='${identifyingPrefix}${cfg.configID}.dns2.nextdns.io'}
+      {'45.90.28.0', hostname='${identifyingPrefix}${cfg.configID}.dns1.nextdns.io'},
+      {'2a07:a8c0::', hostname='${identifyingPrefix}${cfg.configID}.dns1.nextdns.io'},
+      {'45.90.30.0', hostname='${identifyingPrefix}${cfg.configID}.dns2.nextdns.io'},
+      {'2a07:a8c1::', hostname='${identifyingPrefix}${cfg.configID}.dns2.nextdns.io'}
       })))
     '';
   };
diff --git a/system/settings/gaming.nix b/system/settings/gaming.nix
index 493a201e..139210cf 100644
--- a/system/settings/gaming.nix
+++ b/system/settings/gaming.nix
@@ -71,6 +71,12 @@
     "context.properties" = {
       "log.level" = 2;
     };
+    "pulse.properties" = {
+      "server.address" = [
+        "unix:native"
+        "tcp:127.0.0.1:4713"
+      ];
+    };
     "context.modules" = [
       {
         name = "libpipewire-module-rtkit";
@@ -96,7 +102,7 @@
           "pulse.max.quantum" = "32/48000";
           "server.address" = [
             "unix:native"
-            "tcp:[::1]:4713"
+            "tcp:127.0.0.1:4713"
           ];
         };
       }
diff --git a/system/settings/hardware/adb.nix b/system/settings/hardware/adb.nix
index 8b511f55..0c27b380 100644
--- a/system/settings/hardware/adb.nix
+++ b/system/settings/hardware/adb.nix
@@ -1,9 +1,10 @@
 { config, pkgs, ... }:
 
-{ programs.adb.enable = true;
+{
+  programs.adb.enable = true;
   users.groups.adbusers = {};
 
   services.udev = {
-   packages = [ pkgs.android-udev-rules ];
+    packages = [ pkgs.android-udev-rules ];
   };
 }
diff --git a/system/settings/hardware/nvidia-gpu.nix b/system/settings/hardware/nvidia-gpu.nix
index 3c099e42..052cd678 100644
--- a/system/settings/hardware/nvidia-gpu.nix
+++ b/system/settings/hardware/nvidia-gpu.nix
@@ -2,7 +2,9 @@
 
 let
   nvidia_x11 = config.boot.kernelPackages.nvidia_x11;
-in { services.xserver.videoDrivers = [ "nvidia" ];
+in
+{
+  services.xserver.videoDrivers = [ "nvidia" ];
   boot = {
     blacklistedKernelModules = [ "nouveau" ];
     extraModulePackages = [ nvidia_x11 ];
diff --git a/system/settings/kubernetes.nix b/system/settings/kubernetes.nix
index 692e46d6..68bcb627 100644
--- a/system/settings/kubernetes.nix
+++ b/system/settings/kubernetes.nix
@@ -7,9 +7,10 @@
   networking.interfaces = {
     cbr0 = {
       ipv4.addresses = [
-      { address = "10.10.0.1";
-        prefixLength = 24;
-      }
+        {
+          address = "10.10.0.1";
+          prefixLength = 24;
+        }
       ];
     };
   };
diff --git a/system/settings/programs/shell.nix b/system/settings/programs/shell.nix
index edc39d0e..bf8fc3aa 100644
--- a/system/settings/programs/shell.nix
+++ b/system/settings/programs/shell.nix
@@ -1,10 +1,11 @@
 { config, pkgs, ... }:
 
-{ programs.zsh = {
+{
+  programs.zsh = {
     enable = true;
     promptInit = "";
-} // (if pkgs.stdenv.isDarwin then {} else {
-  enableGlobalCompInit = false;
-});
+  } // (if pkgs.stdenv.isDarwin then {} else {
+    enableGlobalCompInit = false;
+  });
   programs.bash.enableCompletion = true;
 }
diff --git a/system/settings/programs/window-manager.nix b/system/settings/programs/window-manager.nix
index c3e89709..b2d94929 100644
--- a/system/settings/programs/window-manager.nix
+++ b/system/settings/programs/window-manager.nix
@@ -1,27 +1,28 @@
 { config, pkgs, ... }:
 
-{ services.xserver = {
-   desktopManager.xterm.enable = false;
+{
+  services.xserver = {
+    desktopManager.xterm.enable = false;
 
-   displayManager = {
-     autoLogin = {
-       user = "alan";
-       enable = false;
-     };
-     lightdm = {
-       enable = true;
-       greeter.enable = true;
-       greeters.mini = {
-         enable = false;
-         user = "alan";
-       };
-     };
-     sessionCommands = ''
-       ${pkgs.xorg.xrdb}/bin/xrdb -merge $HOME/.xresources/main
-       ${pkgs.xorg.xsetroot}/bin/xsetroot -cursor_name left_ptr -solid '#4d4d4c'
-       ${pkgs.networkmanagerapplet}/bin/nm-applet &
-     '';
-   };
+    displayManager = {
+      autoLogin = {
+        user = "alan";
+        enable = false;
+      };
+      lightdm = {
+        enable = true;
+        greeter.enable = true;
+        greeters.mini = {
+          enable = false;
+          user = "alan";
+        };
+      };
+      sessionCommands = ''
+        ${pkgs.xorg.xrdb}/bin/xrdb -merge $HOME/.xresources/main
+        ${pkgs.xorg.xsetroot}/bin/xsetroot -cursor_name left_ptr -solid '#4d4d4c'
+        ${pkgs.networkmanagerapplet}/bin/nm-applet &
+      '';
+    };
     xautolock = {
       enable = true;
       locker = "${pkgs.i3lock}/bin/i3lock -n";
@@ -33,11 +34,11 @@
 
   services.xserver.displayManager.setupCommands = ''
     ${pkgs.redshift}/bin/redshift \
-      -l ${toString config.location.latitude}:${toString config.location.longitude} \
-      -t ${toString config.services.redshift.temperature.day}:${toString config.services.redshift.temperature.night} \
-      -b 1:1 \
-      -o \
-      -r
+    -l ${toString config.location.latitude}:${toString config.location.longitude} \
+    -t ${toString config.services.redshift.temperature.day}:${toString config.services.redshift.temperature.night} \
+    -b 1:1 \
+    -o \
+    -r
   '';
 
   environment.systemPackages = with pkgs; [
diff --git a/system/settings/satoshipay.nix b/system/settings/satoshipay.nix
index 7155902c..9e185570 100644
--- a/system/settings/satoshipay.nix
+++ b/system/settings/satoshipay.nix
@@ -9,8 +9,9 @@ let
     };
   };
 in
-{ virtualisation = {
-  docker = {
+{
+  virtualisation = {
+    docker = {
       enable = true;
       enableOnBoot = false;
       liveRestore = false;
diff --git a/system/settings/services/airplay-sink.nix b/system/settings/services/airplay-sink.nix
index 36fde9b4..617adaa2 100644
--- a/system/settings/services/airplay-sink.nix
+++ b/system/settings/services/airplay-sink.nix
@@ -6,4 +6,5 @@
     enable = true;
     group = "pipewire";
   };
+  systemd.services.shairport-sync.serviceConfig.Environment = "PULSE_SERVER=tcp:127.0.0.1:4713";
 }