Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ma: refactoring

Browse Source
This commit is contained in:
makefu 2016-02-11 17:06:50 +01:00
parent 908837089c
commit ab52655e94
7 changed files with 31 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
makefu/1systems/pornocauster.nix
View File

@ -18,7 +18,6 @@
../2configs/exim-retiolum.nix ../2configs/exim-retiolum.nix
../2configs/mail-client.nix ../2configs/mail-client.nix
../2configs/printer.nix ../2configs/printer.nix
#../2configs/virtualization.nix
../2configs/virtualization.nix ../2configs/virtualization.nix
../2configs/virtualization-virtualbox.nix ../2configs/virtualization-virtualbox.nix
../2configs/wwan.nix ../2configs/wwan.nix
@ -35,33 +34,13 @@
# ../2configs/mediawiki.nix # ../2configs/mediawiki.nix
#../2configs/wordpress.nix #../2configs/wordpress.nix
]; ];
hardware.sane.enable = true;
hardware.sane.extraBackends = [ pkgs.samsungUnifiedLinuxDriver ];
nixpkgs.config.packageOverrides = pkgs: { nixpkgs.config.packageOverrides = pkgs: {
tinc = pkgs.tinc_pre; 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 # configure pulseAudio to provide a HDMI sink as well
hardware.pulseaudio.configFile = pkgs.writeText "pulse-default-pa" '' networking.firewall.enable = true;
${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.allowedTCPPorts = [ networking.firewall.allowedTCPPorts = [
25 25
]; ];

2
makefu/2configs/base-gui.nix
View File

@ -44,6 +44,8 @@ in
displayManager.auto.user = mainUser; displayManager.auto.user = mainUser;
desktopManager.xterm.enable = false; desktopManager.xterm.enable = false;
}; };
# lid switch is handled via button presses
services.logind.extraConfig = mkDefault "HandleLidSwitch=ignore";
nixpkgs.config.packageOverrides = pkgs: rec { nixpkgs.config.packageOverrides = pkgs: rec {
awesome = pkgs.stdenv.lib.overrideDerivation pkgs.awesome (oldAttrs : { awesome = pkgs.stdenv.lib.overrideDerivation pkgs.awesome (oldAttrs : {
postFixup = '' postFixup = ''

14
makefu/2configs/hw/tp-x220.nix
View File

@ -16,10 +16,16 @@ with lib;
}; };
services.xserver.displayManager.sessionCommands ='' 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" 8 1
xinput set-int-prop "TPPS/2 IBM TrackPoint" "Evdev Wheel Emulation Button" 8 2 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-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 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"
''; '';
} }

16
makefu/2configs/hw/tp-x2x0.nix
View File

@ -18,18 +18,18 @@ with lib;
sensitivity = 220; sensitivity = 220;
speed = 220; speed = 220;
emulateWheel = true; emulateWheel = true;
}; };
services.tlp.enable = true; services.tlp.enable = true;
services.tlp.extraConfig = '' services.tlp.extraConfig = ''
START_CHARGE_THRESH_BAT0=80 START_CHARGE_THRESH_BAT0=80
CPU_SCALING_GOVERNOR_ON_AC=performance CPU_SCALING_GOVERNOR_ON_AC=performance
CPU_SCALING_GOVERNOR_ON_BAT=ondemand CPU_SCALING_GOVERNOR_ON_BAT=ondemand
CPU_MIN_PERF_ON_AC=0 CPU_MIN_PERF_ON_AC=0
CPU_MAX_PERF_ON_AC=100 CPU_MAX_PERF_ON_AC=100
CPU_MIN_PERF_ON_BAT=0 CPU_MIN_PERF_ON_BAT=0
CPU_MAX_PERF_ON_BAT=30 CPU_MAX_PERF_ON_BAT=30
''; '';
} }

5
makefu/2configs/main-laptop.nix
View File

@ -3,6 +3,7 @@
# stuff for the main laptop # stuff for the main laptop
# this is pretty much nice-to-have and does # this is pretty much nice-to-have and does
# not fit into base-gui # not fit into base-gui
# TODO split generic desktop stuff and laptop-specifics like lidswitching
with lib; with lib;
{ {
@ -17,8 +18,10 @@ with lib;
chromium chromium
keepassx keepassx
ntfs3g ntfs3g
at_spi2_core
gnome3.dconf
virtmanager virtmanager
at_spi2_core # dep for virtmanager? krebspaste
]; ];
services.redshift = { services.redshift = {

4
makefu/2configs/printer.nix
View File

@ -7,4 +7,8 @@
pkgs.samsungUnifiedLinuxDriver pkgs.samsungUnifiedLinuxDriver
]; ];
}; };
# scanners are printers just in reverse anyway
hardware.sane.enable = true;
hardware.sane.extraBackends = [ pkgs.samsungUnifiedLinuxDriver ];
} }

9
makefu/3modules/umts.nix
View File

@ -56,19 +56,12 @@ let
environment.wvdial.dialerDefaults = wvdial-defaults; environment.wvdial.dialerDefaults = wvdial-defaults;
systemd.targets.network-umts = {
description = "System is running on UMTS";
unitConfig.StopWhenUnneeded = true;
};
systemd.services.umts = { systemd.services.umts = {
description = "UMTS wvdial Service"; description = "UMTS wvdial Service";
before = [ "network-umts.target" ];
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
Restart = "always"; Restart = "always";
RestartSec = "4s"; RestartSec = "10s";
ExecStart = "${pkgs.wvdial}/bin/wvdial -n"; ExecStart = "${pkgs.wvdial}/bin/wvdial -n";
}; };
}; };