From bfae7775c2b341bc03bcaf985ffb5e7b89eeb26c Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 20 Jun 2017 19:42:19 +0200 Subject: l 1 mors: remove obsolete powersaving scripts --- lass/1systems/mors.nix | 9 --------- 1 file changed, 9 deletions(-) (limited to 'lass/1systems') diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 6790c0aea..b3422811b 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -156,15 +156,6 @@ with import ; #activationScripts #split up and move into base system.activationScripts.powertopTunables = '' - #Enable Audio codec power management - echo '1' > '/sys/module/snd_hda_intel/parameters/power_save' - #VM writeback timeout - echo '1500' > '/proc/sys/vm/dirty_writeback_centisecs' - #Autosuspend for USB device Broadcom Bluetooth Device [Broadcom Corp] - #echo 'auto' > '/sys/bus/usb/devices/1-1.4/power/control' - #Autosuspend for USB device Biometric Coprocessor - #echo 'auto' > '/sys/bus/usb/devices/1-1.3/power/control' - #Runtime PMs echo 'auto' > '/sys/bus/pci/devices/0000:00:02.0/power/control' echo 'auto' > '/sys/bus/pci/devices/0000:00:00.0/power/control' -- cgit v1.3.1 From fb8e8008d46d88d78bb7f20f5ad7ecc5ee4f790e Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 20 Jun 2017 19:45:35 +0200 Subject: l: add ciko.nix for ciko's mail setup --- lass/1systems/prism.nix | 1 + lass/2configs/ciko.nix | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 lass/2configs/ciko.nix (limited to 'lass/1systems') diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index 02054a8e5..6bb1df222 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -46,6 +46,7 @@ in { ../2configs/paste.nix ../2configs/syncthing.nix ../2configs/coders-irc.nix + ../2configs/ciko.nix { imports = [ ../2configs/bepasty.nix diff --git a/lass/2configs/ciko.nix b/lass/2configs/ciko.nix new file mode 100644 index 000000000..56c9a286c --- /dev/null +++ b/lass/2configs/ciko.nix @@ -0,0 +1,23 @@ +{ config, pkgs, ... }: +with import ; +{ + users.users.ciko = { + uid = genid_signed "ciko"; + description = "acc for ciko"; + home = "/home/ciko"; + useDefaultShell = true; + createHome = true; + openssh.authorizedKeys.keys = [ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDTUWm/fISw/gbuHvf3kwxGEuk1aY5HrNNvr8QXCQv0khDdaYmZSELbtFQtE04WGTWmackNcLpld5mETVyCM0BjOgqMJYQNhtywxfYcodEY5xxHCuGgA3S1t94MZub+DRodXCfB0yUV85Wbb0sltkMTJufMwYmLEGxSLRukxAOcNsXdjlyro96csmYrIiV6R7+REnz8OcR7sKlI4tvKA1mbvWmjbDBd1MZ8Jc0Lwf+b0H/rH69wEQIcB5HRHHJIChoAk0t2azSjXagk1+4AebONZTCKvTHxs/D2wUBIzoxyjmh5S0aso/cKw8qpKcl/A2mZiIvW3KMlJAM5U+RQKMrr" + ]; + }; + krebs.exim-smarthost = { + internet-aliases = [ + { from = "*@slash16.net"; to = "ciko"; } + ]; + sender_domains = [ + "slash16.net" + ]; + }; +} + -- cgit v1.3.1 From acf721e7514ba4ccacef7ecd8e7a2eb11602a9e4 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 20 Jun 2017 19:46:37 +0200 Subject: l 1 mors: add brain to pkgs --- lass/1systems/mors.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass/1systems') diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index b3422811b..2b9ba9450 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -174,6 +174,7 @@ with import ; environment.systemPackages = with pkgs; [ acronym + brain cac-api sshpass get -- cgit v1.3.1 From 83b2c381d8a2e2e08d238a96f1daf4b292c315da Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 20 Jun 2017 20:17:43 +0200 Subject: l 1 prism: activate pyload --- lass/1systems/prism.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lass/1systems') diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix index 6bb1df222..af847333d 100644 --- a/lass/1systems/prism.nix +++ b/lass/1systems/prism.nix @@ -47,6 +47,9 @@ in { ../2configs/syncthing.nix ../2configs/coders-irc.nix ../2configs/ciko.nix + { + lass.pyload.enable = true; + } { imports = [ ../2configs/bepasty.nix -- cgit v1.3.1 From 5fde754d3fbb37a8a1978f2e1e64565455fada47 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 20 Jun 2017 20:20:15 +0200 Subject: l 1 mors: use virtualbox instead of libvirt --- lass/1systems/mors.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass/1systems') diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix index 2b9ba9450..b9ab54503 100644 --- a/lass/1systems/mors.nix +++ b/lass/1systems/mors.nix @@ -17,7 +17,7 @@ with import ; ../2configs/steam.nix ../2configs/wine.nix ../2configs/git.nix - ../2configs/libvirt.nix + ../2configs/virtualbox.nix ../2configs/fetchWallpaper.nix #../2configs/c-base.nix ../2configs/mail.nix -- cgit v1.3.1 From 13de8c6bd2816bd0cd66433be93168720ce59d55 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 24 Jun 2017 16:40:49 +0200 Subject: l: set symlinkJoin pkgs in correct order --- lass/1systems/iso.nix | 2 +- lass/2configs/htop.nix | 2 +- lass/2configs/mail.nix | 2 +- lass/2configs/mc.nix | 2 +- lass/2configs/mpv.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'lass/1systems') diff --git a/lass/1systems/iso.nix b/lass/1systems/iso.nix index 8b2e82d31..b45d5b228 100644 --- a/lass/1systems/iso.nix +++ b/lass/1systems/iso.nix @@ -21,7 +21,6 @@ with import ; coreutils = pkgs.symlinkJoin { name = "coreutils-hack"; paths = [ - pkgs.coreutils (pkgs.writeDashBin "tee" '' if test "$1" = /dev/stderr; then while read -r line; do @@ -32,6 +31,7 @@ with import ; ${super.coreutils}/bin/tee "$@" fi '') + pkgs.coreutils ]; }; }; diff --git a/lass/2configs/htop.nix b/lass/2configs/htop.nix index ec86d4120..d9307347e 100644 --- a/lass/2configs/htop.nix +++ b/lass/2configs/htop.nix @@ -8,7 +8,6 @@ with import ; htop = pkgs.symlinkJoin { name = "htop"; paths = [ - super.htop (pkgs.writeDashBin "htop" '' export HTOPRC=${pkgs.writeText "htoprc" '' fields=0 48 17 18 38 39 40 2 46 47 49 1 @@ -38,6 +37,7 @@ with import ; ''} exec ${super.htop}/bin/htop "$@" '') + super.htop ]; }; }; diff --git a/lass/2configs/mail.nix b/lass/2configs/mail.nix index 5748b6eaf..feb532709 100644 --- a/lass/2configs/mail.nix +++ b/lass/2configs/mail.nix @@ -116,10 +116,10 @@ let mutt = pkgs.symlinkJoin { name = "mutt"; paths = [ - pkgs.neomutt (pkgs.writeDashBin "mutt" '' exec ${pkgs.neomutt}/bin/mutt -F ${muttrc} $@ '') + pkgs.neomutt ]; }; diff --git a/lass/2configs/mc.nix b/lass/2configs/mc.nix index 62fd52f3f..3bd1852a8 100644 --- a/lass/2configs/mc.nix +++ b/lass/2configs/mc.nix @@ -325,7 +325,6 @@ in { (pkgs.symlinkJoin { name = "mc"; paths = [ - pkgs.mc (pkgs.writeDashBin "mc" '' export MC_DATADIR=${pkgs.writeOut "mc-ext" { "/mc.ext".link = mcExt; @@ -334,6 +333,7 @@ in { export TERM=xterm-256color exec ${pkgs.mc}/bin/mc -S xoria256 "$@" '') + pkgs.mc ]; }) ]; diff --git a/lass/2configs/mpv.nix b/lass/2configs/mpv.nix index c8b590857..04fd9213e 100644 --- a/lass/2configs/mpv.nix +++ b/lass/2configs/mpv.nix @@ -10,10 +10,10 @@ let mpv = pkgs.symlinkJoin { name = "mpv"; paths = [ - pkgs.mpv (pkgs.writeDashBin "mpv" '' exec ${pkgs.mpv}/bin/mpv --no-config --script=${scripts} "$@" '') + pkgs.mpv ]; }; -- cgit v1.3.1