nix fmt

flake.nix

@@ -1,6 +1,5 @@
 {
-  description =
+  description = "Flake to define configurations of 'elss' - ellmauthaler stefan's systems";
-    "Flake to define configurations of 'elss' - ellmauthaler stefan's systems";
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
@@ -53,14 +52,25 @@
     };
   };
 
-  outputs = { self, nixpkgs, flake-utils-plus, ... }@inputs:
+  outputs = {
-    let
+    self,
-      extended-lib = nixpkgs.lib.extend
+    nixpkgs,
+    flake-utils-plus,
+    ...
+  } @ inputs: let
+    extended-lib =
+      nixpkgs.lib.extend
       (final: prev: {elss = (import ./lib {lib = final;}) prev;});
-      inherit (extended-lib.elss)
+    inherit
-        discoverModules moduleNames discoverMachines withModules
+      (extended-lib.elss)
-        discoverTemplates;
+      discoverModules
-    in flake-utils-plus.lib.mkFlake rec {
+      moduleNames
+      discoverMachines
+      withModules
+      discoverTemplates
+      ;
+  in
+    flake-utils-plus.lib.mkFlake rec {
       inherit self inputs;
       supportedSystems = ["x86_64-linux"];
 
@@ -91,19 +101,24 @@
       hostDefaults = {
         system = "x86_64-linux";
         channelName = "nixpkgs";
-        modules = [
+        modules =
+          [
             inputs.home-manager.nixosModules.home-manager
             inputs.sops-nix.nixosModules.sops
             inputs.dwarffs.nixosModules.dwarffs
             inputs.simple-nixos-mailserver.nixosModules.mailserver
             ./common/wireguard.nix
-        ] ++ (map (name: ./modules + "/${name}") (moduleNames ./modules));
+          ]
+          ++ (map (name: ./modules + "/${name}") (moduleNames ./modules));
         specialArgs = {
           nixos-hardware = inputs.nixos-hardware.nixosModules;
           inherit inputs;
         };
         extraArgs = {
-          homeConfigurations = withModules ./users ({ name, path, }:
+          homeConfigurations = withModules ./users ({
+              name,
+              path,
+            }:
             #import (./users + "/${name}")
               import path);
         };
@@ -114,9 +129,10 @@
 
       nixosModules = discoverModules ./modules;
 
-      homeConfigurations = withModules ./users (name:
+      homeConfigurations = withModules ./users (name: let
-        let username = extended-lib.removeSuffix ".nix" name;
+        username = extended-lib.removeSuffix ".nix" name;
-        in inputs.home-manager.lib.homeManagerConfiguration {
+      in
+        inputs.home-manager.lib.homeManagerConfiguration {
           configuration = import (./users + "/${name}");
           inherit username;
           system = "x86_64-linux";
@@ -125,7 +141,8 @@
         });
 
       outputsBuilder = channels: {
-        devShells = let pkgs = channels.nixpkgs;
+        devShells = let
+          pkgs = channels.nixpkgs;
         in rec {
           sops = import ./secrets/shell.nix {
             pkgs = channels.nixpkgs;
@@ -164,14 +181,12 @@
       templates = discoverTemplates ./templates {
         base = {
           description = "Basic setup of tools in nixpkgs/unstable";
-          welcomeText =
+          welcomeText = "Change into the folder and add the wanted packages to the buildInputs";
-            "Change into the folder and add the wanted packages to the buildInputs";
         };
 
         rust = {
           description = "Rust development environment flake";
-          welcomeText =
+          welcomeText = "Change into the folder and follow the prompt to create an automatic rust environment in this folder";
-            "Change into the folder and follow the prompt to create an automatic rust environment in this folder";
         };
         jupyter = {
           description = "Jupyter server flake";

machines/nucturne/hardware-configuration.nix

@@ -1,11 +1,16 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
   imports = [(modulesPath + "/installer/scan/not-detected.nix")];
 
-  boot.initrd.availableKernelModules =
+  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sdhci_pci"];
-    [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
   boot.initrd.kernelModules = [];
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
@@ -25,8 +30,7 @@
     fsType = "vfat";
   };
 
-  swapDevices =
+  swapDevices = [{device = "/dev/disk/by-uuid/0069f1fa-dd8e-4c0a-8f01-a576af29909e";}];
-    [{ device = "/dev/disk/by-uuid/0069f1fa-dd8e-4c0a-8f01-a576af29909e"; }];
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 }

machines/stel-xps/hardware-configuration.nix

@@ -1,11 +1,16 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }: {
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
   imports = [(modulesPath + "/installer/scan/not-detected.nix")];
 
-  boot.initrd.availableKernelModules =
+  boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
-    [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [];
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];
@@ -15,16 +20,14 @@
     fsType = "ext4";
   };
 
-  boot.initrd.luks.devices."crypted".device =
+  boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/9c84f143-023d-4fcb-a49c-ca78ce69e0e0";
-    "/dev/disk/by-uuid/9c84f143-023d-4fcb-a49c-ca78ce69e0e0";
 
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/39E0-047B";
     fsType = "vfat";
   };
 
-  swapDevices =
+  swapDevices = [{device = "/dev/disk/by-uuid/93381a25-6704-408e-b091-cfda6cddbda0";}];
-    [{ device = "/dev/disk/by-uuid/93381a25-6704-408e-b091-cfda6cddbda0"; }];
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 }

modules/server/gitea.nix

@@ -1,7 +1,14 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 with lib; {
-  config = let cfg = config.elss.server.gitea;
+  config = let
-  in mkIf cfg.enable {
+    cfg = config.elss.server.gitea;
+  in
+    mkIf cfg.enable {
       services.nginx.virtualHosts."git.ellmauthaler.net" = {
         enableACME = true;
         forceSSL = true;

modules/server/nextcloud.nix

@@ -1,7 +1,14 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 with lib; {
-  config = let cfg = config.elss.server.nextcloud;
+  config = let
-  in mkIf cfg.enable {
+    cfg = config.elss.server.nextcloud;
+  in
+    mkIf cfg.enable {
       elss.server.sql.enable = mkDefault true;
       services.nextcloud = {
         enable = true;

modules/ssh.nix

@@ -1,9 +1,16 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 with lib; {
   options.elss.sshd.enable = mkEnableOption "Set up sshd";
 
-  config = let cfg = config.elss.sshd;
+  config = let
-  in mkIf cfg.enable {
+    cfg = config.elss.sshd;
+  in
+    mkIf cfg.enable {
       services.openssh = {
         enable = true;
         settings = {

modules/xmonad.nix

@@ -1,7 +1,14 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 with lib; {
-  config = let cfg = config.elss.graphical.xmonad;
+  config = let
-  in mkIf cfg.enable {
+    cfg = config.elss.graphical.xmonad;
+  in
+    mkIf cfg.enable {
       elss.graphical.xserver = {
         enable = true;
         autorandr.enable = true;

secrets/shell.nix

@@ -1,10 +1,14 @@
-{ pkgs ? import <nixpkgs> { }, sops-nix ? pkgs.callPackage <sops-nix> { }
+{
-, name ? "secrets", ... }:
+  pkgs ? import <nixpkgs> {},
-let
+  sops-nix ? pkgs.callPackage <sops-nix> {},
+  name ? "secrets",
+  ...
+}: let
   sops-rekey = pkgs.writeShellScriptBin "sops-rekey" ''
     ${pkgs.findutils}/bin/find . -wholename '*/secrets/*.yaml' -exec ${pkgs.sops}/bin/sops updatekeys {} \;
   '';
-in pkgs.mkShell {
+in
+  pkgs.mkShell {
     sopsPGPKeyDirs = [./keys/users ./keys/hosts];
     name = name;
     nativeBuildInputs = [

templates/base/flake.nix

@@ -8,10 +8,16 @@
     flake-utils-plus.url = "github:gytis-ivaskevicius/flake-utils-plus";
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, flake-utils, flake-utils-plus
+  outputs = {
-    , ... }@inputs:
+    self,
-    { } // (flake-utils.lib.eachDefaultSystem (system:
+    nixpkgs,
-      let
+    nixpkgs-unstable,
+    flake-utils,
+    flake-utils-plus,
+    ...
+  } @ inputs:
+    {}
+    // (flake-utils.lib.eachDefaultSystem (system: let
       unstable = import nixpkgs-unstable {inherit system;};
       pkgs = import nixpkgs {inherit system;};
     in rec {

templates/rust/flake.nix

@@ -18,12 +18,19 @@
     };
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, flake-utils, gitignoresrc
+  outputs = {
-    , rust-overlay, ... }@inputs:
+    self,
+    nixpkgs,
+    nixpkgs-unstable,
+    flake-utils,
+    gitignoresrc,
+    rust-overlay,
+    ...
+  } @ inputs:
     {
       #overlay = import ./nix { inherit gitignoresrc; };
-    } // (flake-utils.lib.eachDefaultSystem (system:
+    }
-      let
+    // (flake-utils.lib.eachDefaultSystem (system: let
       unstable = import nixpkgs-unstable {inherit system;};
       pkgs = import nixpkgs {
         inherit system;

users/ellmau/autorandr.nix

@@ -1,17 +1,23 @@
-{ config, pkgs, lib, nixosConfig, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  nixosConfig,
+  ...
+}:
 with lib; {
-  config = let cfg = nixosConfig.elss.graphical.xserver.autorandr;
+  config = let
-  in mkIf cfg.enable {
+    cfg = nixosConfig.elss.graphical.xserver.autorandr;
+  in
+    mkIf cfg.enable {
       #services.autorandr = { enable = true; };
       programs.autorandr = {
         enable = true;
         profiles = {
           "home" = {
             fingerprint = {
-            DP-1 =
+              DP-1 = "00ffffffffffff0009d1507945540000221e0104b54627783f5995af4f42af260f5054a56b80d1c0b300a9c08180810081c0010101014dd000a0f0703e8030203500ba892100001a000000ff004e384c30323634373031390a20000000fd00283c87873c010a202020202020000000fc0042656e5120455733323730550a01bc02033af1515d5e5f6061101f222120051404131203012309070783010000e200c06d030c0020003878200060010203e305e001e6060501544c2ca36600a0f0701f8030203500ba892100001a565e00a0a0a029502f203500ba892100001abf650050a0402e6008200808ba892100001c000000000000000000000000000000bf";
-              "00ffffffffffff0009d1507945540000221e0104b54627783f5995af4f42af260f5054a56b80d1c0b300a9c08180810081c0010101014dd000a0f0703e8030203500ba892100001a000000ff004e384c30323634373031390a20000000fd00283c87873c010a202020202020000000fc0042656e5120455733323730550a01bc02033af1515d5e5f6061101f222120051404131203012309070783010000e200c06d030c0020003878200060010203e305e001e6060501544c2ca36600a0f0701f8030203500ba892100001a565e00a0a0a029502f203500ba892100001abf650050a0402e6008200808ba892100001c000000000000000000000000000000bf";
+              eDP-1 = "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
-            eDP-1 =
-              "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
             };
             config = {
               eDP-1.enable = false;
@@ -26,8 +32,7 @@ with lib; {
             };
           };
           "mobile" = {
-          fingerprint.eDP-1 =
+            fingerprint.eDP-1 = "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
-            "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
             config = {
               eDP-1 = {
                 enable = true;
@@ -39,10 +44,8 @@ with lib; {
           };
           "work" = {
             fingerprint = {
-            eDP-1 =
+              eDP-1 = "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
-              "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
+              DP-2 = "00ffffffffffff0010acb5414c4133452c1e0104b53c22783eee95a3544c99260f5054a54b00e1c0d100d1c0b300a94081808100714f4dd000a0f0703e803020350055502100001a000000ff0031444e593132330a2020202020000000fd00184b1e8c36010a202020202020000000fc0044454c4c205532373230510a2001af020319f14c101f2005140413121103020123097f0783010000a36600a0f0703e803020350055502100001a565e00a0a0a029503020350055502100001a114400a0800025503020360055502100001a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d9";
-            DP-2 =
-              "00ffffffffffff0010acb5414c4133452c1e0104b53c22783eee95a3544c99260f5054a54b00e1c0d100d1c0b300a94081808100714f4dd000a0f0703e803020350055502100001a000000ff0031444e593132330a2020202020000000fd00184b1e8c36010a202020202020000000fc0044454c4c205532373230510a2001af020319f14c101f2005140413121103020123097f0783010000a36600a0f0703e803020350055502100001a565e00a0a0a029503020350055502100001a114400a0800025503020360055502100001a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d9";
             };
             config = {
               eDP-1 = {
@@ -65,8 +68,7 @@ with lib; {
           };
           "home-nuc" = {
             fingerprint = {
-            DP-2 =
+              DP-2 = "00ffffffffffff0009d1507945540000221e0104b54627783f5995af4f42af260f5054a56b80d1c0b300a9c08180810081c0010101014dd000a0f0703e8030203500ba892100001a000000ff004e384c30323634373031390a20000000fd00283c87873c010a202020202020000000fc0042656e5120455733323730550a01bc02033af1515d5e5f6061101f222120051404131203012309070783010000e200c06d030c0020003878200060010203e305e001e6060501544c2ca36600a0f0701f8030203500ba892100001a565e00a0a0a029502f203500ba892100001abf650050a0402e6008200808ba892100001c000000000000000000000000000000bf";
-              "00ffffffffffff0009d1507945540000221e0104b54627783f5995af4f42af260f5054a56b80d1c0b300a9c08180810081c0010101014dd000a0f0703e8030203500ba892100001a000000ff004e384c30323634373031390a20000000fd00283c87873c010a202020202020000000fc0042656e5120455733323730550a01bc02033af1515d5e5f6061101f222120051404131203012309070783010000e200c06d030c0020003878200060010203e305e001e6060501544c2ca36600a0f0701f8030203500ba892100001a565e00a0a0a029502f203500ba892100001abf650050a0402e6008200808ba892100001c000000000000000000000000000000bf";
             };
             config = {
               DP-2 = {
@@ -82,10 +84,8 @@ with lib; {
 
           "e3027" = {
             fingerprint = {
-            e-DP1 =
+              e-DP1 = "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
-              "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
+              DP-1 = "00ffffffffffff004ca306a7010101011715010380a05a780ade50a3544c99260f5054a10800814081c0950081809040b300a9400101283c80a070b023403020360040846300001a9e20009051201f304880360040846300001c000000fd0017550f5c11000a202020202020000000fc004550534f4e20504a0a202020200116020328f651901f202205140413030212110706161501230907078301000066030c00100080e200fd023a801871382d40582c450040846300001e011d801871382d40582c450040846300001e662156aa51001e30468f330040846300001e302a40c8608464301850130040846300001e00000000000000000000000000000089";
-            DP-1 =
-              "00ffffffffffff004ca306a7010101011715010380a05a780ade50a3544c99260f5054a10800814081c0950081809040b300a9400101283c80a070b023403020360040846300001a9e20009051201f304880360040846300001c000000fd0017550f5c11000a202020202020000000fc004550534f4e20504a0a202020200116020328f651901f202205140413030212110706161501230907078301000066030c00100080e200fd023a801871382d40582c450040846300001e011d801871382d40582c450040846300001e662156aa51001e30468f330040846300001e302a40c8608464301850130040846300001e00000000000000000000000000000089";
             };
             config = {
               eDP-1 = {
@@ -105,10 +105,8 @@ with lib; {
 
           "e3027-clone" = {
             fingerprint = {
-            e-DP1 =
+              e-DP1 = "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
-              "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
+              DP-1 = "00ffffffffffff004ca306a7010101011715010380a05a780ade50a3544c99260f5054a10800814081c0950081809040b300a9400101283c80a070b023403020360040846300001a9e20009051201f304880360040846300001c000000fd0017550f5c11000a202020202020000000fc004550534f4e20504a0a202020200116020328f651901f202205140413030212110706161501230907078301000066030c00100080e200fd023a801871382d40582c450040846300001e011d801871382d40582c450040846300001e662156aa51001e30468f330040846300001e302a40c8608464301850130040846300001e00000000000000000000000000000089";
-            DP-1 =
-              "00ffffffffffff004ca306a7010101011715010380a05a780ade50a3544c99260f5054a10800814081c0950081809040b300a9400101283c80a070b023403020360040846300001a9e20009051201f304880360040846300001c000000fd0017550f5c11000a202020202020000000fc004550534f4e20504a0a202020200116020328f651901f202205140413030212110706161501230907078301000066030c00100080e200fd023a801871382d40582c450040846300001e011d801871382d40582c450040846300001e662156aa51001e30468f330040846300001e302a40c8608464301850130040846300001e00000000000000000000000000000089";
             };
             config = {
               eDP-1 = {

users/ellmau/dunst.nix

@@ -1,7 +1,15 @@
-{ config, pkgs, lib, nixosConfig, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  nixosConfig,
+  ...
+}:
 with lib; {
-  config = let cfg = nixosConfig.elss.users.dunst;
+  config = let
-  in mkIf cfg.enable {
+    cfg = nixosConfig.elss.users.dunst;
+  in
+    mkIf cfg.enable {
       services.dunst = {
         iconTheme = {
           package = pkgs.numix-icon-theme;

users/ellmau/polybar_xmonad.nix

@@ -1,7 +1,15 @@
-{ config, pkgs, lib, nixosConfig, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  nixosConfig,
+  ...
+}:
 with lib; {
-  config = let cfg = nixosConfig.elss.graphical.xmonad.polybar;
+  config = let
-  in mkIf cfg.enable {
+    cfg = nixosConfig.elss.graphical.xmonad.polybar;
+  in
+    mkIf cfg.enable {
       services.polybar = {
         enable = true;
         package = pkgs.polybarFull;
@@ -59,11 +67,9 @@ with lib; {
 
           "module/dunst" = {
             type = "custom/script";
-          exec =
+            exec = "PATH=${pkgs.dbus}/bin/:$PATH ${pkgs.dunst}/bin/dunstctl is-paused | ${pkgs.gnugrep}/bin/grep -q true && echo   || echo  ";
-            "PATH=${pkgs.dbus}/bin/:$PATH ${pkgs.dunst}/bin/dunstctl is-paused | ${pkgs.gnugrep}/bin/grep -q true && echo   || echo  ";
             interval = 10;
-          click-left =
+            click-left = "PATH=${pkgs.dbus}/bin/:$PATH ${pkgs.dunst}/bin/dunstctl set-paused toggle";
-            "PATH=${pkgs.dbus}/bin/:$PATH ${pkgs.dunst}/bin/dunstctl set-paused toggle";
           };
 
           "module/volume" = {

users/ellmau/xmonad.nix

@@ -1,7 +1,15 @@
-{ config, pkgs, lib, nixosConfig, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  nixosConfig,
+  ...
+}:
 with lib; {
-  config = let cfg = nixosConfig.elss.graphical.xmonad;
+  config = let
-  in mkIf cfg.enable {
+    cfg = nixosConfig.elss.graphical.xmonad;
+  in
+    mkIf cfg.enable {
       xsession = {
         windowManager.xmonad = {
           enable = true;
@@ -18,7 +26,6 @@ with lib; {
           '';
           config = conf/xmonad/xmonad.hs;
         };
-
       };
 
       services = {