diff --git a/hosts/mashu.nix b/hosts/mashu.nix index c2b205c..fcbdaa1 100644 --- a/hosts/mashu.nix +++ b/hosts/mashu.nix @@ -17,6 +17,8 @@ } ]; + programs.phosh.enable = true; + ptw = { programs = { mpv.enable = true; @@ -27,11 +29,10 @@ firefox.enable = true; xournalpp.enable = true; alacritty.enable = true; - plasma.enable = true; # TODO: Nextcloud client }; services = { - #gnome.enable = true; + gnome.enable = true; }; system = { i18n.enable = true; @@ -47,7 +48,7 @@ surface.enable = true; }; }; - + boot = { kernelParams = [ "mem_sleep_default=deep" "kernel.nmi_watchdog=0" "vm.dirty_writeback_centisecs=1500" ]; extraModprobeConfig = '' diff --git a/modules/hardware/surface-pro6.nix b/modules/hardware/surface-pro6.nix index 7a4ec38..027feed 100644 --- a/modules/hardware/surface-pro6.nix +++ b/modules/hardware/surface-pro6.nix @@ -70,7 +70,7 @@ in { (mkPatch "0007-surface-gpe" "0a77haazdsmv4kr76cfng829cgd4zrzvbn3pf1rl67vbl6il9wli") (mkPatch "0008-surface-button" "1ja9n1iia3p6cjifds95cv684w8cr2kibj19k7fm8bm58achia6f") (mkPatch "0009-surface-typecover" "0dmcsilqcqzr3rdc8lpq857pjgkj9agmns8g1nrax9h0rfh9gl3m") - (mkPatch "0010-cameras" "1clvd09qbl3cjmxmpjvnfq4f9csqarzk13ahz3s69hq401a2a83m") + #(mkPatch "0010-cameras" "1clvd09qbl3cjmxmpjvnfq4f9csqarzk13ahz3s69hq401a2a83m") (mkPatch "0011-amd-gpio" "0552k7d9hajafryvjvlxbaxbxkqmhjmk4i3hxbpdb3czz7i9cyzj") # TODO: Maybe drop (mkPatch "0012-misc-fixes" "16fslvys2zjp8fpysig51cchikskzpvjww9w4nk3wsz6yh1xdm0f") diff --git a/modules/programs/plasma/default.nix b/modules/programs/plasma/default.nix index 3ae9ea1..2267cb0 100644 --- a/modules/programs/plasma/default.nix +++ b/modules/programs/plasma/default.nix @@ -25,8 +25,9 @@ in { yakuake libsForQt5.okular libsForQt5.kdeconnect-kde + libsForQt5.breeze-gtk index-fm - kasts-git + #kasts-git rsibreak ]; }; diff --git a/overlays/simple.nix b/overlays/simple.nix index 182a63d..9443ffd 100644 --- a/overlays/simple.nix +++ b/overlays/simple.nix @@ -59,4 +59,22 @@ in { myxer = prev.myxer.overrideAttrs (old: { cargoPatches = [ ../patches/myxer/0000-1.2.1-set-gio-version.patch ]; }); + + phosh = prev.phosh.overrideAttrs (old: { + src = prev.fetchFromGitLab { + domain = "gitlab.gnome.org"; + group = "World"; + owner = "Phosh"; + repo = "phosh"; + rev = "v0.14.1"; + fetchSubmodules = true; + sha256 = "sha256-FILSNVBYpWSPXeDb1Vc4jZ7zJMg0Gj6EY5yoc81gUr0="; + }; + patches = [ + (builtins.fetchurl { + url = "https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/923.patch"; + sha256 = "0fad4x8hzpaf7aq6acfz90njjjrvyc9ipndxmh4kqnm03n7300x0"; + }) + ]; + }); }