sora/nixconfig
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Releases Activity

Fix overlay

Browse Source
This commit is contained in:
soraefir 2023-11-17 22:32:10 +01:00
parent 4a95c8fc21
commit e709a1afcf
5 changed files with 132 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
modules/home/wayland/apps/kanshi/default.nix
View File

@ -1,74 +1,74 @@
{ ... }: { { ... }: {
services.kanshi = { services.kanshi = {
enable = true; enable = true;
systemdTarget = "graphical-session.target"; systemdTarget = "graphical-session.target";
profiles = { profiles = {
tower_0 = { tower_0 = {
outputs = [{ outputs = [{
criteria = "CEX CX133 0x00000001"; criteria = "CEX CX133 0x00000001";
mode = "1920x1200@59.972"; mode = "1920x1200@59.972";
position = "0,0"; position = "0,0";
scale = 1.0; scale = 1.0;
status = "enable"; status = "enable";
}]; }];
}; };
tower_1 = { tower_1 = {
outputs = [{ outputs = [{
criteria = "AOC 16G3 1DDP7HA000348"; criteria = "AOC 16G3 1DDP7HA000348";
mode = "1920x1080@144.000"; mode = "1920x1080@144.000";
position = "0,0"; position = "0,0";
status = "enable"; status = "enable";
scale = 1.0; scale = 1.0;
adaptiveSync = true; adaptiveSync = true;
}]; }];
}; };
laptop_0 = { laptop_0 = {
outputs = [{ outputs = [{
criteria = "LG Display 0x060A Unknown"; criteria = "LG Display 0x060A Unknown";
mode = "1920x1080@60.020"; mode = "1920x1080@60.020";
position = "0,0"; position = "0,0";
scale = 1.0; scale = 1.0;
status = "enable"; status = "enable";
}]; }];
}; };
laptop_1 = { laptop_1 = {
outputs = [ outputs = [
{ {
criteria = "CEX CX133 0x00000001"; criteria = "CEX CX133 0x00000001";
mode = "2560x1600@59.972"; mode = "2560x1600@59.972";
position = "0,0"; position = "0,0";
scale = 1.0; scale = 1.0;
status = "enable"; status = "enable";
} }
{ {
criteria = "LG Display 0x060A Unknown"; criteria = "LG Display 0x060A Unknown";
mode = "1920x1080@60.020"; mode = "1920x1080@60.020";
position = "2560,0"; position = "2560,0";
scale = 1.0; scale = 1.0;
status = "enable"; status = "enable";
} }
]; ];
}; };
laptop_2 = { laptop_2 = {
outputs = [ outputs = [
{ {
criteria = "AOC 16G3 1DDP7HA000348"; criteria = "AOC 16G3 1DDP7HA000348";
mode = "1920x1080@144.000"; mode = "1920x1080@144.000";
position = "0,0"; position = "0,0";
status = "enable"; status = "enable";
scale = 1.0; scale = 1.0;
adaptiveSync = true; adaptiveSync = true;
} }
{ {
criteria = "LG Display 0x060A Unknown"; criteria = "LG Display 0x060A Unknown";
mode = "1920x1080@60.020"; mode = "1920x1080@60.020";
position = "1920,0"; position = "1920,0";
scale = 1.0; scale = 1.0;
status = "enable"; status = "enable";
} }
]; ];
}; };
}; };
}; };
} }

8
overlays/default.nix
View File

@ -1,3 +1,7 @@
{ pkgs, ... }: { 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; };
})
]

22
overlays/openttd-jgrpp/default.nix
View File

@ -1,12 +1,10 @@
{ ... }: { final, prev, ... }:
final: prev: { prev.openttd-jgrpp.overrideAttrs (old: rec {
openttd-jgrpp = prev.openttd-jgrpp.overrideAttrs (old: rec { version = "0.55.3";
version = "0.55.3"; src = prev.fetchFromGitHub rec {
src = prev.fetchFromGitHub rec { owner = "JGRennison";
owner = "JGRennison"; repo = "OpenTTD-patches";
repo = "OpenTTD-patches"; rev = "jgrpp-${version}";
rev = "jgrpp-${version}"; hash = "sha256-E1+pXpXNHOu9nPTGSY8baVaKf1Um6IGDjpi1MmENez8=";
hash = "sha256-xpo4E07ifWUZy5z78Fwm1SpLP3wUBaBreZYbJuiNH3w="; };
}; })
});
}

22
overlays/yarn-berry/default.nix
View File

@ -1,12 +1,10 @@
{ ... }: { final, prev, ... }:
final: prev: { prev.yarn-berry.overrideAttrs (old: rec {
yarn-berry = prev.yarn-berry.overrideAttrs (old: rec { version = "3.6.3";
version = "3.6.3"; src = prev.fetchFromGitHub {
src = prev.fetchFromGitHub { owner = "yarnpkg";
owner = "yarnpkg"; repo = "berry";
repo = "berry"; rev = "@yarnpkg/cli/${version}";
rev = "@yarnpkg/cli/${version}"; hash = "sha256-5QEnFalOEMs1bKYDYpFGnF1YwiGuW3ZxstyJAjz1/KQ=";
hash = "sha256-5QEnFalOEMs1bKYDYpFGnF1YwiGuW3ZxstyJAjz1/KQ="; };
}; })
});
}

64
systems/iriy/default.nix
View File

@ -1,32 +1,32 @@
{ config, inputs, ... }: { { config, inputs, ... }: {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
#common-cpu-amd #common-cpu-amd
#common-gpu-amd #common-gpu-amd
]; ];
hostcfg = { hostcfg = {
hostname = "iriy"; hostname = "iriy";
username = "sora"; username = "sora";
make = { make = {
gui = true; gui = true;
cli = true; cli = true;
virt = true; virt = true;
power = false; power = false;
game = true; game = true;
}; };
net = { net = {
wlp = { wlp = {
enable = true; enable = true;
nif = "wlp11s0"; nif = "wlp11s0";
}; };
wg = { wg = {
enable = true; enable = true;
ip4 = "10.10.1.7/32"; ip4 = "10.10.1.7/32";
ip6 = "fd10:10:10::7/128"; ip6 = "fd10:10:10::7/128";
pk = config.sops.secrets.iriy_wg_priv.path; pk = config.sops.secrets.iriy_wg_priv.path;
}; };
}; };
}; };
} }