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 = {
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";
}
];
};
};
};
}

8
overlays/default.nix
View File

@ -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; };
})
]

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

@ -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=";
};
})

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

@ -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=";
};
})

64
systems/iriy/default.nix
View File

@ -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;
};
};
};
}