mashu: Use xournalpp-master
This commit is contained in:
parent
50c7d023c5
commit
a93eb98304
@ -15,7 +15,7 @@ in mkHost config {
|
|||||||
wireless = true;
|
wireless = true;
|
||||||
wifiInterface = "wlp1s0";
|
wifiInterface = "wlp1s0";
|
||||||
programImports = [
|
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"
|
"distributed-build/offload.nix"
|
||||||
];
|
];
|
||||||
fileSystems = {
|
fileSystems = {
|
||||||
@ -49,50 +49,9 @@ in mkHost config {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
services.gnome.gnome-settings-daemon.enable = true;
|
powerManagement = {
|
||||||
# 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 = {
|
|
||||||
enable = true;
|
enable = true;
|
||||||
phocConfig = {
|
cpuFreqGovernor = "powersave";
|
||||||
outputs = {
|
|
||||||
"eDP-1" = {
|
|
||||||
scale = 2;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
environment.systemPackages = with pkgs; [ xournalpp ];
|
environment.systemPackages = with pkgs; [ xournalpp-git ];
|
||||||
|
|
||||||
home-manager.users."${config.system.singleUser}".home.file = {
|
#home-manager.users."${config.system.singleUser}".home.file = {
|
||||||
".xournalpp/settings.xml".source = ./settings.xml;
|
# ".xournalpp/settings.xml".source = ./settings.xml;
|
||||||
".xournalpp/toolbar.ini".source = ./toolbar.ini;
|
# ".xournalpp/toolbar.ini".source = ./toolbar.ini;
|
||||||
};
|
#};
|
||||||
}
|
}
|
||||||
|
@ -109,7 +109,7 @@ in {
|
|||||||
chdirTo = "/home/$USER";
|
chdirTo = "/home/$USER";
|
||||||
};
|
};
|
||||||
|
|
||||||
xournalpp-git = pkgs.xournalpp.overrideAttrs (old: {
|
xournalpp-git = pkgs.unstable.xournalpp.overrideAttrs (old: {
|
||||||
version = "1.1.1";
|
version = "1.1.1";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
owner = "xournalpp";
|
owner = "xournalpp";
|
||||||
|
Loading…
Reference in New Issue
Block a user