diff --git a/hosts/miku.nix b/hosts/miku.nix index 9ef206e..173c1fe 100644 --- a/hosts/miku.nix +++ b/hosts/miku.nix @@ -77,7 +77,7 @@ direnv.enable = true; office.enable = true; plasma = { - enable = false; + enable = true; sddm = { 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"; @@ -90,14 +90,14 @@ }; services = { gamemode.enable = true; - gnome.enable = true; + gnome.enable = false; logiops.enable = true; input-remapper = { enable = true; postStartCommand = "${pkgs.input-remapper}/bin/input-remapper-control --command start --preset NOOP --device \"Razer Razer Tartarus V2\""; }; gdm = { - enable = true; + enable = false; }; }; system = { @@ -188,6 +188,10 @@ libinput.enable = true; }; 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 = { diff --git a/lib/ports.nix b/lib/ports.nix deleted file mode 100644 index 711f716..0000000 Binary files a/lib/ports.nix and /dev/null differ diff --git a/modules/default.nix b/modules/default.nix index 18a4d7f..f9ced26 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -3,7 +3,6 @@ # Hardware modules ./hardware/mobile.nix ./hardware/surface-pro6.nix - ./hardware/wifi.nix # Programs ./programs/alacritty diff --git a/modules/desktop/plasma.nix b/modules/desktop/plasma.nix index 130059f..81e7a66 100644 --- a/modules/desktop/plasma.nix +++ b/modules/desktop/plasma.nix @@ -160,9 +160,13 @@ in { breeze-gtk bismuth gwenview - yakuake + yakuake + + kdeplasma-addons + plasma-nm ] ++ lib.optionals cfg.mobile.enable plasmaMobilePackages; packages = with pkgs; [ + kde-rounded-corners index-fm rsibreak kalendar diff --git a/modules/hardware/wifi.nix b/modules/hardware/wifi.nix deleted file mode 100644 index 1073e76..0000000 Binary files a/modules/hardware/wifi.nix and /dev/null differ diff --git a/modules/users/alexander.nix b/modules/users/alexander.nix index 7086812..c0e0a40 100644 --- a/modules/users/alexander.nix +++ b/modules/users/alexander.nix @@ -24,7 +24,7 @@ programs.ssh = { enable = true; matchBlocks = let - sshPort = (import ../../lib/ports.nix).sshPort; + sshPort = 3434; in { ayame = { port = sshPort; diff --git a/overlays/sandbox.nix b/overlays/sandbox.nix index 0bb6490..6ade555 100644 --- a/overlays/sandbox.nix +++ b/overlays/sandbox.nix @@ -85,6 +85,7 @@ in { additionalBlacklist = [ "/mnt" ]; additionalMounts = [ "/mnt/Storage/Games/LeagueOfLegends" + "/mnt/Storage/Games/Origin" "/mnt/tmp" ]; mountInHome = [ ".local/share/lutris" ".config/lutris" "Games" ]; diff --git a/overlays/simple.nix b/overlays/simple.nix index 3e20bac..37c210d 100644 --- a/overlays/simple.nix +++ b/overlays/simple.nix @@ -68,64 +68,4 @@ final: prev: }; 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 - ]; - }); - }); - }); }