rgb again maybe this time without weird shit
This commit is contained in:
parent
e7253ef4a4
commit
e10fd7d47b
13 changed files with 168 additions and 36 deletions
129
flake.lock
generated
129
flake.lock
generated
|
@ -20,6 +20,21 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"crane": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1737689766,
|
||||||
|
"narHash": "sha256-ivVXYaYlShxYoKfSo5+y5930qMKKJ8CLcAoIBPQfJ6s=",
|
||||||
|
"owner": "ipetkov",
|
||||||
|
"repo": "crane",
|
||||||
|
"rev": "6fe74265bbb6d016d663b1091f015e2976c4a527",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "ipetkov",
|
||||||
|
"repo": "crane",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"doll-repair": {
|
"doll-repair": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-parts": "flake-parts",
|
"flake-parts": "flake-parts",
|
||||||
|
@ -63,7 +78,7 @@
|
||||||
},
|
},
|
||||||
"fedi-emotes_2": {
|
"fedi-emotes_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1714013418,
|
"lastModified": 1714013418,
|
||||||
|
@ -209,6 +224,24 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_2"
|
"systems": "systems_2"
|
||||||
},
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1731533236,
|
||||||
|
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"flake-utils_3": {
|
||||||
|
"inputs": {
|
||||||
|
"systems": "systems_3"
|
||||||
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726560853,
|
"lastModified": 1726560853,
|
||||||
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
||||||
|
@ -223,9 +256,9 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils_3": {
|
"flake-utils_4": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_3"
|
"systems": "systems_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731533236,
|
"lastModified": 1731533236,
|
||||||
|
@ -349,6 +382,27 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"lenovo-rgb": {
|
||||||
|
"inputs": {
|
||||||
|
"crane": "crane",
|
||||||
|
"flake-utils": "flake-utils_2",
|
||||||
|
"nixpkgs": "nixpkgs_2",
|
||||||
|
"rust-overlay": "rust-overlay_2"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1740256865,
|
||||||
|
"narHash": "sha256-KhcnH5vgn9QMXeiYmpk1jtqr3hEAOuLoRuLmhVvr5FA=",
|
||||||
|
"owner": "4jx",
|
||||||
|
"repo": "l5p-keyboard-rgb",
|
||||||
|
"rev": "2fd9dba693f9bed89fb07c672dd6c522e6cf4301",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "4jx",
|
||||||
|
"repo": "l5p-keyboard-rgb",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"lightrunner-emotes": {
|
"lightrunner-emotes": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"fedi-emotes": "fedi-emotes_2",
|
"fedi-emotes": "fedi-emotes_2",
|
||||||
|
@ -406,7 +460,7 @@
|
||||||
},
|
},
|
||||||
"lix-module": {
|
"lix-module": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_2",
|
"flake-utils": "flake-utils_3",
|
||||||
"flakey-profile": "flakey-profile",
|
"flakey-profile": "flakey-profile",
|
||||||
"lix": "lix",
|
"lix": "lix",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
@ -443,7 +497,7 @@
|
||||||
"nixos-generators": {
|
"nixos-generators": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixlib": "nixlib",
|
"nixlib": "nixlib",
|
||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1740947705,
|
"lastModified": 1740947705,
|
||||||
|
@ -600,6 +654,22 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1737717945,
|
||||||
|
"narHash": "sha256-ET91TMkab3PmOZnqiJQYOtSGvSTvGeHoegAv4zcTefM=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "ecd26a469ac56357fd333946a99086e992452b6a",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixpkgs-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1713596654,
|
"lastModified": 1713596654,
|
||||||
"narHash": "sha256-LJbHQQ5aX1LVth2ST+Kkse/DRzgxlVhTL1rxthvyhZc=",
|
"narHash": "sha256-LJbHQQ5aX1LVth2ST+Kkse/DRzgxlVhTL1rxthvyhZc=",
|
||||||
|
@ -615,7 +685,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736657626,
|
"lastModified": 1736657626,
|
||||||
"narHash": "sha256-FWlPMUzp0lkQBdhKlPqtQdqmp+/C+1MBiEytaYfrCTY=",
|
"narHash": "sha256-FWlPMUzp0lkQBdhKlPqtQdqmp+/C+1MBiEytaYfrCTY=",
|
||||||
|
@ -631,7 +701,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1741513245,
|
"lastModified": 1741513245,
|
||||||
"narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
|
"narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
|
||||||
|
@ -647,7 +717,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_6": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731763621,
|
"lastModified": 1731763621,
|
||||||
"narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=",
|
"narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=",
|
||||||
|
@ -708,7 +778,7 @@
|
||||||
},
|
},
|
||||||
"nuschtosSearch": {
|
"nuschtosSearch": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils_3",
|
"flake-utils": "flake-utils_4",
|
||||||
"ixx": "ixx",
|
"ixx": "ixx",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixvim",
|
"nixvim",
|
||||||
|
@ -785,12 +855,13 @@
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"iceshrimp": "iceshrimp",
|
"iceshrimp": "iceshrimp",
|
||||||
"iceshrimp-withdrawal": "iceshrimp-withdrawal",
|
"iceshrimp-withdrawal": "iceshrimp-withdrawal",
|
||||||
|
"lenovo-rgb": "lenovo-rgb",
|
||||||
"lightrunner-emotes": "lightrunner-emotes",
|
"lightrunner-emotes": "lightrunner-emotes",
|
||||||
"linger": "linger",
|
"linger": "linger",
|
||||||
"lix-module": "lix-module",
|
"lix-module": "lix-module",
|
||||||
"nixos-generators": "nixos-generators",
|
"nixos-generators": "nixos-generators",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs": "nixpkgs_4",
|
"nixpkgs": "nixpkgs_5",
|
||||||
"nixpkgs-master": "nixpkgs-master",
|
"nixpkgs-master": "nixpkgs-master",
|
||||||
"nixpkgs-stable": "nixpkgs-stable",
|
"nixpkgs-stable": "nixpkgs-stable",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
|
@ -819,6 +890,27 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"rust-overlay_2": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"lenovo-rgb",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1737771740,
|
||||||
|
"narHash": "sha256-lWIdF4qke63TdCHnJ0QaUHfG8YvsDrBqzL4jiHYQd+Y=",
|
||||||
|
"owner": "oxalica",
|
||||||
|
"repo": "rust-overlay",
|
||||||
|
"rev": "cfaaa1dddd280af09aca84af84612fbccd986ae2",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "oxalica",
|
||||||
|
"repo": "rust-overlay",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"saerro": {
|
"saerro": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-parts": "flake-parts_5",
|
"flake-parts": "flake-parts_5",
|
||||||
|
@ -842,7 +934,7 @@
|
||||||
},
|
},
|
||||||
"sops-nix": {
|
"sops-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_5"
|
"nixpkgs": "nixpkgs_6"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1741644481,
|
"lastModified": 1741644481,
|
||||||
|
@ -903,6 +995,21 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"systems_4": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"tachikoma": {
|
"tachikoma": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
nixos-generators.url = "github:nix-community/nixos-generators";
|
nixos-generators.url = "github:nix-community/nixos-generators";
|
||||||
nixos-hardware.url = "github:nixos/nixos-hardware/master";
|
nixos-hardware.url = "github:nixos/nixos-hardware/master";
|
||||||
flake-utils.url = "github:numtide/flake-utils";
|
flake-utils.url = "github:numtide/flake-utils";
|
||||||
# lenovo-rgb.url = "github:4jx/l5p-keyboard-rgb";
|
lenovo-rgb.url = "github:4jx/l5p-keyboard-rgb";
|
||||||
|
|
||||||
# Iceshrimpy
|
# Iceshrimpy
|
||||||
iceshrimp = {
|
iceshrimp = {
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
{ pkgs, ... }: {
|
|
||||||
home.packages = with pkgs; [
|
|
||||||
wine
|
|
||||||
winetricks
|
|
||||||
wineWowPackages.waylandFull
|
|
||||||
];
|
|
||||||
}
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, config, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
../common
|
../common
|
||||||
../common/home-user.nix
|
../common/home-user.nix
|
||||||
|
@ -6,7 +6,6 @@
|
||||||
../../features/kitty.nix
|
../../features/kitty.nix
|
||||||
../../features/vesktop
|
../../features/vesktop
|
||||||
../../features/retroarch.nix
|
../../features/retroarch.nix
|
||||||
../../features/wine.nix
|
|
||||||
];
|
];
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
|
|
|
@ -20,7 +20,7 @@ in {
|
||||||
ExecStart = "${no-rgb}/bin/no-rgb";
|
ExecStart = "${no-rgb}/bin/no-rgb";
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
};
|
};
|
||||||
wantedBy = [ "multi-user.target" ];
|
after = [ "multi-user.target" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
17
nixos/features/wine.nix
Normal file
17
nixos/features/wine.nix
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
{ pkgs, config, lib, ... }: let
|
||||||
|
winePkg = config.internal.wine;
|
||||||
|
in {
|
||||||
|
options = {
|
||||||
|
internal.wine = lib.mkOption {
|
||||||
|
type = lib.types.package;
|
||||||
|
default = pkgs.wineWowPackages.waylandFull;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = {
|
||||||
|
environment.systemPackages = [
|
||||||
|
pkgs.winetricks
|
||||||
|
winePkg
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
|
@ -15,6 +15,8 @@
|
||||||
../../features/telemetry
|
../../features/telemetry
|
||||||
../../features/wifi.nix
|
../../features/wifi.nix
|
||||||
../../features/protonvpn.nix
|
../../features/protonvpn.nix
|
||||||
|
../../features/wine.nix
|
||||||
|
./rgb.nix
|
||||||
|
|
||||||
inputs.nixos-hardware.nixosModules.common-cpu-amd
|
inputs.nixos-hardware.nixosModules.common-cpu-amd
|
||||||
inputs.nixos-hardware.nixosModules.common-gpu-amd
|
inputs.nixos-hardware.nixosModules.common-gpu-amd
|
||||||
|
@ -44,10 +46,6 @@
|
||||||
nvidiaBusId = "PCI:1:0:0";
|
nvidiaBusId = "PCI:1:0:0";
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
openrgb
|
|
||||||
];
|
|
||||||
|
|
||||||
# √(2560² + 1600²) px / 16 in ≃ 189 dpi
|
# √(2560² + 1600²) px / 16 in ≃ 189 dpi
|
||||||
services.xserver.dpi = 189;
|
services.xserver.dpi = 189;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,12 @@
|
||||||
{ inputs, pkgs, ... }: let
|
{ inputs, pkgs, ... }: let
|
||||||
config = pkgs.writeFile "config.rgb" ''{"name":"awawa2","rgb_zones":[{"rgb":[255,0,0],"enabled":true},{"rgb":[39,5,5],"enabled":true},{"rgb":[26,9,0],"enabled":true},{"rgb":[192,95,0],"enabled":true}],"effect":"Static","direction":"Left","speed":1,"brightness":"Low"}'';
|
pkg = inputs.lenovo-rgb.packages.${pkgs.system}.default;
|
||||||
in {
|
in {
|
||||||
systemd.services.rgb = {
|
systemd.services.rgb = {
|
||||||
description = "rgb";
|
description = "rgb";
|
||||||
serviceConfig = {};
|
serviceConfig = {
|
||||||
|
ExecStart = "${pkg}/bin/legion-kb-rgb set --effect Static --colors 255,0,0,39,5,5,26,9,0,192,95,0";
|
||||||
|
Type = "oneshot";
|
||||||
|
};
|
||||||
|
after = [ "multi-user.target" ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
exec = pname;
|
exec = pname;
|
||||||
icon = pname;
|
icon = pname;
|
||||||
desktopName = pname;
|
desktopName = pname;
|
||||||
|
type = "Applications";
|
||||||
comment = "Open Source RTS game";
|
comment = "Open Source RTS game";
|
||||||
categories = [
|
categories = [
|
||||||
"Game"
|
"Game"
|
||||||
|
|
BIN
pkgs/mspaint/bin/mfc42u.dll
Normal file
BIN
pkgs/mspaint/bin/mfc42u.dll
Normal file
Binary file not shown.
|
@ -1,10 +1,22 @@
|
||||||
{ pkgs, ... }: let
|
{ pkgs, wine ? pkgs.wine, ... }: let
|
||||||
wrapped = pkgs.writeShellScriptBin "mspaint" ''
|
wrapped = pkgs.writeShellScriptBin "mspaint" ''
|
||||||
${pkgs.wine}/bin/wine ${./mspaint.exe}
|
${wine}/bin/wine ${./bin}/mspaint.exe
|
||||||
'';
|
'';
|
||||||
in pkgs.makeDesktopItem {
|
desktopItem = pkgs.makeDesktopItem {
|
||||||
name = "mspaint";
|
name = "mspaint";
|
||||||
desktopName = "mspaint";
|
desktopName = "mspaint";
|
||||||
type = "Application";
|
type = "Application";
|
||||||
exec = "${wrapped}/bin/mspaint";
|
categories = [ "Graphics" ];
|
||||||
}
|
exec = "${wrapped}/bin/mspaint";
|
||||||
|
};
|
||||||
|
in pkgs.stdenvNoCC.mkDerivation {
|
||||||
|
pname = "mspaint";
|
||||||
|
version = "0.0.0";
|
||||||
|
src = wrapped;
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
pkgs.copyDesktopItems
|
||||||
|
];
|
||||||
|
|
||||||
|
desktopItems = [ desktopItem ];
|
||||||
|
}
|
||||||
|
|
1
settings.json
Normal file
1
settings.json
Normal file
|
@ -0,0 +1 @@
|
||||||
|
{"profiles":[],"effects":[],"current_profile":{"name":"awawa2","rgb_zones":[{"rgb":[255,0,0],"enabled":true},{"rgb":[39,5,5],"enabled":true},{"rgb":[26,9,0],"enabled":true},{"rgb":[192,95,0],"enabled":true}],"effect":"Static","direction":"Left","speed":1,"brightness":"Low"}}
|
Loading…
Add table
Reference in a new issue