From b707b1df5a3ac0eb9aab7505f82fe63790d8cc0b Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Wed, 20 Nov 2024 21:30:29 +0100 Subject: [PATCH] clean up on muos --- hosts/muos/configuration.nix | 64 +++++++++--------------------------- 1 file changed, 15 insertions(+), 49 deletions(-) diff --git a/hosts/muos/configuration.nix b/hosts/muos/configuration.nix index ecab64d..3a48cf4 100644 --- a/hosts/muos/configuration.nix +++ b/hosts/muos/configuration.nix @@ -120,56 +120,22 @@ libnotify playerctl ]; - xdg.configFile = - let - spkgs = inputs.self.packages.${pkgs.system}; - automapaper-configs = builtins.map ( - display: - let - display-shader = pkgs.substituteAll { - src = ../../modules/automapaper/display-with_vars.glsl; - background = nix-colors.lib.conversions.hexToGLSLVec "101012"; - foreground = nix-colors.lib.conversions.hexToGLSLVec "192291"; - }; - state-shader = ../../modules/automapaper/state-game_of_life.glsl; - init-shader = ../../modules/automapaper/init.glsl; - in - (import ../../modules/automapaper/config.nix { - inherit (pkgs) writeTextFile; - inherit - init-shader - state-shader - display-shader - display - ; - horizontal = 225; - vertical = 150; - cycles = 2000; - }) - ) [ "eDP-1" ]; - automapaper = lib.strings.concatMapStringsSep "\n" ( - file: - ''spawn-at-startup "${ - inputs.automapaper.packages.${pkgs.system}.automapaper - }/bin/automapaper" "-C" "${file}/config.toml"'' - ) automapaper-configs; - in - { - "niri/config.kdl".source = import ../../packages/niri-config/default.nix { - pkgs = pkgs; - self-pkgs = spkgs; - inputs = inputs; - displays = [ - { - name = "eDP-1"; - horizontal-resolution = 2256; - horizontal-position = 0; - vertical-resolution = 1504; - framerate = "59.999"; - } - ]; - }; + xdg.configFile = { + "niri/config.kdl".source = import ../../packages/niri-config/default.nix { + pkgs = pkgs; + self-pkgs = inputs.self.packages.${pkgs.system}; + inputs = inputs; + displays = [ + { + name = "eDP-1"; + horizontal-resolution = 2256; + horizontal-position = 0; + vertical-resolution = 1504; + framerate = "59.999"; + } + ]; }; + }; }; }; "root" = import ./root.nix;