diff options
Diffstat (limited to 'modules')
-rw-r--r-- | modules/agetty.nix | 126 | ||||
-rw-r--r-- | modules/dockd-old-setup.nix | 74 | ||||
-rw-r--r-- | modules/dockd.nix | 92 | ||||
-rwxr-xr-x | modules/larbs.nix | 86 | ||||
-rwxr-xr-x | modules/pulseaudio.pa | 138 | ||||
-rw-r--r-- | modules/slock.nix | 33 | ||||
-rw-r--r-- | modules/trackpad.nix | 7 |
7 files changed, 0 insertions, 556 deletions
diff --git a/modules/agetty.nix b/modules/agetty.nix deleted file mode 100644 index 88fd82e..0000000 --- a/modules/agetty.nix +++ /dev/null @@ -1,126 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - autologinArg = optionalString (config.services.agetty.autologinUser != null) "--autologin ${config.services.agetty.autologinUser}"; - defaultUserArg = optionalString (config.services.agetty.defaultUser != null) "-n --login-options ${config.services.agetty.defaultUser}"; - gettyCmd = extraArgs: "@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login ${autologinArg} ${defaultUserArg} ${extraArgs}"; - -in - -{ - - ###### interface - - options = { - - services.agetty = { - - autologinUser = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Username of the account that will be automatically logged in at the console. - If unspecified, a login prompt is shown as usual. - ''; - }; - - defaultUser = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - If set this will prompt only for password for given user (instead of login+password) - ''; - }; - - greetingLine = mkOption { - type = types.str; - description = '' - Welcome line printed by agetty. - The default shows current NixOS version label, machine type and tty. - ''; - }; - - helpLine = mkOption { - type = types.lines; - default = ""; - description = '' - Help line printed by agetty below the welcome line. - Used by the installation CD to give some hints on - how to proceed. - ''; - }; - - serialSpeed = mkOption { - type = types.listOf types.int; - default = [ 115200 57600 38400 9600 ]; - example = [ 38400 9600 ]; - description = '' - Bitrates to allow for agetty's listening on serial ports. Listing more - bitrates gives more interoperability but at the cost of long delays - for getting a sync on the line. - ''; - }; - - }; - - }; - - - ###### implementation - - config = { - # Note: this is set here rather than up there so that changing - # nixos.label would not rebuild manual pages - services.agetty.greetingLine = mkDefault ''<<< Welcome to NixOS ${config.system.nixos.label} (\m) - \l >>>''; - - systemd.services."getty@" = - { serviceConfig.ExecStart = [ - "" # override upstream default with an empty ExecStart - (gettyCmd "--noclear --keep-baud %I 115200,38400,9600 $TERM") - ]; - restartIfChanged = false; - }; - - systemd.services."serial-getty@" = - let speeds = concatStringsSep "," (map toString config.services.agetty.serialSpeed); in - { serviceConfig.ExecStart = [ - "" # override upstream default with an empty ExecStart - (gettyCmd "%I ${speeds} $TERM") - ]; - restartIfChanged = false; - }; - - systemd.services."container-getty@" = - { serviceConfig.ExecStart = [ - "" # override upstream default with an empty ExecStart - (gettyCmd "--noclear --keep-baud pts/%I 115200,38400,9600 $TERM") - ]; - restartIfChanged = false; - }; - - systemd.services.console-getty = - { serviceConfig.ExecStart = [ - "" # override upstream default with an empty ExecStart - (gettyCmd "--noclear --keep-baud console 115200,38400,9600 $TERM") - ]; - serviceConfig.Restart = "always"; - restartIfChanged = false; - enable = mkDefault config.boot.isContainer; - }; - - # environment.etc.issue = - # { # Friendly greeting on the virtual consoles. - # source = pkgs.writeText "issue" '' - - # [1;32m${config.services.agetty.greetingLine}[0m - # ${config.services.agetty.helpLine} - - # ''; - # }; - - }; - -} diff --git a/modules/dockd-old-setup.nix b/modules/dockd-old-setup.nix deleted file mode 100644 index 83cb576..0000000 --- a/modules/dockd-old-setup.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - cfg = config.programs.dockd; -in - -{ - options = { - programs.dockd = { - enable = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - ThinkPad dock manager daemon. - ''; - }; - }; - }; - - config = lib.mkIf (cfg.enable) { - environment.etc = { - "dockd/docked.conf".text = '' - [Screen] - height=1920 - width=3000 - mm_height=506 - mm_width=791 - - [CRTC] - crtc=63 - x=0 - y=241 - rotation=1 - mode=1920x1080 - outputs_len=1 - outputs_0=HDMI-3 - - [CRTC] - crtc=64 - x=1920 - y=0 - rotation=2 - mode=1920x1080 - outputs_len=1 - outputs_0=DP-2 - ''; - - "dockd/undocked.conf".text = '' - [Screen] - height=768 - width=1366 - mm_height=202 - mm_width=359 - - [CRTC] - crtc=63 - x=0 - y=0 - rotation=1 - mode=1366x768 - outputs_len=1 - outputs_0=LVDS-1 - - [CRTC] - crtc=64 - x=1920 - y=0 - rotation=2 - mode=None - outputs_len=0 - ''; - }; - }; -} diff --git a/modules/dockd.nix b/modules/dockd.nix deleted file mode 100644 index e2b5870..0000000 --- a/modules/dockd.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - cfg = config.programs.dockd; -in - -{ - options = { - programs.dockd = { - enable = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - ThinkPad dock manager daemon. - ''; - }; - }; - }; - - config = lib.mkIf (cfg.enable) { - environment.systemPackages = [ pkgs.nur.repos.pn.dockd ]; - environment.etc = { - "dockd/docked.conf".text = '' -[Screen] -height=1080 -width=1920 -mm_height=282 -mm_width=502 - -[CRTC] -crtc=63 -x=0 -y=0 -rotation=1 -mode=None -outputs_len=0 - -[CRTC] -crtc=64 -x=0 -y=0 -rotation=1 -mode=1920x1080 -outputs_len=1 -outputs_0=DP2 - -[CRTC] -crtc=65 -x=0 -y=0 -rotation=1 -mode=None -outputs_len=0 - - ''; - "dockd/undocked.conf".text = '' -[Screen] -height=768 -width=1366 -mm_height=201 -mm_width=359 - -[CRTC] -crtc=63 -x=0 -y=0 -rotation=1 -mode=1366x768 -outputs_len=1 -outputs_0=LVDS1 - -[CRTC] -crtc=64 -x=1920 -y=0 -rotation=1 -mode=None -outputs_len=0 - -[CRTC] -crtc=65 -x=0 -y=0 -rotation=1 -mode=None -outputs_len=0 - - - ''; - }; - }; -} diff --git a/modules/larbs.nix b/modules/larbs.nix deleted file mode 100755 index 0420b46..0000000 --- a/modules/larbs.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ pkgs, ... }: -let - xwallpaper = (import (pkgs.fetchzip { - url = "https://github.com/nixos/nixpkgs/archive/7138a338b58713e0dea22ddab6a6785abec7376a.zip"; - sha256 = "sha256:1asgl1hxj2bgrxdixp3yigp7xn25m37azwkf3ppb248vcfc5kil3"; - }) { }).xwallpaper; - pnvim = import ../pkgs/nvim.nix pkgs; - pndwm = import ../pkgs/dwm pkgs; - pndwmblocks = import ../pkgs/dwmblocks pkgs; - todos = import ../pkgs/dwmblocks/todos.nix pkgs; - larbs-packages = with pkgs.nur.repos.pn; [ - pnvim - larbs-mail - # larbs-news - (larbs-music.override { musicDir = "~/music"; }) - dmenu - pndwm - pndwmblocks - larbs-scripts - (st.override { conf = ../pkgs/st.config.h; } ) - ]; - - grap = pkgs.symlinkJoin { - name = "grap"; - paths = [ pkgs.plan9port ]; - postBuild = '' - ln -s ${pkgs.plan9port}/plan9/bin/grap $out/bin/grap - ''; - }; -in -{ - imports = [ - ./personal.nix - ./audio.nix - ./slock.nix - ]; - - gtk.iconCache.enable = true; - - environment.shellAliases = { - cmus = "screen -q -r -D cmus || screen -S cmus /run/current-system/sw/bin/cmus"; - }; - - environment.systemPackages = with pkgs; [ - ## Scripts utils - #TODO: move to larbs-scripts - newsboat - maim - xclip - xdotool - lm_sensors - mpc_cli - python3Packages.pywal - xwallpaper - xcompmgr - screen - - cmus - - grap - nur.repos.pn.groff - - hicolor-icon-theme - gnome3.adwaita-icon-theme - - playerctl - - todos - brave - tdesktop - ] ++ larbs-packages; - - environment.variables = { - TERM = "st"; - TERMINAL = "st"; - BROWSER = "brave"; - GTK_THEME = "Adwaita:dark"; - }; - - services.xserver = { - enable = true; - displayManager.startx.enable = true; - libinput.enable = true; - }; - -} diff --git a/modules/pulseaudio.pa b/modules/pulseaudio.pa deleted file mode 100755 index deb25e6..0000000 --- a/modules/pulseaudio.pa +++ /dev/null @@ -1,138 +0,0 @@ -#!/nix/store/vpkpzblbrwfzrm44dahv3s08b2mwlzyh-pulseaudio-13.0/bin/pulseaudio -nF -# -# This file is part of PulseAudio. -# -# PulseAudio is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# PulseAudio is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>. - -# This startup script is used only if PulseAudio is started per-user -# (i.e. not in system mode) - -.fail - -### Automatically restore the volume of streams and devices -load-module module-device-restore -load-module module-stream-restore -load-module module-card-restore - -### Automatically augment property information from .desktop files -### stored in /usr/share/application -load-module module-augment-properties - -### Should be after module-*-restore but before module-*-detect -load-module module-switch-on-port-available - -### Load audio drivers statically -### (it's probably better to not load these drivers manually, but instead -### use module-udev-detect -- see below -- for doing this automatically) -#load-module module-alsa-sink -#load-module module-alsa-source device=hw:1,0 -#load-module module-null-sink -#load-module module-pipe-sink - -### Automatically load driver modules depending on the hardware available -.ifexists module-udev-detect.so -load-module module-udev-detect -.else -### Use the static hardware detection module (for systems that lack udev support) -load-module module-detect -.endif - -### Automatically connect sink and source if JACK server is present -.ifexists module-jackdbus-detect.so -.nofail -load-module module-jackdbus-detect channels=2 -.fail -.endif - -### Automatically load driver modules for Bluetooth hardware -.ifexists module-bluetooth-policy.so -load-module module-bluetooth-policy -.endif - -.ifexists module-bluetooth-discover.so -load-module module-bluetooth-discover -.endif - -### Load several protocols -###.ifexists module-esound-protocol-unix.so -###load-module module-esound-protocol-unix -###.endif -load-module module-native-protocol-unix - -### Network access (may be configured with paprefs, so leave this commented -### here if you plan to use paprefs) -#load-module module-esound-protocol-tcp -#load-module module-native-protocol-tcp - -### Load the RTP receiver module (also configured via paprefs, see above) -#load-module module-rtp-recv - -### Load the RTP sender module (also configured via paprefs, see above) -#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 sink_properties="device.description='RTP Multicast Sink'" -#load-module module-rtp-send source=rtp.monitor - -### Load additional modules from GSettings. This can be configured with the paprefs tool. -### Please keep in mind that the modules configured by paprefs might conflict with manually -### loaded modules. -.ifexists module-gsettings.so -.nofail -load-module module-gsettings -.fail -.endif - - -### Automatically restore the default sink/source when changed by the user -### during runtime -### NOTE: This should be loaded as early as possible so that subsequent modules -### that look up the default sink/source get the right value -load-module module-default-device-restore - -### Automatically move streams to the default sink if the sink they are -### connected to dies, similar for sources -load-module module-rescue-streams - -### Make sure we always have a sink around, even if it is a null sink. -load-module module-always-sink - -### Honour intended role device property -load-module module-intended-roles - -### Automatically suspend sinks/sources that become idle for too long -load-module module-suspend-on-idle - -### If autoexit on idle is enabled we want to make sure we only quit -### when no local session needs us anymore. -.ifexists module-console-kit.so -load-module module-console-kit -.endif -.ifexists module-systemd-login.so -load-module module-systemd-login -.endif - -### Enable positioned event sounds -load-module module-position-event-sounds - -### Cork music/video streams when a phone stream is active -# load-module module-role-cork - -### Modules to allow autoloading of filters (such as echo cancellation) -### on demand. module-filter-heuristics tries to determine what filters -### make sense, and module-filter-apply does the heavy-lifting of -### loading modules and rerouting streams. -load-module module-filter-heuristics -load-module module-filter-apply - -### Make some devices default -#set-default-sink output -#set-default-source input diff --git a/modules/slock.nix b/modules/slock.nix deleted file mode 100644 index d98e898..0000000 --- a/modules/slock.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ config, pkgs, ... }: - -let - slock = pkgs.slock.overrideAttrs(oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ - # pkgs.imlib2 - # pkgs.linux-pam - pkgs.xlibs.libXinerama - ]; - patches = [ - # ../platforms/linux/xorg/slock/slock-pam_auth-20190207-35633d4.diff - ../platforms/linux/xorg/slock/slock-capscolor-20170106-2d2a21a.diff - ../platforms/linux/xorg/slock/slock-dpms-1.4.diff - ../platforms/linux/xorg/slock/slock-mediakeys.diff - ]; - }); -in { - environment.systemPackages = [ slock ]; - security.wrappers.slock.source = "${slock.out}/bin/slock"; - # services.xserver.xautolock = { - # enable = true; - # locker = "${config.security.wrapperDir}/slock"; - # enableNotifier = true; - # notifier = "${pkgs.libnotify}/bin/notify-send \"Locking in 10 seconds\""; - # killer = "/run/current-system/systemd/bin/systemctl suspend-then-hibernate"; - # killtime = 30; - # extraOptions = [ "-detectsleep" ]; - # }; - programs.xss-lock = { - enable = true; - lockerCommand = "${config.security.wrapperDir}/slock"; - }; -} diff --git a/modules/trackpad.nix b/modules/trackpad.nix deleted file mode 100644 index 89e549a..0000000 --- a/modules/trackpad.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - services.xserver.libinput = { - enable = true; - naturalScrolling = true; - additionalOptions = ''MatchIsTouchpad "on"''; - }; -} |