From 060a8f28fa1fc648bdf66afb31a5d1efac868837 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Jul 2023 22:24:15 +0200 Subject: makefu: move out to own repo, add vacation-note --- makefu/2configs/gui/automatic-diskmount.nix | 43 ------------- makefu/2configs/gui/base.nix | 95 ----------------------------- makefu/2configs/gui/gnome.nix | 63 ------------------- makefu/2configs/gui/look-up.nix | 18 ------ makefu/2configs/gui/pipewire.nix | 20 ------ makefu/2configs/gui/snake-kiosk.nix | 44 ------------- makefu/2configs/gui/studio-virtual.nix | 19 ------ makefu/2configs/gui/studio.nix | 22 ------- makefu/2configs/gui/urxvtd.nix | 21 ------- makefu/2configs/gui/wbob-kiosk.nix | 56 ----------------- makefu/2configs/gui/xpra.nix | 3 - 11 files changed, 404 deletions(-) delete mode 100644 makefu/2configs/gui/automatic-diskmount.nix delete mode 100644 makefu/2configs/gui/base.nix delete mode 100644 makefu/2configs/gui/gnome.nix delete mode 100644 makefu/2configs/gui/look-up.nix delete mode 100644 makefu/2configs/gui/pipewire.nix delete mode 100644 makefu/2configs/gui/snake-kiosk.nix delete mode 100644 makefu/2configs/gui/studio-virtual.nix delete mode 100644 makefu/2configs/gui/studio.nix delete mode 100644 makefu/2configs/gui/urxvtd.nix delete mode 100644 makefu/2configs/gui/wbob-kiosk.nix delete mode 100644 makefu/2configs/gui/xpra.nix (limited to 'makefu/2configs/gui') diff --git a/makefu/2configs/gui/automatic-diskmount.nix b/makefu/2configs/gui/automatic-diskmount.nix deleted file mode 100644 index ad3774be8..000000000 --- a/makefu/2configs/gui/automatic-diskmount.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ pkgs, ... }: -with import ; #genid -{ # auto-mounting via polkit - services.udisks2.enable = true; -## automount all disks: -# services.devmon.enable = true; -# services.gnome3.gvfs.enable = true; - users.groups.storage = { - gid = genid "storage"; - members = [ "makefu" ]; - }; - users.users.makefu.packages = with pkgs;[ - gvfs pcmanfm lxmenu-data - ]; - -## allow users in group "storage" to mount disk -# https://github.com/coldfix/udiskie/wiki/Permissions - security.polkit.extraConfig = - '' - polkit.addRule(function(action, subject) { - var YES = polkit.Result.YES; - var permission = { - "org.freedesktop.udisks.filesystem-mount": YES, - "org.freedesktop.udisks.luks-unlock": YES, - "org.freedesktop.udisks.drive-eject": YES, - "org.freedesktop.udisks.drive-detach": YES, - "org.freedesktop.udisks2.filesystem-mount": YES, - "org.freedesktop.udisks2.encrypted-unlock": YES, - "org.freedesktop.udisks2.eject-media": YES, - "org.freedesktop.udisks2.power-off-drive": YES, - "org.freedesktop.udisks2.filesystem-mount-other-seat": YES, - "org.freedesktop.udisks2.filesystem-unmount-others": YES, - "org.freedesktop.udisks2.encrypted-unlock-other-seat": YES, - "org.freedesktop.udisks2.eject-media-other-seat": YES, - "org.freedesktop.udisks2.power-off-drive-other-seat": YES - }; - if (subject.isInGroup("storage")) { - return permission[action.id]; - } - }); - ''; - -} diff --git a/makefu/2configs/gui/base.nix b/makefu/2configs/gui/base.nix deleted file mode 100644 index b1b7c9913..000000000 --- a/makefu/2configs/gui/base.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ config, lib, pkgs, ... }: -## -# of course this name is a lie -# - it prepares a GUI environment close to my -# current configuration,specifically: -# -# * autologin with mainUser into awesome -# * audio -# * terminus font -# -# if this is not enough, check out main-laptop.nix - - -let - mainUser = config.krebs.build.user.name; -in -{ - imports = [ - ./urxvtd.nix - ./pipewire.nix - ./gnome.nix - ]; - - - # services.redshift.enable = true; - services.xserver = { - enable = true; - layout = "us"; - xkbVariant = "altgr-intl"; - xkbOptions = "ctrl:nocaps, eurosign:e"; - -# windowManager = { -# awesome.enable = true; -# awesome.noArgb = true; -# awesome.luaModules = [ pkgs.luaPackages.vicious ]; -# }; -# displayManager.defaultSession = lib.mkDefault "none+awesome"; - }; - environment.systemPackages = [ pkgs.gnome.adwaita-icon-theme ]; - # lid switch is handled via button presses - # services.logind.lidSwitch = lib.mkDefault "ignore"; - #makefu.awesome.enable = true; - console.font = "Lat2-Terminus16"; - - fonts = { - fontDir.enable = true; - enableGhostscriptFonts = true; - fonts = [ pkgs.terminus_font pkgs.corefonts ]; - }; - - users.users.${mainUser} = { - extraGroups = [ "pipewire" "audio" ]; - packages = with pkgs;[ - pavucontrol - xlockmore - rxvt_unicode-with-plugins - ]; - }; - - services.xserver.displayManager.sessionCommands = let - xdefaultsfile = pkgs.writeText "Xdefaults" '' - cat |derp <c"]; - minimize=["n"]; - move-to-workspace-1=["1"]; - move-to-workspace-2=["2"]; - move-to-workspace-3=["3"]; - move-to-workspace-4=["4"]; - panel-run-dialog=["r"]; - switch-to-workspace-1=["1"]; - switch-to-workspace-2=["2"]; - switch-to-workspace-3=["3"]; - switch-to-workspace-4=["4"]; - toggle-fullscreen=["f"]; - }; - "org/gnome/desktop/wm/preferences".num-workspaces = 4; - "org/gnome/settings-daemon/plugins/color".night-light-enabled = true; - "org/gnome/settings-daemon/plugins/media-keys" = { - custom-keybindings = [ "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"]; - }; - "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = { - binding = "Return"; - command = "gnome-terminal"; - name = "terminal"; - }; - }; - }; -} diff --git a/makefu/2configs/gui/look-up.nix b/makefu/2configs/gui/look-up.nix deleted file mode 100644 index e04098cc2..000000000 --- a/makefu/2configs/gui/look-up.nix +++ /dev/null @@ -1,18 +0,0 @@ -{pkgs, config, ... }: -let - user = config.krebs.build.user.name; - window-manager = "awesome"; -in - { - systemd.services.look-up = { - startAt = "*:30"; - serviceConfig = { - ExecStart= pkgs.writeDash "look-up" '' - set -x - eval "export '$(egrep -z DBUS_SESSION_BUS_ADDRESS /proc/$(${pkgs.procps}/bin/pgrep -u ${user} ${window-manager})/environ)'" - ${pkgs.libnotify}/bin/notify-send -u critical -t 9999999 'look up once in a while' - ''; - User = user; - }; - }; -} diff --git a/makefu/2configs/gui/pipewire.nix b/makefu/2configs/gui/pipewire.nix deleted file mode 100644 index d52681551..000000000 --- a/makefu/2configs/gui/pipewire.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ config, lib, pkgs, ... }: -# TODO test `alsactl init` after suspend to reinit mic -{ - security.rtkit.enable = true; - hardware.pulseaudio.enable = lib.mkForce false; - - environment.systemPackages = with pkgs; [ - alsaUtils - pulseaudio - ponymix - ]; - - services.pipewire = { - enable = true; - # systemWide = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; -} diff --git a/makefu/2configs/gui/snake-kiosk.nix b/makefu/2configs/gui/snake-kiosk.nix deleted file mode 100644 index 838ac3a5c..000000000 --- a/makefu/2configs/gui/snake-kiosk.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ pkgs, lib, ... }: -{ - - imports = [ - ./base.nix - ]; - users.users.kiosk = { - # packages = [ pkgs.chromium pkgs.vscode ]; - group = "kiosk"; - isNormalUser = true; - uid = 1003; - extraGroups = [ "wheel" "audio" "pulse" "pipewire" ]; - }; - users.groups.kiosk.gid = 989 ; - services.xserver = { - enable = true; - - windowManager = lib.mkForce { awesome.enable = false; }; - displayManager.gdm.enable = true; - displayManager.gdm.autoSuspend = false; - displayManager.autoLogin = { - enable = true; - user = lib.mkForce "kiosk"; - }; - displayManager.defaultSession = "gnome"; - desktopManager.gnome.enable = true; - }; - - systemd.targets.sleep.enable = false; - systemd.targets.suspend.enable = false; - systemd.targets.hibernate.enable = false; - systemd.targets.hybrid-sleep.enable = false; - - - - environment.systemPackages = [ pkgs.gnomeExtensions.appindicator ]; - services.dbus.packages = with pkgs; [ gnome2.GConf gnome3.gnome-settings-daemon ]; - - services.pipewire.systemWide = lib.mkForce false; - services.pipewire.config.pipewire-pulse = { - "pulse.properties"."server.address" = [ "unix:native" "tcp:4713" ]; - }; - -} diff --git a/makefu/2configs/gui/studio-virtual.nix b/makefu/2configs/gui/studio-virtual.nix deleted file mode 100644 index 272060c2c..000000000 --- a/makefu/2configs/gui/studio-virtual.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ config, lib, ... }: -let - user = config.makefu.gui.user; -in -{ - imports = [ - - ]; - services.xserver.displayManager.sddm.enable = lib.mkForce false; - services.xserver.desktopManager = { - default = "plasma5"; - plasma5.enable = true; - }; - - services.xserver.layout = "us"; - services.xserver.xkbVariant = "altgr-intl"; - services.xserver.xkbOptions = "ctrl:nocaps"; - -} diff --git a/makefu/2configs/gui/studio.nix b/makefu/2configs/gui/studio.nix deleted file mode 100644 index 08157fda4..000000000 --- a/makefu/2configs/gui/studio.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ config, lib, ... }: -let - user = config.makefu.gui.user; -in -{ - services.xserver.enable = true; - services.xserver.displayManager.sddm = { - enable = true; - autoLogin.enable = true; - autoLogin.user = user; - }; - # services.xserver.windowMananger.default = "plasma5"; - services.xserver.desktopManager = { - default = "plasma5"; - plasma5.enable = true; - }; - - services.xserver.layout = "us"; - services.xserver.xkbVariant = "altgr-intl"; - services.xserver.xkbOptions = "ctrl:nocaps"; - -} diff --git a/makefu/2configs/gui/urxvtd.nix b/makefu/2configs/gui/urxvtd.nix deleted file mode 100644 index cb6c25840..000000000 --- a/makefu/2configs/gui/urxvtd.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ config, pkgs, ... }: - -let - mainUser = config.krebs.build.user.name; -in { - systemd.services.urxvtd = { - wantedBy = [ "multi-user.target" ]; - before = [ "graphical.target" ]; - reloadIfChanged = true; - serviceConfig = { - SyslogIdentifier = "urxvtd"; - ExecReload = "${pkgs.coreutils}/bin/echo NOP"; - ExecStart = "${pkgs.rxvt_unicode-with-plugins}/bin/urxvtd"; - Restart = "always"; - RestartSec = "2s"; - StartLimitBurst = 0; - User = mainUser; - }; - }; - # TODO: sessionCommands from base-gui related to urxvt in this file -} diff --git a/makefu/2configs/gui/wbob-kiosk.nix b/makefu/2configs/gui/wbob-kiosk.nix deleted file mode 100644 index 3a21bf213..000000000 --- a/makefu/2configs/gui/wbob-kiosk.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ pkgs, lib, ... }: -{ - - imports = [ - ./base.nix - ]; - users.users.kiosk = { - packages = with pkgs;[ chromium vscode spotify tartube-yt-dlp ]; - group = "kiosk"; - isNormalUser = true; - uid = 1003; - extraGroups = [ "wheel" "audio" "pulse" "pipewire" ]; - }; - users.groups.kiosk.gid = 989 ; - services.xserver = { - - windowManager = lib.mkForce { awesome.enable = false; }; - displayManager.gdm.enable = true; - displayManager.autoLogin = { - enable = true; - user = lib.mkForce "kiosk"; - }; - displayManager.defaultSession = "gnome"; - desktopManager.gnome.enable = true; - displayManager.sessionCommands = '' - ${pkgs.xorg.xset}/bin/xset -display :0 s off -dpms - ${pkgs.xorg.xrandr}/bin/xrandr --output HDMI2 --right-of HDMI1 - ''; - # xrandrHeads = [ "HDMI1" "HDMI2" ]; - # prevent screen from turning off, disable dpms - }; - - - environment.systemPackages = [ - pkgs.gnomeExtensions.appindicator pkgs.pavucontrol pkgs.jellyfin-media-player pkgs.chromium pkgs.firefox pkgs.kodi - pkgs.pavucontrol -]; - services.dbus.packages = with pkgs; [ gnome2.GConf gnome3.gnome-settings-daemon ]; - - systemd.services.xset-off = { - after = [ "display-manager.service" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = "${pkgs.xorg.xset}/bin/xset -display :0 s off -dpms"; - RemainAfterExit = "yes"; - TimeoutSec = "5s"; - RestartSec="5s"; - Restart = "on-failure"; - }; - }; - services.pipewire.systemWide = lib.mkForce false; - services.pipewire.config.pipewire-pulse = { - "pulse.properties"."server.address" = [ "unix:native" "tcp:4713" ]; - }; - -} diff --git a/makefu/2configs/gui/xpra.nix b/makefu/2configs/gui/xpra.nix deleted file mode 100644 index 2384acbaa..000000000 --- a/makefu/2configs/gui/xpra.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - services.xserver.displayManager.xpra.enable = true; -} -- cgit v1.2.3