From e709a1afcf2d94a3f2ecb8ccb4c2b4996fb2efc9 Mon Sep 17 00:00:00 2001 From: soraefir Date: Fri, 17 Nov 2023 22:32:10 +0100 Subject: [PATCH] Fix overlay --- modules/home/wayland/apps/kanshi/default.nix | 148 +++++++++---------- overlays/default.nix | 8 +- overlays/openttd-jgrpp/default.nix | 22 ++- overlays/yarn-berry/default.nix | 22 ++- systems/iriy/default.nix | 64 ++++---- 5 files changed, 132 insertions(+), 132 deletions(-) diff --git a/modules/home/wayland/apps/kanshi/default.nix b/modules/home/wayland/apps/kanshi/default.nix index b643f26..d62a9f2 100644 --- a/modules/home/wayland/apps/kanshi/default.nix +++ b/modules/home/wayland/apps/kanshi/default.nix @@ -1,74 +1,74 @@ -{ ... }: { - - services.kanshi = { - enable = true; - systemdTarget = "graphical-session.target"; - profiles = { - tower_0 = { - outputs = [{ - criteria = "CEX CX133 0x00000001"; - mode = "1920x1200@59.972"; - position = "0,0"; - scale = 1.0; - status = "enable"; - }]; - }; - tower_1 = { - outputs = [{ - criteria = "AOC 16G3 1DDP7HA000348"; - mode = "1920x1080@144.000"; - position = "0,0"; - status = "enable"; - scale = 1.0; - adaptiveSync = true; - }]; - }; - laptop_0 = { - outputs = [{ - criteria = "LG Display 0x060A Unknown"; - mode = "1920x1080@60.020"; - position = "0,0"; - scale = 1.0; - status = "enable"; - }]; - }; - laptop_1 = { - outputs = [ - { - criteria = "CEX CX133 0x00000001"; - mode = "2560x1600@59.972"; - position = "0,0"; - scale = 1.0; - status = "enable"; - } - { - criteria = "LG Display 0x060A Unknown"; - mode = "1920x1080@60.020"; - position = "2560,0"; - scale = 1.0; - status = "enable"; - } - ]; - }; - laptop_2 = { - outputs = [ - { - criteria = "AOC 16G3 1DDP7HA000348"; - mode = "1920x1080@144.000"; - position = "0,0"; - status = "enable"; - scale = 1.0; - adaptiveSync = true; - } - { - criteria = "LG Display 0x060A Unknown"; - mode = "1920x1080@60.020"; - position = "1920,0"; - scale = 1.0; - status = "enable"; - } - ]; - }; - }; - }; -} +{ ... }: { + + services.kanshi = { + enable = true; + systemdTarget = "graphical-session.target"; + profiles = { + tower_0 = { + outputs = [{ + criteria = "CEX CX133 0x00000001"; + mode = "1920x1200@59.972"; + position = "0,0"; + scale = 1.0; + status = "enable"; + }]; + }; + tower_1 = { + outputs = [{ + criteria = "AOC 16G3 1DDP7HA000348"; + mode = "1920x1080@144.000"; + position = "0,0"; + status = "enable"; + scale = 1.0; + adaptiveSync = true; + }]; + }; + laptop_0 = { + outputs = [{ + criteria = "LG Display 0x060A Unknown"; + mode = "1920x1080@60.020"; + position = "0,0"; + scale = 1.0; + status = "enable"; + }]; + }; + laptop_1 = { + outputs = [ + { + criteria = "CEX CX133 0x00000001"; + mode = "2560x1600@59.972"; + position = "0,0"; + scale = 1.0; + status = "enable"; + } + { + criteria = "LG Display 0x060A Unknown"; + mode = "1920x1080@60.020"; + position = "2560,0"; + scale = 1.0; + status = "enable"; + } + ]; + }; + laptop_2 = { + outputs = [ + { + criteria = "AOC 16G3 1DDP7HA000348"; + mode = "1920x1080@144.000"; + position = "0,0"; + status = "enable"; + scale = 1.0; + adaptiveSync = true; + } + { + criteria = "LG Display 0x060A Unknown"; + mode = "1920x1080@60.020"; + position = "1920,0"; + scale = 1.0; + status = "enable"; + } + ]; + }; + }; + }; +} diff --git a/overlays/default.nix b/overlays/default.nix index ef51aac..b9ffff9 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,3 +1,7 @@ { pkgs, ... }: -[ ] -# [(import ./openttd-jgrpp) (import ./yarn-berry)] +[ + (final: prev: { + openttd-jgrpp = import ./openttd-jgrpp { inherit final prev; }; + yarn-berry = import ./yarn-berry { inherit final prev; }; + }) +] diff --git a/overlays/openttd-jgrpp/default.nix b/overlays/openttd-jgrpp/default.nix index 1825ad0..918eef6 100644 --- a/overlays/openttd-jgrpp/default.nix +++ b/overlays/openttd-jgrpp/default.nix @@ -1,12 +1,10 @@ -{ ... }: -final: prev: { - openttd-jgrpp = prev.openttd-jgrpp.overrideAttrs (old: rec { - version = "0.55.3"; - src = prev.fetchFromGitHub rec { - owner = "JGRennison"; - repo = "OpenTTD-patches"; - rev = "jgrpp-${version}"; - hash = "sha256-xpo4E07ifWUZy5z78Fwm1SpLP3wUBaBreZYbJuiNH3w="; - }; - }); -} +{ final, prev, ... }: +prev.openttd-jgrpp.overrideAttrs (old: rec { + version = "0.55.3"; + src = prev.fetchFromGitHub rec { + owner = "JGRennison"; + repo = "OpenTTD-patches"; + rev = "jgrpp-${version}"; + hash = "sha256-E1+pXpXNHOu9nPTGSY8baVaKf1Um6IGDjpi1MmENez8="; + }; +}) diff --git a/overlays/yarn-berry/default.nix b/overlays/yarn-berry/default.nix index 942e35a..9c676e6 100644 --- a/overlays/yarn-berry/default.nix +++ b/overlays/yarn-berry/default.nix @@ -1,12 +1,10 @@ -{ ... }: -final: prev: { - yarn-berry = prev.yarn-berry.overrideAttrs (old: rec { - version = "3.6.3"; - src = prev.fetchFromGitHub { - owner = "yarnpkg"; - repo = "berry"; - rev = "@yarnpkg/cli/${version}"; - hash = "sha256-5QEnFalOEMs1bKYDYpFGnF1YwiGuW3ZxstyJAjz1/KQ="; - }; - }); -} +{ final, prev, ... }: +prev.yarn-berry.overrideAttrs (old: rec { + version = "3.6.3"; + src = prev.fetchFromGitHub { + owner = "yarnpkg"; + repo = "berry"; + rev = "@yarnpkg/cli/${version}"; + hash = "sha256-5QEnFalOEMs1bKYDYpFGnF1YwiGuW3ZxstyJAjz1/KQ="; + }; +}) diff --git a/systems/iriy/default.nix b/systems/iriy/default.nix index 196ddf1..1c5386b 100644 --- a/systems/iriy/default.nix +++ b/systems/iriy/default.nix @@ -1,32 +1,32 @@ -{ config, inputs, ... }: { - imports = [ - ./hardware-configuration.nix - #common-cpu-amd - #common-gpu-amd - ]; - - hostcfg = { - hostname = "iriy"; - username = "sora"; - make = { - gui = true; - cli = true; - virt = true; - power = false; - game = true; - }; - net = { - wlp = { - enable = true; - nif = "wlp11s0"; - }; - wg = { - enable = true; - ip4 = "10.10.1.7/32"; - ip6 = "fd10:10:10::7/128"; - pk = config.sops.secrets.iriy_wg_priv.path; - }; - }; - }; -} - +{ config, inputs, ... }: { + imports = [ + ./hardware-configuration.nix + #common-cpu-amd + #common-gpu-amd + ]; + + hostcfg = { + hostname = "iriy"; + username = "sora"; + make = { + gui = true; + cli = true; + virt = true; + power = false; + game = true; + }; + net = { + wlp = { + enable = true; + nif = "wlp11s0"; + }; + wg = { + enable = true; + ip4 = "10.10.1.7/32"; + ip6 = "fd10:10:10::7/128"; + pk = config.sops.secrets.iriy_wg_priv.path; + }; + }; + }; +} +