summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
Diffstat (limited to 'makefu')
-rw-r--r--makefu/1systems/pornocauster.nix25
-rw-r--r--makefu/1systems/wbob.nix65
-rw-r--r--makefu/2configs/base-gui.nix2
-rw-r--r--makefu/2configs/fetchWallpaper.nix15
-rw-r--r--makefu/2configs/hw/tp-x220.nix14
-rw-r--r--makefu/2configs/hw/tp-x2x0.nix18
-rw-r--r--makefu/2configs/main-laptop.nix5
-rw-r--r--makefu/2configs/printer.nix4
-rw-r--r--makefu/3modules/umts.nix9
9 files changed, 88 insertions, 69 deletions
diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix
index d7fa8edc5..d8ccc5846 100644
--- a/makefu/1systems/pornocauster.nix
+++ b/makefu/1systems/pornocauster.nix
@@ -18,7 +18,6 @@
../2configs/exim-retiolum.nix
../2configs/mail-client.nix
../2configs/printer.nix
- #../2configs/virtualization.nix
../2configs/virtualization.nix
../2configs/virtualization-virtualbox.nix
../2configs/wwan.nix
@@ -35,33 +34,13 @@
# ../2configs/mediawiki.nix
#../2configs/wordpress.nix
];
- hardware.sane.enable = true;
- hardware.sane.extraBackends = [ pkgs.samsungUnifiedLinuxDriver ];
+
nixpkgs.config.packageOverrides = pkgs: {
tinc = pkgs.tinc_pre;
};
- krebs.Reaktor = {
- enable = false;
- nickname = "makefu|r";
- plugins = with pkgs.ReaktorPlugins; [ nixos-version random-emoji ];
- };
-
- # nix.binaryCaches = [ "http://acng.shack/nixos" "https://cache.nixos.org" ];
-
- environment.systemPackages = with pkgs;[
- get
- virtmanager
- gnome3.dconf
- krebspaste
- ];
-
- services.logind.extraConfig = "HandleLidSwitch=ignore";
# configure pulseAudio to provide a HDMI sink as well
- hardware.pulseaudio.configFile = pkgs.writeText "pulse-default-pa" ''
- ${builtins.readFile "${config.hardware.pulseaudio.package}/etc/pulse/default.pa"}
- load-module module-alsa-sink device=hw:0,3 sink_properties=device.description="HDMIOutput" sink_name="HDMI"'';
- networking.firewall.enable = false;
+ networking.firewall.enable = true;
networking.firewall.allowedTCPPorts = [
25
];
diff --git a/makefu/1systems/wbob.nix b/makefu/1systems/wbob.nix
index d6916f006..8917e4339 100644
--- a/makefu/1systems/wbob.nix
+++ b/makefu/1systems/wbob.nix
@@ -4,16 +4,57 @@
[ # Include the results of the hardware scan.
../2configs/main-laptop.nix
];
- krebs = {
- enable = true;
- retiolum.enable = true;
- build.host = config.krebs.hosts.wbob;
- };
- boot.loader.grub.device = "/dev/sda";
- boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" ];
- boot.kernelModules = [ "kvm-intel" ];
- fileSystems."/" = {
- device = "/dev/sda1";
- fsType = "ext4";
- };
+ krebs = {
+ enable = true;
+ retiolum.enable = true;
+ build.host = config.krebs.hosts.wbob;
+ };
+
+ # rt2870.bin wifi card, part of linux-unfree
+ hardware.enableAllFirmware = true;
+ nixpkgs.config.allowUnfree = true;
+ networking.wireless.enable = true;
+ # rt2870 with nonfree creates wlp2s0 from wlp0s20u2
+ # not explicitly setting the interface results in wpa_supplicant to crash
+ networking.wireless.interfaces = [ "wlp2s0" ];
+
+
+ # nuc hardware
+ boot.loader.grub.device = "/dev/sda";
+ hardware.cpu.intel.updateMicrocode = true;
+ boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+ boot.kernelModules = [ "kvm-intel" ];
+ fileSystems."/" = {
+ device = "/dev/sda1";
+ fsType = "ext4";
+ };
+
+ # DualHead on NUC
+ services.xserver = {
+ # xrandrHeads = [ "HDMI1" "HDMI2" ];
+ # prevent screen from turning off, disable dpms
+ displayManager.sessionCommands = ''
+ xset s off -dpms
+ xrandr --output HDMI2 --right-of HDMI1
+ '';
+ };
+ ## TODO Awesomecfg + autostart chrome
+ #
+ #local current_screen = 1
+ #awful.rules.rules = {
+ # { rule = { class = "chromium-browser" },
+ # callback = function()
+ # awful.client.movetotag(tags[current_screen][1],c)
+ # if (current_screen == 1) then
+ # current_screen = current_screen+1
+ # else
+ # current_screen = current_screen-1
+ # end
+ # end
+ # },
+ #}
+ #awful.util.spawn_with_shell("chromium --new-window --kiosk http://wolf:3000/dashboard/db/soc-critical-values")
+ # prevent Race Condition
+ #awful.util.spawn_with_shell("sleep 0.5;chromium --new-window --kiosk http://wolf:3000/dashboard/db/aralast")
+
}
diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix
index 1d6750284..da3ad4afe 100644
--- a/makefu/2configs/base-gui.nix
+++ b/makefu/2configs/base-gui.nix
@@ -44,6 +44,8 @@ in
displayManager.auto.user = mainUser;
desktopManager.xterm.enable = false;
};
+ # lid switch is handled via button presses
+ services.logind.extraConfig = mkDefault "HandleLidSwitch=ignore";
nixpkgs.config.packageOverrides = pkgs: rec {
awesome = pkgs.stdenv.lib.overrideDerivation pkgs.awesome (oldAttrs : {
postFixup = ''
diff --git a/makefu/2configs/fetchWallpaper.nix b/makefu/2configs/fetchWallpaper.nix
index b071a128d..786df6d40 100644
--- a/makefu/2configs/fetchWallpaper.nix
+++ b/makefu/2configs/fetchWallpaper.nix
@@ -1,24 +1,15 @@
{ config, pkgs, ... }:
-let
- # check if laptop runs on umts
- weaksauce-internet = with pkgs;writeScript "weaksauce-internet" ''
- #! /bin/sh
- if ${iproute}/bin/ip addr show dev ppp0 2>/dev/null \
- | ${gnugrep}/bin/grep -q inet;then
- exit 1
- fi
- '';
-
-in {
+{
krebs.fetchWallpaper = {
enable = true;
display = ":0";
- predicate = weaksauce-internet;
+ unitConfig.ConditionPathExists = "!/var/run/ppp0.pid";
timerConfig = {
OnCalendar = "*:0/30";
};
url = "http://echelon/wallpaper.png";
};
+
}
diff --git a/makefu/2configs/hw/tp-x220.nix b/makefu/2configs/hw/tp-x220.nix
index f03922150..0c90e6fde 100644
--- a/makefu/2configs/hw/tp-x220.nix
+++ b/makefu/2configs/hw/tp-x220.nix
@@ -16,10 +16,16 @@ with lib;
};
services.xserver.displayManager.sessionCommands =''
- xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 8 1
- xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 8 2
- xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Axes" 6 7 4 5
- # xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Timeout" 8 200
+ xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation" 8 1
+ xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 8 2
+ xinput set-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Axes" 6 7 4 5
+ # xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Timeout" 8 200
+ '';
+
+ # enable HDMI output switching with pulseaudio
+ hardware.pulseaudio.configFile = pkgs.writeText "pulse-default-pa" ''
+ ${builtins.readFile "${config.hardware.pulseaudio.package}/etc/pulse/default.pa"}
+ load-module module-alsa-sink device=hw:0,3 sink_properties=device.description="HDMIOutput" sink_name="HDMI"
'';
}
diff --git a/makefu/2configs/hw/tp-x2x0.nix b/makefu/2configs/hw/tp-x2x0.nix
index ebc72a06e..1033f69c0 100644
--- a/makefu/2configs/hw/tp-x2x0.nix
+++ b/makefu/2configs/hw/tp-x2x0.nix
@@ -18,18 +18,18 @@ with lib;
sensitivity = 220;
speed = 220;
emulateWheel = true;
- };
+ };
services.tlp.enable = true;
services.tlp.extraConfig = ''
- START_CHARGE_THRESH_BAT0=80
-
- CPU_SCALING_GOVERNOR_ON_AC=performance
- CPU_SCALING_GOVERNOR_ON_BAT=ondemand
- CPU_MIN_PERF_ON_AC=0
- CPU_MAX_PERF_ON_AC=100
- CPU_MIN_PERF_ON_BAT=0
- CPU_MAX_PERF_ON_BAT=30
+ START_CHARGE_THRESH_BAT0=80
+
+ CPU_SCALING_GOVERNOR_ON_AC=performance
+ CPU_SCALING_GOVERNOR_ON_BAT=ondemand
+ CPU_MIN_PERF_ON_AC=0
+ CPU_MAX_PERF_ON_AC=100
+ CPU_MIN_PERF_ON_BAT=0
+ CPU_MAX_PERF_ON_BAT=30
'';
}
diff --git a/makefu/2configs/main-laptop.nix b/makefu/2configs/main-laptop.nix
index b725f661d..32f194e6b 100644
--- a/makefu/2configs/main-laptop.nix
+++ b/makefu/2configs/main-laptop.nix
@@ -3,6 +3,7 @@
# stuff for the main laptop
# this is pretty much nice-to-have and does
# not fit into base-gui
+# TODO split generic desktop stuff and laptop-specifics like lidswitching
with lib;
{
@@ -17,8 +18,10 @@ with lib;
chromium
keepassx
ntfs3g
+ at_spi2_core
+ gnome3.dconf
virtmanager
- at_spi2_core # dep for virtmanager?
+ krebspaste
];
services.redshift = {
diff --git a/makefu/2configs/printer.nix b/makefu/2configs/printer.nix
index 35ad54bd9..d288748f9 100644
--- a/makefu/2configs/printer.nix
+++ b/makefu/2configs/printer.nix
@@ -7,4 +7,8 @@
pkgs.samsungUnifiedLinuxDriver
];
};
+
+ # scanners are printers just in reverse anyway
+ hardware.sane.enable = true;
+ hardware.sane.extraBackends = [ pkgs.samsungUnifiedLinuxDriver ];
}
diff --git a/makefu/3modules/umts.nix b/makefu/3modules/umts.nix
index d7be45f62..1bf3ba0b5 100644
--- a/makefu/3modules/umts.nix
+++ b/makefu/3modules/umts.nix
@@ -56,19 +56,12 @@ let
environment.wvdial.dialerDefaults = wvdial-defaults;
- systemd.targets.network-umts = {
- description = "System is running on UMTS";
- unitConfig.StopWhenUnneeded = true;
- };
-
systemd.services.umts = {
description = "UMTS wvdial Service";
- before = [ "network-umts.target" ];
-
serviceConfig = {
Type = "simple";
Restart = "always";
- RestartSec = "4s";
+ RestartSec = "10s";
ExecStart = "${pkgs.wvdial}/bin/wvdial -n";
};
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 16:30:05 +0000