lol
This commit is contained in:
parent
16dc290cfa
commit
62af5ec3c5
@ -77,7 +77,7 @@
|
|||||||
direnv.enable = true;
|
direnv.enable = true;
|
||||||
office.enable = true;
|
office.enable = true;
|
||||||
plasma = {
|
plasma = {
|
||||||
enable = false;
|
enable = true;
|
||||||
sddm = {
|
sddm = {
|
||||||
backgroundImage = pkgs.fetchurl {
|
backgroundImage = pkgs.fetchurl {
|
||||||
url = "https://cdn.donmai.us/original/d3/1b/__manjuu_prinz_eugen_roon_bismarck_friedrich_der_grosse_and_3_more_azur_lane_drawn_by_zaphn__d31bf4ac564d60f8787818842c369e7f.jpg";
|
url = "https://cdn.donmai.us/original/d3/1b/__manjuu_prinz_eugen_roon_bismarck_friedrich_der_grosse_and_3_more_azur_lane_drawn_by_zaphn__d31bf4ac564d60f8787818842c369e7f.jpg";
|
||||||
@ -90,14 +90,14 @@
|
|||||||
};
|
};
|
||||||
services = {
|
services = {
|
||||||
gamemode.enable = true;
|
gamemode.enable = true;
|
||||||
gnome.enable = true;
|
gnome.enable = false;
|
||||||
logiops.enable = true;
|
logiops.enable = true;
|
||||||
input-remapper = {
|
input-remapper = {
|
||||||
enable = true;
|
enable = true;
|
||||||
postStartCommand = "${pkgs.input-remapper}/bin/input-remapper-control --command start --preset NOOP --device \"Razer Razer Tartarus V2\"";
|
postStartCommand = "${pkgs.input-remapper}/bin/input-remapper-control --command start --preset NOOP --device \"Razer Razer Tartarus V2\"";
|
||||||
};
|
};
|
||||||
gdm = {
|
gdm = {
|
||||||
enable = true;
|
enable = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
system = {
|
system = {
|
||||||
@ -188,6 +188,10 @@
|
|||||||
libinput.enable = true;
|
libinput.enable = true;
|
||||||
};
|
};
|
||||||
earlyoom.enable = lib.mkForce false;
|
earlyoom.enable = lib.mkForce false;
|
||||||
|
|
||||||
|
udev.extraRules = ''
|
||||||
|
ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c52b", ATTR{power/wakeup}="disabled", ATTR{driver/1-7/power/wakeup}="disabled"
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
hardware = {
|
hardware = {
|
||||||
|
BIN
lib/ports.nix
BIN
lib/ports.nix
Binary file not shown.
@ -3,7 +3,6 @@
|
|||||||
# Hardware modules
|
# Hardware modules
|
||||||
./hardware/mobile.nix
|
./hardware/mobile.nix
|
||||||
./hardware/surface-pro6.nix
|
./hardware/surface-pro6.nix
|
||||||
./hardware/wifi.nix
|
|
||||||
|
|
||||||
# Programs
|
# Programs
|
||||||
./programs/alacritty
|
./programs/alacritty
|
||||||
|
@ -161,8 +161,12 @@ in {
|
|||||||
bismuth
|
bismuth
|
||||||
gwenview
|
gwenview
|
||||||
yakuake
|
yakuake
|
||||||
|
|
||||||
|
kdeplasma-addons
|
||||||
|
plasma-nm
|
||||||
] ++ lib.optionals cfg.mobile.enable plasmaMobilePackages;
|
] ++ lib.optionals cfg.mobile.enable plasmaMobilePackages;
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
|
kde-rounded-corners
|
||||||
index-fm
|
index-fm
|
||||||
rsibreak
|
rsibreak
|
||||||
kalendar
|
kalendar
|
||||||
|
Binary file not shown.
@ -24,7 +24,7 @@
|
|||||||
programs.ssh = {
|
programs.ssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
matchBlocks = let
|
matchBlocks = let
|
||||||
sshPort = (import ../../lib/ports.nix).sshPort;
|
sshPort = 3434;
|
||||||
in {
|
in {
|
||||||
ayame = {
|
ayame = {
|
||||||
port = sshPort;
|
port = sshPort;
|
||||||
|
@ -85,6 +85,7 @@ in {
|
|||||||
additionalBlacklist = [ "/mnt" ];
|
additionalBlacklist = [ "/mnt" ];
|
||||||
additionalMounts = [
|
additionalMounts = [
|
||||||
"/mnt/Storage/Games/LeagueOfLegends"
|
"/mnt/Storage/Games/LeagueOfLegends"
|
||||||
|
"/mnt/Storage/Games/Origin"
|
||||||
"/mnt/tmp"
|
"/mnt/tmp"
|
||||||
];
|
];
|
||||||
mountInHome = [ ".local/share/lutris" ".config/lutris" "Games" ];
|
mountInHome = [ ".local/share/lutris" ".config/lutris" "Games" ];
|
||||||
|
@ -68,64 +68,4 @@ final: prev:
|
|||||||
};
|
};
|
||||||
|
|
||||||
discord-app = prev.discord-app.override { chromium = prev.ungoogled-chromium; };
|
discord-app = prev.discord-app.override { chromium = prev.ungoogled-chromium; };
|
||||||
|
|
||||||
lapce = prev.lapce.overrideAttrs (old: rec {
|
|
||||||
version = "0.1.2";
|
|
||||||
src = prev.fetchFromGitHub {
|
|
||||||
owner = "lapce";
|
|
||||||
repo = "lapce";
|
|
||||||
rev = "v${version}";
|
|
||||||
sha256 = "1pn3ikh72z5y1ywx3bilghrzrwqc1inds2yxnz37l8s1azf3nzlc";
|
|
||||||
};
|
|
||||||
|
|
||||||
cargoDeps = old.cargoDeps.overrideAttrs (_: {
|
|
||||||
inherit src;
|
|
||||||
outputHash = "sha256-spmRgwTh0Sg+OvT/s85xEvOfs2DdCihnX6Ya+sDyePM=";
|
|
||||||
});
|
|
||||||
nativeBuildInputs = with prev; old.nativeBuildInputs ++ [
|
|
||||||
wrapGAppsHook
|
|
||||||
];
|
|
||||||
buildInputs = with prev; old.buildInputs ++ [
|
|
||||||
libglvnd
|
|
||||||
glib cairo pango atk gdk-pixbuf gtk3
|
|
||||||
];
|
|
||||||
|
|
||||||
preFixup = ''
|
|
||||||
patchelf \
|
|
||||||
--add-needed ${prev.vulkan-loader}/lib/libvulkan.so.1 \
|
|
||||||
--add-needed ${prev.libglvnd}/lib/libGL.so.1 \
|
|
||||||
$out/bin/lapce
|
|
||||||
'';
|
|
||||||
});
|
|
||||||
|
|
||||||
# See https://github.com/NixOS/nixpkgs/issues/171320
|
|
||||||
# Fixes XWayland crashing after a resume.
|
|
||||||
xwayland = prev.xwayland.overrideAttrs (old: rec {
|
|
||||||
version = "21.1.4";
|
|
||||||
src = prev.fetchurl {
|
|
||||||
url = "mirror://xorg/individual/xserver/xwayland-${version}.tar.xz";
|
|
||||||
sha256 = "sha256-GfZ5XzHPqOs1Kx5bPDefIu5gIOmHAf8sxnnajE8RWfc=";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
# See
|
|
||||||
# https://github.com/NixOS/nixpkgs/commit/2bf8d8c0162507d08f9fc48e36ce7225f4879bd4
|
|
||||||
libsForQt5 = prev.libsForQt5.overrideScope' (finalp: prevp: {
|
|
||||||
plasma5 = prevp.plasma5.overrideScope' (finalq: prevq: {
|
|
||||||
plasma-mobile = prevq.plasma-mobile.overrideAttrs (old: {
|
|
||||||
buildInputs = with prevp; old.buildInputs ++ [
|
|
||||||
plasma-workspace
|
|
||||||
];
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
plasma5Packages = prev.plasma5Packages.overrideScope' (finalp: prevp: {
|
|
||||||
plasma5 = prevp.plasma5.overrideScope' (finalq: prevq: {
|
|
||||||
plasma-mobile = prevq.plasma-mobile.overrideAttrs (old: {
|
|
||||||
buildInputs = with prevp; old.buildInputs ++ [
|
|
||||||
plasma-workspace
|
|
||||||
];
|
|
||||||
});
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user