From a93eb98304d336a752e7e4ff610fc4c7776c95bf Mon Sep 17 00:00:00 2001 From: "Alexander \"PapaTutuWawa" Date: Mon, 1 Nov 2021 13:49:21 +0100 Subject: [PATCH] mashu: Use xournalpp-master --- hosts/mashu.nix | 47 ++------------------------ modules/programs/xournalpp/default.nix | 10 +++--- packages/default.nix | 2 +- 3 files changed, 9 insertions(+), 50 deletions(-) diff --git a/hosts/mashu.nix b/hosts/mashu.nix index b897b37..6a38e65 100644 --- a/hosts/mashu.nix +++ b/hosts/mashu.nix @@ -15,7 +15,7 @@ in mkHost config { wireless = true; wifiInterface = "wlp1s0"; programImports = [ - "zsh" "git" "mpv" "tmux" "firefox" "gnome-terminal" "gnome" "i18n" "nextcloud" # "xournalpp" + "zsh" "git" "mpv" "tmux" "firefox" "gnome-terminal" "gnome" "i18n" "nextcloud" "xournalpp" "distributed-build/offload.nix" ]; fileSystems = { @@ -49,50 +49,9 @@ in mkHost config { }; }; - services.gnome.gnome-settings-daemon.enable = true; - # TODO: phosh 0.10.2 does not grab this. Just set it. - services.logind.extraConfig = '' - HandlePowerKey=suspend - ''; - services.xserver.libinput.touchpad = { - tapping = true; - disableWhileTyping = true; - }; - - # TODO: phosh only allows numerical PINs... - users.users.alexander.hashedPassword = lib.mkForce "$5$AkihyU/rnc$MrGVtF2d.2CbURQo2oIWdBdDz1ZLAnKum7BOxhUjh88"; - - # TODO: It seems like 0.10.2 does not do this by default. So, as a workaround, start some of these - # myself. - systemd.user.services = { - gsd-media = { - description = "GSD media keys handling"; - wantedBy = [ "default.target" ]; - serviceConfig = { - Type = "simple"; - ExecStart = "${pkgs.gnome.gnome-settings-daemon}/libexec/gsd-media-keys"; - Restart = "always"; - }; - }; - gsd-power = { - description = "GSD media keys handling"; - wantedBy = [ "default.target" ]; - serviceConfig = { - Type = "simple"; - ExecStart = "${pkgs.gnome.gnome-settings-daemon}/libexec/gsd-power"; - Restart = "always"; - }; - }; - }; - programs.phosh = { + powerManagement = { enable = true; - phocConfig = { - outputs = { - "eDP-1" = { - scale = 2; - }; - }; - }; + cpuFreqGovernor = "powersave"; }; }; } diff --git a/modules/programs/xournalpp/default.nix b/modules/programs/xournalpp/default.nix index 44dd098..61f5913 100644 --- a/modules/programs/xournalpp/default.nix +++ b/modules/programs/xournalpp/default.nix @@ -1,10 +1,10 @@ { config, pkgs, ... }: { - environment.systemPackages = with pkgs; [ xournalpp ]; + environment.systemPackages = with pkgs; [ xournalpp-git ]; - home-manager.users."${config.system.singleUser}".home.file = { - ".xournalpp/settings.xml".source = ./settings.xml; - ".xournalpp/toolbar.ini".source = ./toolbar.ini; - }; + #home-manager.users."${config.system.singleUser}".home.file = { + # ".xournalpp/settings.xml".source = ./settings.xml; + # ".xournalpp/toolbar.ini".source = ./toolbar.ini; + #}; } diff --git a/packages/default.nix b/packages/default.nix index 99f970b..1383523 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -109,7 +109,7 @@ in { chdirTo = "/home/$USER"; }; - xournalpp-git = pkgs.xournalpp.overrideAttrs (old: { + xournalpp-git = pkgs.unstable.xournalpp.overrideAttrs (old: { version = "1.1.1"; src = pkgs.fetchFromGitHub { owner = "xournalpp";