makefu/stockholm
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'gum/20.03'

Browse source
This commit is contained in:
lassulus 2020-04-23 15:34:00 +02:00
parent 702e55e38c 525f575f42
commit 0fbf9144d4
4 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
makefu/1systems/gum/config.nix
View file

@ -108,7 +108,6 @@ in {
## network ## network
<stockholm/makefu/2configs/vpn/openvpn-server.nix> <stockholm/makefu/2configs/vpn/openvpn-server.nix>
# <stockholm/makefu/2configs/vpn/vpnws/server.nix> # <stockholm/makefu/2configs/vpn/vpnws/server.nix>
<stockholm/makefu/2configs/dnscrypt/server.nix>
<stockholm/makefu/2configs/binary-cache/server.nix> <stockholm/makefu/2configs/binary-cache/server.nix>
<stockholm/makefu/2configs/backup/server.nix> <stockholm/makefu/2configs/backup/server.nix>
<stockholm/makefu/2configs/iodined.nix> <stockholm/makefu/2configs/iodined.nix>

2
makefu/2configs/deployment/owncloud.nix
View file

@ -15,7 +15,7 @@ with lib;
let let
# TODO: copy-paste from lass/2/websites/util.nix # TODO: copy-paste from lass/2/websites/util.nix
nextcloud = nextcloud18; nextcloud = pkgs.nextcloud18;
serveCloud = domains: serveCloud = domains:
let let
domain = head domains; domain = head domains;

11
makefu/2configs/gui/base.nix
View file

@ -29,21 +29,16 @@ in
awesome.enable = true; awesome.enable = true;
awesome.noArgb = true; awesome.noArgb = true;
awesome.luaModules = [ pkgs.luaPackages.vicious ]; awesome.luaModules = [ pkgs.luaPackages.vicious ];
default = "awesome";
};
displayManager.lightdm = {
enable = true;
autoLogin.enable = true;
autoLogin.user = mainUser;
}; };
displayManager.defaultSession = lib.mkDefault "awesome";
displayManager.lightdm = { enable = true; autoLogin.enable = true; autoLogin.user = mainUser; };
desktopManager.xterm.enable = false; desktopManager.xterm.enable = false;
}; };
environment.systemPackages = [ pkgs.gnome3.defaultIconTheme ]; environment.systemPackages = [ pkgs.gnome3.defaultIconTheme ];
# lid switch is handled via button presses # lid switch is handled via button presses
services.logind.lidSwitch = lib.mkDefault "ignore"; services.logind.lidSwitch = lib.mkDefault "ignore";
makefu.awesome.enable = true; makefu.awesome.enable = true;
i18n.consoleFont = "Lat2-Terminus16"; console.font = "Lat2-Terminus16";
fonts = { fonts = {
enableFontDir = true; enableFontDir = true;

9
makefu/2configs/gui/wbob-kiosk.nix
View file

@ -12,16 +12,15 @@
windowManager = lib.mkForce { windowManager = lib.mkForce {
awesome.enable = false; awesome.enable = false;
default = "xfce";
}; };
desktopManager.xfce = { desktopManager.xfce = {
extraSessionCommands = '' enable = true;
};
displayManager.defaultSession = "xfce";
displayManager.sessionCommands = ''
${pkgs.xlibs.xset}/bin/xset -display :0 s off -dpms ${pkgs.xlibs.xset}/bin/xset -display :0 s off -dpms
${pkgs.xlibs.xrandr}/bin/xrandr --output HDMI2 --right-of HDMI1 ${pkgs.xlibs.xrandr}/bin/xrandr --output HDMI2 --right-of HDMI1
''; '';
enable = true;
};
# xrandrHeads = [ "HDMI1" "HDMI2" ]; # xrandrHeads = [ "HDMI1" "HDMI2" ];
# prevent screen from turning off, disable dpms # prevent screen from turning off, disable dpms
}; };