flake.lock: Update

Flake lock file updates: • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/d0fc4dae0e0248453324e8d05733163a6a2f102e' (2023-05-31) → 'github:nix-community/emacs-overlay/dbb2bb4f40a27e2bba0bee5fe6f97e832a4583c6' (2023-06-01) • Added input 'emacs-overlay/nixpkgs-stable': 'github:NixOS/nixpkgs/9af373a61647257d16ae6062cddaa9094d24920c' (2023-05-30) • Updated input 'home-manager': 'github:nix-community/home-manager/54a9d6456eaa6195998a0f37bdbafee9953ca0fb' (2023-05-30) → 'github:nix-community/home-manager/93db05480c0c0f30382d3e80779e8386dcb4f9dd' (2023-06-01) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/6b0edc9c690c1d8a729f055e0d73439045cfda55' (2023-05-30) → 'github:NixOS/nixpkgs/3a70dd92993182f8e514700ccf5b1ae9fc8a3b8d' (2023-05-31)
nix fmt
2025-12-20 09:39:39 +01:00 · 2023-06-01 14:55:31 +02:00 · 2023-06-01 14:54:40 +02:00 · 2023-06-01 14:54:40 +02:00 · 2023-06-01 14:54:39 +02:00 · 2023-06-01 14:53:50 +02:00
16 changed files with 554 additions and 496 deletions
--- a/flake.lock
+++ b/flake.lock
@ -68,14 +68,15 @@
        "flake-utils": "flake-utils",
        "nixpkgs": [
          "nixpkgs"
-        ]
+        ],
+        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1685412232,
-        "narHash": "sha256-Oifn6uAP+IS0jEGs50tlRBCIwtUVIN4f+8RdlxbvK88=",
+        "lastModified": 1685614843,
+        "narHash": "sha256-FwQ0fhGPom0fKXdKJg6KNiKwTrK0fV3+6w9eE4YfG88=",
        "owner": "nix-community",
        "repo": "emacs-overlay",
-        "rev": "04f25058fbe3ae1aadd435aba49b66493e939f83",
+        "rev": "dbb2bb4f40a27e2bba0bee5fe6f97e832a4583c6",
        "type": "github"
      },
      "original": {
@ -101,12 +102,15 @@
      }
    },
    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "lastModified": 1685518550,
+        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
        "type": "github"
      },
      "original": {
@ -152,20 +156,19 @@
      "inputs": {
        "nixpkgs": [
          "nixpkgs"
-        ],
-        "utils": "utils"
+        ]
      },
      "locked": {
-        "lastModified": 1681092193,
-        "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=",
+        "lastModified": 1685599623,
+        "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af",
+        "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-22.11",
+        "ref": "release-23.05",
        "repo": "home-manager",
        "type": "github"
      }
@ -291,6 +294,22 @@
      }
    },
    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1685468986,
+        "narHash": "sha256-YSj3K71KjRZgeL0hS3sYLYHI0g8aIVIf9lcsRMCIW2A=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9af373a61647257d16ae6062cddaa9094d24920c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-22.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable_2": {
      "locked": {
        "lastModified": 1685215858,
        "narHash": "sha256-IRMFoDXA6cYx3ifVw3B2JcC4JrjT5v7tRAx2vro2Ffs=",
@ -324,16 +343,16 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1685314633,
-        "narHash": "sha256-8LXBPqTQXl5ofkjpJ18JcbmLJ/lWDoMxtUwiDYv0wro=",
+        "lastModified": 1685533922,
+        "narHash": "sha256-y4FCQpYafMQ42l1V+NUrMel9RtFtZo59PzdzflKR/lo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "c8a17ce7abc03c50cd072e9e6c9b389c5f61836b",
+        "rev": "3a70dd92993182f8e514700ccf5b1ae9fc8a3b8d",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-22.11",
+        "ref": "nixos-23.05",
        "repo": "nixpkgs",
        "type": "github"
      }
@ -359,7 +378,7 @@
          "nixpkgs"
        ],
        "nixpkgs-22_11": "nixpkgs-22_11",
-        "utils": "utils_2"
+        "utils": "utils"
      },
      "locked": {
        "lastModified": 1671659164,
@ -381,14 +400,14 @@
        "nixpkgs": [
          "nixpkgs"
        ],
-        "nixpkgs-stable": "nixpkgs-stable"
+        "nixpkgs-stable": "nixpkgs-stable_2"
      },
      "locked": {
-        "lastModified": 1685242617,
-        "narHash": "sha256-UBPXGfGwGMJm2Wj9kDj8+TMMK2PTouSM/TpiXYtaqtQ=",
+        "lastModified": 1685434555,
+        "narHash": "sha256-aZl0yeaYX3T2L3W3yXOd3S9OfpS+8YUOT2b1KwrSf6E=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "3e016341d4dca6ce7c62316f90e66341841a30f9",
+        "rev": "876846cde9762ae563f018c17993354875e2538e",
        "type": "github"
      },
      "original": {
@ -398,22 +417,37 @@
        "type": "github"
      }
    },
-    "utils": {
+    "systems": {
      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
        "type": "github"
      },
      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
+        "owner": "nix-systems",
+        "repo": "default",
        "type": "github"
      }
    },
-    "utils_2": {
+    "utils": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "utils": {
      "locked": {
        "lastModified": 1605370193,
        "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
--- a/flake.nix
+++ b/flake.nix
@ -1,9 +1,8 @@
 {
-  description =
-    "Flake to define configurations of 'elss' - ellmauthaler stefan's systems";
+  description = "Flake to define configurations of 'elss' - ellmauthaler stefan's systems";

  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";

    #nix = {
@ -12,14 +11,14 @@
    #  inputs.nixpkgs.follows = "nixpkgs";
    #};

-    nixos-hardware = { url = "github:NixOS/nixos-hardware/master"; };
+    nixos-hardware = {url = "github:NixOS/nixos-hardware/master";};

    home-manager = {
-      url = "github:nix-community/home-manager/release-22.11";
+      url = "github:nix-community/home-manager/release-23.05";
      inputs.nixpkgs.follows = "nixpkgs";
    };

-    flake-utils-plus = { url = "github:gytis-ivaskevicius/flake-utils-plus"; };
+    flake-utils-plus = {url = "github:gytis-ivaskevicius/flake-utils-plus";};

    emacs-overlay = {
      url = "github:nix-community/emacs-overlay";
@ -53,16 +52,27 @@
    };
  };

-  outputs = { self, nixpkgs, flake-utils-plus, ... }@inputs:
-    let
-      extended-lib = nixpkgs.lib.extend
-        (final: prev: { elss = (import ./lib { lib = final; }) prev; });
-      inherit (extended-lib.elss)
-        discoverModules moduleNames discoverMachines withModules
-        discoverTemplates;
-    in flake-utils-plus.lib.mkFlake rec {
+  outputs = {
+    self,
+    nixpkgs,
+    flake-utils-plus,
+    ...
+  } @ inputs: let
+    extended-lib =
+      nixpkgs.lib.extend
+      (final: prev: {elss = (import ./lib {lib = final;}) prev;});
+    inherit
+      (extended-lib.elss)
+      discoverModules
+      moduleNames
+      discoverMachines
+      withModules
+      discoverTemplates
+      ;
+  in
+    flake-utils-plus.lib.mkFlake rec {
      inherit self inputs;
-      supportedSystems = [ "x86_64-linux" ];
+      supportedSystems = ["x86_64-linux"];

      lib = extended-lib;

@ -82,7 +92,7 @@
      };

      channels.nixpkgs.overlaysBuilder = channels: [
-        (final: prev: { unstable = channels.nixpkgs-unstable; })
+        (final: prev: {unstable = channels.nixpkgs-unstable;})
        (flake-utils-plus.lib.genPkgOverlay inputs.comma "comma")
        #inputs.nix.overlay
        inputs.emacs-overlay.overlay
@ -91,32 +101,38 @@
      hostDefaults = {
        system = "x86_64-linux";
        channelName = "nixpkgs";
-        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));
+        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));
        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);
+              import path);
        };
      };

      hosts =
-        discoverMachines ./machines { specialArgs = { lib = extended-lib; }; };
+        discoverMachines ./machines {specialArgs = {lib = extended-lib;};};

      nixosModules = discoverModules ./modules;

-      homeConfigurations = withModules ./users (name:
-        let username = extended-lib.removeSuffix ".nix" name;
-        in inputs.home-manager.lib.homeManagerConfiguration {
+      homeConfigurations = withModules ./users (name: let
+        username = extended-lib.removeSuffix ".nix" name;
+      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 =
-            "Change into the folder and add the wanted packages to the buildInputs";
+          welcomeText = "Change into the folder and add the wanted packages to the buildInputs";
        };

        rust = {
          description = "Rust development environment flake";
-          welcomeText =
-            "Change into the folder and follow the prompt to create an automatic rust environment in this folder";
+          welcomeText = "Change into the folder and follow the prompt to create an automatic rust environment in this folder";
        };
        jupyter = {
          description = "Jupyter server flake";
--- a/machines/nucturne/hardware-configuration.nix
+++ b/machines/nucturne/hardware-configuration.nix
@ -8,9 +8,7 @@
  modulesPath,
  ...
 }: {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+  imports = [(modulesPath + "/installer/scan/not-detected.nix")];

  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sdhci_pci"];
  boot.initrd.kernelModules = [];
@ -32,11 +30,7 @@
    fsType = "vfat";
  };

-  swapDevices = [
-    {device = "/dev/disk/by-uuid/0069f1fa-dd8e-4c0a-8f01-a576af29909e";}
-  ];
+  swapDevices = [{device = "/dev/disk/by-uuid/0069f1fa-dd8e-4c0a-8f01-a576af29909e";}];

  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-  # high-resolution display
-  hardware.video.hidpi.enable = lib.mkDefault true;
 }
--- a/machines/stel-xps/hardware-configuration.nix
+++ b/machines/stel-xps/hardware-configuration.nix
@ -8,9 +8,7 @@
  modulesPath,
  ...
 }: {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+  imports = [(modulesPath + "/installer/scan/not-detected.nix")];

  boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
  boot.initrd.kernelModules = [];
@ -29,11 +27,7 @@
    fsType = "vfat";
  };

-  swapDevices = [
-    {device = "/dev/disk/by-uuid/93381a25-6704-408e-b091-cfda6cddbda0";}
-  ];
+  swapDevices = [{device = "/dev/disk/by-uuid/93381a25-6704-408e-b091-cfda6cddbda0";}];

  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-  # high-resolution display
-  hardware.video.hidpi.enable = lib.mkDefault true;
 }
--- a/modules/server/gitea.nix
+++ b/modules/server/gitea.nix
@ -12,27 +12,23 @@ with lib; {
      services.nginx.virtualHosts."git.ellmauthaler.net" = {
        enableACME = true;
        forceSSL = true;
-        locations."/" = {
-          proxyPass = "http://localhost:3001";
-        };
+        locations."/" = {proxyPass = "http://localhost:3001";};
      };

      services.gitea = {
        enable = true;
-        settings.service = {
-          DISABLE_REGISTRATION = true;
-        };
+        settings.service = {DISABLE_REGISTRATION = true;};
        appName = "gitea: ellmauthaler.net gitea service";
        database = {
          type = "postgres";
          host = "/run/posgresql";
        };
-        domain = "git.ellmauthaler.net";
-        rootUrl = "https://git.ellmauthaler.net";
-        httpPort = 3001;
        settings = {
-          repository = {
-            DEFAULT_BRANCH = "main";
+          repository = {DEFAULT_BRANCH = "main";};
+          server = {
+            ROOT_URL = "https://git.ellmauthaler.net";
+            HTTP_PORT = 3001;
+            DOMAIN = "git.ellmauthaler.net";
          };
        };
      };
--- a/modules/server/grocy.nix
+++ b/modules/server/grocy.nix
@ -9,21 +9,22 @@ with lib; {
    cfg = config.elss.server.grocy;
  in
    mkIf cfg.enable {
-      services.grocy = {
-        enable = true;
-        hostName = "grocy.ellmauthaler.net";
-        settings = {
-          currency = "EUR";
-          culture = "de";
-          calendar = {
-            showWeekNumber = true;
-            firstDayOfWeek = 1;
+      services = {
+        grocy = {
+          enable = true;
+          hostName = "grocy.ellmauthaler.net";
+          settings = {
+            currency = "EUR";
+            culture = "de";
+            calendar = {
+              showWeekNumber = true;
+              firstDayOfWeek = 1;
+            };
          };
        };
-      };

-      services.nginx.virtualHosts."grocy.ellmauthaler.net" = {
-        forceSSL = true;
+        nginx.virtualHosts."grocy.ellmauthaler.net" = {forceSSL = true;};
+        phpfpm.pools.grocy.phpPackage = mkForce pkgs.php81;
      };
    };
 }
--- a/modules/server/nextcloud.nix
+++ b/modules/server/nextcloud.nix
@ -12,7 +12,7 @@ with lib; {
      elss.server.sql.enable = mkDefault true;
      services.nextcloud = {
        enable = true;
-        package = pkgs.nextcloud25;
+        package = pkgs.nextcloud26;
        hostName = "cloudstore.ellmauthaler.net";
        https = true;
        enableBrokenCiphersForSSE = false;
--- a/modules/ssh.nix
+++ b/modules/ssh.nix
@ -13,8 +13,10 @@ with lib; {
    mkIf cfg.enable {
      services.openssh = {
        enable = true;
-        passwordAuthentication = false;
-        permitRootLogin = "no";
+        settings = {
+          PasswordAuthentication = false;
+          PermitRootLogin = "no";
+        };
      };
    };
 }
--- a/modules/xmonad.nix
+++ b/modules/xmonad.nix
@ -1,33 +1,40 @@
-{ config, pkgs, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 with lib; {
-  config = let cfg = config.elss.graphical.xmonad;
-  in mkIf cfg.enable {
-    elss.graphical.xserver = {
-      enable = true;
-      autorandr.enable = true;
-    };
-    elss.users.dunst.enable = true;
-    elss.graphical.xmonad.polybar.enable = true;
-    services = {
-      xserver = {
-        windowManager.xmonad = {
-          enable = true;
-          enableContribAndExtras = true;
-        };
-        displayManager.defaultSession = "none+xmonad";
-        libinput = {
-          enable = true;
-          touchpad = { disableWhileTyping = true; };
-        };
-      };
-      upower.enable = true;
-
-      pipewire = {
+  config = let
+    cfg = config.elss.graphical.xmonad;
+  in
+    mkIf cfg.enable {
+      elss.graphical.xserver = {
        enable = true;
-        alsa.enable = true;
-        pulse.enable = true;
+        autorandr.enable = true;
      };
+      elss.users.dunst.enable = true;
+      elss.graphical.xmonad.polybar.enable = true;
+      services = {
+        xserver = {
+          windowManager.xmonad = {
+            enable = true;
+            enableContribAndExtras = true;
+          };
+          displayManager.defaultSession = "none+xmonad";
+          libinput = {
+            enable = true;
+            touchpad = {disableWhileTyping = true;};
+          };
+        };
+        upower.enable = true;
+
+        pipewire = {
+          enable = true;
+          alsa.enable = true;
+          pulse.enable = true;
+        };
+      };
+      environment.systemPackages = with pkgs; [firefox thunderbird];
    };
-    environment.systemPackages = with pkgs; [ firefox thunderbird ];
-  };
 }
--- a/secrets/shell.nix
+++ b/secrets/shell.nix
@ -1,16 +1,20 @@
-{ pkgs ? import <nixpkgs> { }, sops-nix ? pkgs.callPackage <sops-nix> { }
-, name ? "secrets", ... }:
-let
+{
+  pkgs ? import <nixpkgs> {},
+  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 {
-  sopsPGPKeyDirs = [ ./keys/users ./keys/hosts ];
-  name = name;
-  nativeBuildInputs = [
-    sops-nix.sops-import-keys-hook
-    sops-nix.ssh-to-pgp
-    sops-rekey
-    pkgs.wireguard-tools
-  ];
-}
+in
+  pkgs.mkShell {
+    sopsPGPKeyDirs = [./keys/users ./keys/hosts];
+    name = name;
+    nativeBuildInputs = [
+      sops-nix.sops-import-keys-hook
+      sops-nix.ssh-to-pgp
+      sops-rekey
+      pkgs.wireguard-tools
+    ];
+  }
--- a/templates/base/flake.nix
+++ b/templates/base/flake.nix
@ -2,7 +2,7 @@
  description = "basic tool setup flake";

  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
    flake-utils.url = "github:numtide/flake-utils";
    flake-utils-plus.url = "github:gytis-ivaskevicius/flake-utils-plus";
@ -17,21 +17,15 @@
    ...
  } @ inputs:
    {}
-    // (flake-utils.lib.eachDefaultSystem (
-      system: let
-        unstable = import nixpkgs-unstable {
-          inherit system;
-        };
-        pkgs = import nixpkgs {
-          inherit system;
-        };
-      in rec {
-        devShell = pkgs.mkShell {
-          buildInputs = [
-            # add packages here, like
-            # pkgs.clingo
-          ];
-        };
-      }
-    ));
+    // (flake-utils.lib.eachDefaultSystem (system: let
+      unstable = import nixpkgs-unstable {inherit system;};
+      pkgs = import nixpkgs {inherit system;};
+    in rec {
+      devShell = pkgs.mkShell {
+        buildInputs = [
+          # add packages here, like
+          # pkgs.clingo
+        ];
+      };
+    }));
 }
--- a/templates/rust/flake.nix
+++ b/templates/rust/flake.nix
@ -2,7 +2,7 @@
  description = "basic rust flake";

  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
    nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
    rust-overlay = {
      url = "github:oxalica/rust-overlay";
@ -30,30 +30,28 @@
    {
      #overlay = import ./nix { inherit gitignoresrc; };
    }
-    // (flake-utils.lib.eachDefaultSystem (
-      system: let
-        unstable = import nixpkgs-unstable {inherit system;};
-        pkgs = import nixpkgs {
-          inherit system;
-          overlays = [(import rust-overlay)];
-        };
-      in rec {
-        devShell = pkgs.mkShell {
-          RUST_LOG = "debug";
-          RUST_BACKTRACE = 1;
-          buildInputs = [
-            pkgs.rust-bin.stable.latest.rustfmt
-            pkgs.rust-bin.stable.latest.default
-            pkgs.rust-analyzer
-            pkgs.cargo-audit
-            pkgs.cargo-license
-            pkgs.cargo-tarpaulin
-            pkgs.cargo-kcov
-            pkgs.valgrind
-            pkgs.gnuplot
-            pkgs.kcov
-          ];
-        };
-      }
-    ));
+    // (flake-utils.lib.eachDefaultSystem (system: let
+      unstable = import nixpkgs-unstable {inherit system;};
+      pkgs = import nixpkgs {
+        inherit system;
+        overlays = [(import rust-overlay)];
+      };
+    in rec {
+      devShell = pkgs.mkShell {
+        RUST_LOG = "debug";
+        RUST_BACKTRACE = 1;
+        buildInputs = [
+          pkgs.rust-bin.stable.latest.rustfmt
+          pkgs.rust-bin.stable.latest.default
+          pkgs.rust-analyzer
+          pkgs.cargo-audit
+          pkgs.cargo-license
+          pkgs.cargo-tarpaulin
+          pkgs.cargo-kcov
+          pkgs.valgrind
+          pkgs.gnuplot
+          pkgs.kcov
+        ];
+      };
+    }));
 }
--- a/users/ellmau/autorandr.nix
+++ b/users/ellmau/autorandr.nix
@ -1,134 +1,132 @@
-{ config, pkgs, lib, nixosConfig, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  nixosConfig,
+  ...
+}:
 with lib; {
-  config = let cfg = nixosConfig.elss.graphical.xserver.autorandr;
-  in mkIf cfg.enable {
-    #services.autorandr = { enable = true; };
-    programs.autorandr = {
-      enable = true;
-      profiles = {
-        "home" = {
-          fingerprint = {
-            DP-1 =
-              "00ffffffffffff0009d1507945540000221e0104b54627783f5995af4f42af260f5054a56b80d1c0b300a9c08180810081c0010101014dd000a0f0703e8030203500ba892100001a000000ff004e384c30323634373031390a20000000fd00283c87873c010a202020202020000000fc0042656e5120455733323730550a01bc02033af1515d5e5f6061101f222120051404131203012309070783010000e200c06d030c0020003878200060010203e305e001e6060501544c2ca36600a0f0701f8030203500ba892100001a565e00a0a0a029502f203500ba892100001abf650050a0402e6008200808ba892100001c000000000000000000000000000000bf";
-            eDP-1 =
-              "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
-          };
-          config = {
-            eDP-1.enable = false;
-            DP-1 = {
-              enable = true;
-              crtc = 1;
-              primary = true;
-              position = "0x0";
-              mode = "3840x2160";
-              dpi = 96;
+  config = let
+    cfg = nixosConfig.elss.graphical.xserver.autorandr;
+  in
+    mkIf cfg.enable {
+      #services.autorandr = { enable = true; };
+      programs.autorandr = {
+        enable = true;
+        profiles = {
+          "home" = {
+            fingerprint = {
+              DP-1 = "00ffffffffffff0009d1507945540000221e0104b54627783f5995af4f42af260f5054a56b80d1c0b300a9c08180810081c0010101014dd000a0f0703e8030203500ba892100001a000000ff004e384c30323634373031390a20000000fd00283c87873c010a202020202020000000fc0042656e5120455733323730550a01bc02033af1515d5e5f6061101f222120051404131203012309070783010000e200c06d030c0020003878200060010203e305e001e6060501544c2ca36600a0f0701f8030203500ba892100001a565e00a0a0a029502f203500ba892100001abf650050a0402e6008200808ba892100001c000000000000000000000000000000bf";
+              eDP-1 = "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
+            };
+            config = {
+              eDP-1.enable = false;
+              DP-1 = {
+                enable = true;
+                crtc = 1;
+                primary = true;
+                position = "0x0";
+                mode = "3840x2160";
+                dpi = 96;
+              };
            };
          };
-        };
-        "mobile" = {
-          fingerprint.eDP-1 =
-            "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
-          config = {
-            eDP-1 = {
-              enable = true;
-              primary = true;
-              mode = "3840x2160";
-              dpi = 192;
+          "mobile" = {
+            fingerprint.eDP-1 = "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
+            config = {
+              eDP-1 = {
+                enable = true;
+                primary = true;
+                mode = "3840x2160";
+                dpi = 192;
+              };
            };
          };
-        };
-        "work" = {
-          fingerprint = {
-            eDP-1 =
-              "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
-            DP-2 =
-              "00ffffffffffff0010acb5414c4133452c1e0104b53c22783eee95a3544c99260f5054a54b00e1c0d100d1c0b300a94081808100714f4dd000a0f0703e803020350055502100001a000000ff0031444e593132330a2020202020000000fd00184b1e8c36010a202020202020000000fc0044454c4c205532373230510a2001af020319f14c101f2005140413121103020123097f0783010000a36600a0f0703e803020350055502100001a565e00a0a0a029503020350055502100001a114400a0800025503020360055502100001a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d9";
-          };
-          config = {
-            eDP-1 = {
-              enable = true;
-              crtc = 0;
-              position = "3840x0";
-              mode = "3840x2160";
-              #dpi = 288;
-              dpi = 96;
+          "work" = {
+            fingerprint = {
+              eDP-1 = "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
+              DP-2 = "00ffffffffffff0010acb5414c4133452c1e0104b53c22783eee95a3544c99260f5054a54b00e1c0d100d1c0b300a94081808100714f4dd000a0f0703e803020350055502100001a000000ff0031444e593132330a2020202020000000fd00184b1e8c36010a202020202020000000fc0044454c4c205532373230510a2001af020319f14c101f2005140413121103020123097f0783010000a36600a0f0703e803020350055502100001a565e00a0a0a029503020350055502100001a114400a0800025503020360055502100001a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d9";
            };
-            DP-2 = {
-              enable = true;
-              primary = true;
-              mode = "3840x2160";
-              #dpi = 144;
-              dpi = 96;
-              position = "0x0";
+            config = {
+              eDP-1 = {
+                enable = true;
+                crtc = 0;
+                position = "3840x0";
+                mode = "3840x2160";
+                #dpi = 288;
+                dpi = 96;
+              };
+              DP-2 = {
+                enable = true;
+                primary = true;
+                mode = "3840x2160";
+                #dpi = 144;
+                dpi = 96;
+                position = "0x0";
+              };
            };
          };
-        };
-        "home-nuc" = {
-          fingerprint = {
-            DP-2 =
-              "00ffffffffffff0009d1507945540000221e0104b54627783f5995af4f42af260f5054a56b80d1c0b300a9c08180810081c0010101014dd000a0f0703e8030203500ba892100001a000000ff004e384c30323634373031390a20000000fd00283c87873c010a202020202020000000fc0042656e5120455733323730550a01bc02033af1515d5e5f6061101f222120051404131203012309070783010000e200c06d030c0020003878200060010203e305e001e6060501544c2ca36600a0f0701f8030203500ba892100001a565e00a0a0a029502f203500ba892100001abf650050a0402e6008200808ba892100001c000000000000000000000000000000bf";
-          };
-          config = {
-            DP-2 = {
-              enable = true;
-              crtc = 1;
-              primary = true;
-              position = "0x0";
-              mode = "3840x2160";
-              dpi = 96;
+          "home-nuc" = {
+            fingerprint = {
+              DP-2 = "00ffffffffffff0009d1507945540000221e0104b54627783f5995af4f42af260f5054a56b80d1c0b300a9c08180810081c0010101014dd000a0f0703e8030203500ba892100001a000000ff004e384c30323634373031390a20000000fd00283c87873c010a202020202020000000fc0042656e5120455733323730550a01bc02033af1515d5e5f6061101f222120051404131203012309070783010000e200c06d030c0020003878200060010203e305e001e6060501544c2ca36600a0f0701f8030203500ba892100001a565e00a0a0a029502f203500ba892100001abf650050a0402e6008200808ba892100001c000000000000000000000000000000bf";
+            };
+            config = {
+              DP-2 = {
+                enable = true;
+                crtc = 1;
+                primary = true;
+                position = "0x0";
+                mode = "3840x2160";
+                dpi = 96;
+              };
            };
          };
-        };

-        "e3027" = {
-          fingerprint = {
-            e-DP1 =
-              "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
-            DP-1 =
-              "00ffffffffffff004ca306a7010101011715010380a05a780ade50a3544c99260f5054a10800814081c0950081809040b300a9400101283c80a070b023403020360040846300001a9e20009051201f304880360040846300001c000000fd0017550f5c11000a202020202020000000fc004550534f4e20504a0a202020200116020328f651901f202205140413030212110706161501230907078301000066030c00100080e200fd023a801871382d40582c450040846300001e011d801871382d40582c450040846300001e662156aa51001e30468f330040846300001e302a40c8608464301850130040846300001e00000000000000000000000000000089";
-          };
-          config = {
-            eDP-1 = {
-              enable = true;
-              crtc = 0;
-              position = "0x0";
-              mode = "3840x2160";
+          "e3027" = {
+            fingerprint = {
+              e-DP1 = "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
+              DP-1 = "00ffffffffffff004ca306a7010101011715010380a05a780ade50a3544c99260f5054a10800814081c0950081809040b300a9400101283c80a070b023403020360040846300001a9e20009051201f304880360040846300001c000000fd0017550f5c11000a202020202020000000fc004550534f4e20504a0a202020200116020328f651901f202205140413030212110706161501230907078301000066030c00100080e200fd023a801871382d40582c450040846300001e011d801871382d40582c450040846300001e662156aa51001e30468f330040846300001e302a40c8608464301850130040846300001e00000000000000000000000000000089";
            };
-            DP-1 = {
-              enable = true;
-              crtc = 1;
-              position = "3840x0";
-              mode = "1920x1200";
+            config = {
+              eDP-1 = {
+                enable = true;
+                crtc = 0;
+                position = "0x0";
+                mode = "3840x2160";
+              };
+              DP-1 = {
+                enable = true;
+                crtc = 1;
+                position = "3840x0";
+                mode = "1920x1200";
+              };
            };
          };
-        };

-        "e3027-clone" = {
-          fingerprint = {
-            e-DP1 =
-              "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
-            DP-1 =
-              "00ffffffffffff004ca306a7010101011715010380a05a780ade50a3544c99260f5054a10800814081c0950081809040b300a9400101283c80a070b023403020360040846300001a9e20009051201f304880360040846300001c000000fd0017550f5c11000a202020202020000000fc004550534f4e20504a0a202020200116020328f651901f202205140413030212110706161501230907078301000066030c00100080e200fd023a801871382d40582c450040846300001e011d801871382d40582c450040846300001e662156aa51001e30468f330040846300001e302a40c8608464301850130040846300001e00000000000000000000000000000089";
-          };
-          config = {
-            eDP-1 = {
-              enable = true;
-              crtc = 0;
-              position = "0x0";
-              mode = "1920x1200";
+          "e3027-clone" = {
+            fingerprint = {
+              e-DP1 = "00ffffffffffff0006af2b2800000000001c0104a51d117802ee95a3544c99260f50540000000101010101010101010101010101010152d000a0f0703e803020350025a51000001a000000000000000000000000000000000000000000fe0039304e544880423133335a414e0000000000024103a8011100000b010a20200006";
+              DP-1 = "00ffffffffffff004ca306a7010101011715010380a05a780ade50a3544c99260f5054a10800814081c0950081809040b300a9400101283c80a070b023403020360040846300001a9e20009051201f304880360040846300001c000000fd0017550f5c11000a202020202020000000fc004550534f4e20504a0a202020200116020328f651901f202205140413030212110706161501230907078301000066030c00100080e200fd023a801871382d40582c450040846300001e011d801871382d40582c450040846300001e662156aa51001e30468f330040846300001e302a40c8608464301850130040846300001e00000000000000000000000000000089";
            };
-            DP-1 = {
-              enable = true;
-              crtc = 1;
-              position = "0x0";
-              mode = "1920x1200";
+            config = {
+              eDP-1 = {
+                enable = true;
+                crtc = 0;
+                position = "0x0";
+                mode = "1920x1200";
+              };
+              DP-1 = {
+                enable = true;
+                crtc = 1;
+                position = "0x0";
+                mode = "1920x1200";
+              };
            };
          };
        };
-      };
-      hooks.postswitch = {
-        "polybar" = "systemctl --user restart polybar.service";
+        hooks.postswitch = {
+          "polybar" = "systemctl --user restart polybar.service";
+        };
      };
    };
-  };
 }
--- a/users/ellmau/dunst.nix
+++ b/users/ellmau/dunst.nix
@ -1,40 +1,48 @@
-{ config, pkgs, lib, nixosConfig, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  nixosConfig,
+  ...
+}:
 with lib; {
-  config = let cfg = nixosConfig.elss.users.dunst;
-  in mkIf cfg.enable {
-    services.dunst = {
-      iconTheme = {
-        package = pkgs.numix-icon-theme;
-        name = "Numix";
-        size = "26";
-      };
-      settings = {
-        global = {
-          geometry = "800x5-30+50";
-          transparency = 10;
-          frame_color = "#839496";
-          font = "Hasklug Nerd Font 11";
-          timeout = 5;
-          follow = "mouse";
-          markup = "full";
-          icon_position = "left";
-          history_length = 32;
-          dmenu = "${pkgs.rofi}/bin/rofi -dmenu";
-          word_wrap = true;
+  config = let
+    cfg = nixosConfig.elss.users.dunst;
+  in
+    mkIf cfg.enable {
+      services.dunst = {
+        iconTheme = {
+          package = pkgs.numix-icon-theme;
+          name = "Numix";
+          size = "26";
        };
-        urgency_critical = {
-          foreground = "#fdf6e3";
-          background = "#dc322f";
-        };
-        urgency_normal = {
-          foreground = "#fdf6e3";
-          background = "#859900";
-        };
-        urgency_low = {
-          foreground = "#fdf6e3";
-          background = "#2aa198";
+        settings = {
+          global = {
+            geometry = "800x5-30+50";
+            transparency = 10;
+            frame_color = "#839496";
+            font = "Hasklug Nerd Font 11";
+            timeout = 5;
+            follow = "mouse";
+            markup = "full";
+            icon_position = "left";
+            history_length = 32;
+            dmenu = "${pkgs.rofi}/bin/rofi -dmenu";
+            word_wrap = true;
+          };
+          urgency_critical = {
+            foreground = "#fdf6e3";
+            background = "#dc322f";
+          };
+          urgency_normal = {
+            foreground = "#fdf6e3";
+            background = "#859900";
+          };
+          urgency_low = {
+            foreground = "#fdf6e3";
+            background = "#2aa198";
+          };
        };
      };
    };
-  };
 }
--- a/users/ellmau/polybar_xmonad.nix
+++ b/users/ellmau/polybar_xmonad.nix
@ -1,132 +1,138 @@
-{ config, pkgs, lib, nixosConfig, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  nixosConfig,
+  ...
+}:
 with lib; {
-  config = let cfg = nixosConfig.elss.graphical.xmonad.polybar;
-  in mkIf cfg.enable {
-    services.polybar = {
-      enable = true;
-      package = pkgs.polybarFull;
-      settings = let
-        fonts = [
-          "Weather Icons:size=12;0"
-          "Hasklug Nerd Font,Hasklig Medium:style=Medium,Regular"
-          "all-the-icons:style=Regular"
-          "Webdings:style=Regular"
-          "Noto Emoji:scale=10"
-          "Unifont:style=Regular"
-          "Material Icons:size=12;0"
-        ];
-      in {
-        "bar/main" = {
-          font = fonts;
-          modules = {
-            left = "xmonad";
-            center = "";
-            # right = "xbacklight xkeyboard eth wlan battery date powermenu dunst volume ";
-            right = "xkeyboard dunst battery date volume";
-          };
-          tray = {
-            position = "right";
-            padding = 3;
+  config = let
+    cfg = nixosConfig.elss.graphical.xmonad.polybar;
+  in
+    mkIf cfg.enable {
+      services.polybar = {
+        enable = true;
+        package = pkgs.polybarFull;
+        settings = let
+          fonts = [
+            "Weather Icons:size=12;0"
+            "Hasklug Nerd Font,Hasklig Medium:style=Medium,Regular"
+            "all-the-icons:style=Regular"
+            "Webdings:style=Regular"
+            "Noto Emoji:scale=10"
+            "Unifont:style=Regular"
+            "Material Icons:size=12;0"
+          ];
+        in {
+          "bar/main" = {
+            font = fonts;
+            modules = {
+              left = "xmonad";
+              center = "";
+              # right = "xbacklight xkeyboard eth wlan battery date powermenu dunst volume ";
+              right = "xkeyboard dunst battery date volume";
+            };
+            tray = {
+              position = "right";
+              padding = 3;
+            };
+
+            # background = "FFFFFF";
+            # foreground = "000000";
+
+            module-margin = 2;
+
+            monitor = ''
+              ''${env:MONITOR:}
+            '';
          };

-          # background = "FFFFFF";
-          # foreground = "000000";
-
-          module-margin = 2;
-
-          monitor = ''
-            ''${env:MONITOR:}
-          '';
-        };
-
-        "bar/aux" = {
-          font = fonts;
-          modules = {
-            left = "xmonad";
-            center = "";
-            right = "";
+          "bar/aux" = {
+            font = fonts;
+            modules = {
+              left = "xmonad";
+              center = "";
+              right = "";
+            };
+            monitor = ''
+              ''${env:MONITOR:}
+            '';
+          };
+
+          "module/xmonad" = {
+            type = "custom/script";
+            exec = "${pkgs.xmonad-log}/bin/xmonad-log";
+            tail = true;
+          };
+
+          "module/dunst" = {
+            type = "custom/script";
+            exec = "PATH=${pkgs.dbus}/bin/:$PATH ${pkgs.dunst}/bin/dunstctl is-paused | ${pkgs.gnugrep}/bin/grep -q true && echo   || echo  ";
+            interval = 10;
+            click-left = "PATH=${pkgs.dbus}/bin/:$PATH ${pkgs.dunst}/bin/dunstctl set-paused toggle";
+          };
+
+          "module/volume" = {
+            type = "internal/pulseaudio";
+            format.volume = "<ramp-volume> <label-volume>";
+            label.muted.text = "🔇";
+            label.muted.foreground = "#666";
+            ramp.volume = ["🔈" "🔉" "🔊"];
+            click.right = "${pkgs.pavucontrol}/bin/pavucontrol &";
+            # format-volume-underline = Base2;
+            # format-muted-underline = Base2;
+          };
+
+          "module/xkeyboard" = {
+            type = "internal/xkeyboard";
+            blacklist-0 = "num lock";
+            interval = "5";
+            format-prefix = ''""'';
+            label-layout = "%layout%";
+            label-indicator-padding = "2";
+            label-indicator-margin = "1";
+          };
+
+          "module/battery" = {
+            type = "internal/battery";
+            battery = "BAT0";
+            adapter = "ADP1";
+            full-at = "98";
+            format-charging-prefix = ''"   "'';
+            format-charging = "<label-charging>";
+            format-discharging-prefix = ''"   "'';
+            format-discharging = "<label-discharging>";
+            format-full-prefix = ''"   "'';
+            format-full-padding = "1";
+            format-charging-padding = "1";
+            format-discharging-padding = "1";
+          };
+
+          "module/date" = {
+            type = "internal/date";
+            interval = "5";
+
+            date = ''" %Y-%m-%d"'';
+            date-alt = ''" %Y-%m-%d"'';
+
+            time = "%H:%M";
+            time-alt = "%H:%M:%S";
+
+            label = "%{A} %date% %time%";
          };
-          monitor = ''
-            ''${env:MONITOR:}
-          '';
-        };
-
-        "module/xmonad" = {
-          type = "custom/script";
-          exec = "${pkgs.xmonad-log}/bin/xmonad-log";
-          tail = true;
-        };
-
-        "module/dunst" = {
-          type = "custom/script";
-          exec =
-            "PATH=${pkgs.dbus}/bin/:$PATH ${pkgs.dunst}/bin/dunstctl is-paused | ${pkgs.gnugrep}/bin/grep -q true && echo   || echo  ";
-          interval = 10;
-          click-left =
-            "PATH=${pkgs.dbus}/bin/:$PATH ${pkgs.dunst}/bin/dunstctl set-paused toggle";
-        };
-
-        "module/volume" = {
-          type = "internal/pulseaudio";
-          format.volume = "<ramp-volume> <label-volume>";
-          label.muted.text = "🔇";
-          label.muted.foreground = "#666";
-          ramp.volume = [ "🔈" "🔉" "🔊" ];
-          click.right = "${pkgs.pavucontrol}/bin/pavucontrol &";
-          # format-volume-underline = Base2;
-          # format-muted-underline = Base2;
-        };
-
-        "module/xkeyboard" = {
-          type = "internal/xkeyboard";
-          blacklist-0 = "num lock";
-          interval = "5";
-          format-prefix = ''""'';
-          label-layout = "%layout%";
-          label-indicator-padding = "2";
-          label-indicator-margin = "1";
-        };
-
-        "module/battery" = {
-          type = "internal/battery";
-          battery = "BAT0";
-          adapter = "ADP1";
-          full-at = "98";
-          format-charging-prefix = ''"   "'';
-          format-charging = "<label-charging>";
-          format-discharging-prefix = ''"   "'';
-          format-discharging = "<label-discharging>";
-          format-full-prefix = ''"   "'';
-          format-full-padding = "1";
-          format-charging-padding = "1";
-          format-discharging-padding = "1";
-        };
-
-        "module/date" = {
-          type = "internal/date";
-          interval = "5";
-
-          date = ''" %Y-%m-%d"'';
-          date-alt = ''" %Y-%m-%d"'';
-
-          time = "%H:%M";
-          time-alt = "%H:%M:%S";
-
-          label = "%{A} %date% %time%";
        };
+        script = ''
+          for m in $(polybar --list-monitors | ${pkgs.gnugrep}/bin/grep '(primary)' | ${pkgs.coreutils}/bin/cut -d":" -f1); do
+            MONITOR=$m polybar --reload main &
+          done;
+          for m in $(polybar --list-monitors | ${pkgs.gnugrep}/bin/grep -v '(primary)' | ${pkgs.coreutils}/bin/cut -d":" -f1); do
+            MONITOR=$m polybar --reload aux &
+          done;
+        '';
      };
-      script = ''
-        for m in $(polybar --list-monitors | ${pkgs.gnugrep}/bin/grep '(primary)' | ${pkgs.coreutils}/bin/cut -d":" -f1); do
-          MONITOR=$m polybar --reload main &
-        done;
-        for m in $(polybar --list-monitors | ${pkgs.gnugrep}/bin/grep -v '(primary)' | ${pkgs.coreutils}/bin/cut -d":" -f1); do
-          MONITOR=$m polybar --reload aux &
-        done;
-      '';
-    };

-    systemd.user.services.polybar = {
-      Install.WantedBy = [ "graphical-session.target" ];
+      systemd.user.services.polybar = {
+        Install.WantedBy = ["graphical-session.target"];
+      };
    };
-  };
 }
--- a/users/ellmau/xmonad.nix
+++ b/users/ellmau/xmonad.nix
@ -1,39 +1,46 @@
-{ config, pkgs, lib, nixosConfig, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  nixosConfig,
+  ...
+}:
 with lib; {
-  config = let cfg = nixosConfig.elss.graphical.xmonad;
-  in mkIf cfg.enable {
-    xsession = {
-      windowManager.xmonad = {
-        enable = true;
-        enableContribAndExtras = true;
-        extraPackages = hp: [
-          hp.dbus
-          hp.hostname
-          hp.monad-logger
-          hp.xmonad-contrib
-        ];
-        libFiles."ELSS.hs" = pkgs.writeText "ELSS.hs" ''
-          module ELSS where
-          keyboardtoggle = "${conf/keyboard/keyboard_layout_toggle.sh}"
-        '';
-        config = conf/xmonad/xmonad.hs;
+  config = let
+    cfg = nixosConfig.elss.graphical.xmonad;
+  in
+    mkIf cfg.enable {
+      xsession = {
+        windowManager.xmonad = {
+          enable = true;
+          enableContribAndExtras = true;
+          extraPackages = hp: [
+            hp.dbus
+            hp.hostname
+            hp.monad-logger
+            hp.xmonad-contrib
+          ];
+          libFiles."ELSS.hs" = pkgs.writeText "ELSS.hs" ''
+            module ELSS where
+            keyboardtoggle = "${conf/keyboard/keyboard_layout_toggle.sh}"
+          '';
+          config = conf/xmonad/xmonad.hs;
+        };
      };

+      services = {
+        betterlockscreen = {
+          enable = true;
+          inactiveInterval = 10;
+        };
+        picom = {
+          enable = true;
+          backend = "glx";
+        };
+      };
+
+      gtk.enable = true;
+
+      home.packages = with pkgs; [rofi polybarFull firefox pulseaudioFull];
    };
-
-    services = {
-      betterlockscreen = {
-        enable = true;
-        inactiveInterval = 10;
-      };
-      picom = {
-        enable = true;
-        backend = "glx";
-      };
-    };
-
-    gtk.enable = true;
-
-    home.packages = with pkgs; [ rofi polybarFull firefox pulseaudioFull ];
-  };
 }
Author	SHA1	Message	Date
Stefan Ellmauthaler	282abf636d	flake.lock: Update Flake lock file updates: • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/d0fc4dae0e0248453324e8d05733163a6a2f102e' (2023-05-31) → 'github:nix-community/emacs-overlay/dbb2bb4f40a27e2bba0bee5fe6f97e832a4583c6' (2023-06-01) • Added input 'emacs-overlay/nixpkgs-stable': 'github:NixOS/nixpkgs/9af373a61647257d16ae6062cddaa9094d24920c' (2023-05-30) • Updated input 'home-manager': 'github:nix-community/home-manager/54a9d6456eaa6195998a0f37bdbafee9953ca0fb' (2023-05-30) → 'github:nix-community/home-manager/93db05480c0c0f30382d3e80779e8386dcb4f9dd' (2023-06-01) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/6b0edc9c690c1d8a729f055e0d73439045cfda55' (2023-05-30) → 'github:NixOS/nixpkgs/3a70dd92993182f8e514700ccf5b1ae9fc8a3b8d' (2023-05-31)	2023-06-01 14:55:31 +02:00
Stefan Ellmauthaler	f265f9a50e	nix fmt	2023-06-01 14:54:40 +02:00
Stefan Ellmauthaler	40d894cc4e	Fix grocy to use php 8.1	2023-06-01 14:54:40 +02:00
Stefan Ellmauthaler	24b3d61e48	Upgrade to nixos 23.05	2023-06-01 14:54:39 +02:00
Stefan Ellmauthaler	34a85fd76e	flake.lock: Update Flake lock file updates: • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/04f25058fbe3ae1aadd435aba49b66493e939f83' (2023-05-30) → 'github:nix-community/emacs-overlay/d0fc4dae0e0248453324e8d05733163a6a2f102e' (2023-05-31) • Updated input 'emacs-overlay/flake-utils': 'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02) → 'github:numtide/flake-utils/a1720a10a6cfe8234c0e93907ffe81be440f4cef' (2023-05-31) • Added input 'emacs-overlay/flake-utils/systems': 'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09) • Updated input 'sops-nix': 'github:Mic92/sops-nix/3e016341d4dca6ce7c62316f90e66341841a30f9' (2023-05-28) → 'github:Mic92/sops-nix/876846cde9762ae563f018c17993354875e2538e' (2023-05-30)	2023-06-01 14:53:50 +02:00
Stefan Ellmauthaler	103a3e233d	flake.lock: Update Flake lock file updates: • Updated input 'emacs-overlay': 'github:nix-community/emacs-overlay/04f25058fbe3ae1aadd435aba49b66493e939f83' (2023-05-30) → 'github:nix-community/emacs-overlay/d0fc4dae0e0248453324e8d05733163a6a2f102e' (2023-05-31) • Updated input 'emacs-overlay/flake-utils': 'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02) → 'github:numtide/flake-utils/a1720a10a6cfe8234c0e93907ffe81be440f4cef' (2023-05-31) • Added input 'emacs-overlay/flake-utils/systems': 'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/c8a17ce7abc03c50cd072e9e6c9b389c5f61836b' (2023-05-28) → 'github:NixOS/nixpkgs/9af373a61647257d16ae6062cddaa9094d24920c' (2023-05-30) • Updated input 'sops-nix': 'github:Mic92/sops-nix/3e016341d4dca6ce7c62316f90e66341841a30f9' (2023-05-28) → 'github:Mic92/sops-nix/876846cde9762ae563f018c17993354875e2538e' (2023-05-30)	2023-05-31 17:02:50 +02:00