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

Merge remote-tracking branch 'gum/master'

Browse Source
This commit is contained in:
lassulus 2018-06-13 21:25:24 +02:00
commit 006a3174ec
9 changed files with 77 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
makefu/1systems/omo/source.nix
View File

@ -1,3 +1,4 @@
import <stockholm/makefu/source.nix> {
name="omo";
torrent = true;
}

47
makefu/1systems/x/config.nix
View File

@ -19,6 +19,7 @@ with import <stockholm/lib>;
# Debugging
# <stockholm/makefu/2configs/disable_v6.nix>
# <stockholm/makefu/2configs/pyload.nix>
# Testing
# <stockholm/makefu/2configs/deployment/gitlab.nix>
@ -67,7 +68,9 @@ with import <stockholm/lib>;
# <stockholm/makefu/2configs/hw/rtl8812au.nix>
<stockholm/makefu/2configs/hw/network-manager.nix>
<stockholm/makefu/2configs/hw/stk1160.nix>
# <stockholm/makefu/2configs/rad1o.nix>
<stockholm/makefu/2configs/hw/irtoy.nix>
<stockholm/makefu/2configs/hw/bluetooth.nix>
# <stockholm/makefu/2configs/hw/rad1o.nix>
# Filesystem
<stockholm/makefu/2configs/fs/sda-crypto-root-home.nix>
@ -103,44 +106,9 @@ with import <stockholm/lib>;
];
};
}
{ # bluetooth+pulse config
# for blueman-applet
users.users.makefu.packages = [
pkgs.blueman
];
hardware.pulseaudio = {
enable = true;
package = pkgs.pulseaudioFull;
# systemWide = true;
support32Bit = true;
configFile = pkgs.writeText "default.pa" ''
load-module module-udev-detect
load-module module-bluetooth-policy
load-module module-bluetooth-discover
load-module module-native-protocol-unix
load-module module-always-sink
load-module module-console-kit
load-module module-systemd-login
load-module module-intended-roles
load-module module-position-event-sounds
load-module module-filter-heuristics
load-module module-filter-apply
load-module module-switch-on-connect
load-module module-switch-on-port-available
'';
};
# presumably a2dp Sink
# Enable profile:
## pacmd set-card-profile "$(pactl list cards short | egrep -o bluez_card[[:alnum:]._]+)" a2dp_sink
hardware.bluetooth.extraConfig = '';
[general]
Enable=Source,Sink,Media,Socket
'';
# connect via https://nixos.wiki/wiki/Bluetooth#Using_Bluetooth_headsets_with_PulseAudio
hardware.bluetooth.enable = true;
}
# {
# services.zerotierone.enable = true;
# }
];
@ -166,7 +134,6 @@ with import <stockholm/lib>;
# hard dependency because otherwise the device will not be unlocked
boot.initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }];
nix.package = pkgs.nixUnstable;
environment.systemPackages = [ pkgs.passwdqc-utils pkgs.nixUnstable ];
nixpkgs.overlays = [ (import <python/overlay.nix>) ];

39
makefu/2configs/hw/bluetooth.nix Normal file
View File

@ -0,0 +1,39 @@
{ pkgs, ... }:
{ # bluetooth+pulse config
# for blueman-applet
users.users.makefu.packages = [
pkgs.blueman
];
hardware.pulseaudio = {
enable = true;
package = pkgs.pulseaudioFull;
# systemWide = true;
support32Bit = true;
configFile = pkgs.writeText "default.pa" ''
load-module module-udev-detect
load-module module-bluetooth-policy
load-module module-bluetooth-discover
load-module module-native-protocol-unix
load-module module-always-sink
load-module module-console-kit
load-module module-systemd-login
load-module module-intended-roles
load-module module-position-event-sounds
load-module module-filter-heuristics
load-module module-filter-apply
load-module module-switch-on-connect
load-module module-switch-on-port-available
'';
};
# presumably a2dp Sink
# Enable profile:
## pacmd set-card-profile "$(pactl list cards short | egrep -o bluez_card[[:alnum:]._]+)" a2dp_sink
hardware.bluetooth.extraConfig = '';
[general]
Enable=Source,Sink,Media,Socket
'';
# connect via https://nixos.wiki/wiki/Bluetooth#Using_Bluetooth_headsets_with_PulseAudio
hardware.bluetooth.enable = true;
}

15
makefu/2configs/hw/irtoy.nix Normal file
View File

@ -0,0 +1,15 @@
{ config, lib, pkgs, ... }:
{
users.users.makefu.packages = with pkgs; [
lirc
];
users.extraUsers.${config.krebs.build.user.name}.extraGroups = [ "dialout" ];
services.udev.extraRules = ''
SUBSYSTEMS=="usb", ATTRS{idProduct}=="fd08", ATTRS{idVendor}=="04d8", SYMLINK+="irtoy", MODE="0666", GROUP="dialout"
'';
}

0
makefu/2configs/rad1o.nix → makefu/2configs/hw/rad1o.nix
View File

1
makefu/2configs/tools/all.nix
View File

@ -5,6 +5,7 @@
./core.nix
./core-gui.nix
./dev.nix
./desktop.nix
./extra-gui.nix
./games.nix
./media.nix

9
makefu/2configs/tools/core.nix
View File

@ -24,7 +24,6 @@
# io
pv
sshpass
usbutils
p7zip
hdparm
@ -39,11 +38,6 @@
wol
iftop
mkpasswd
mutt
weechat
tmux
# stockholm
git
gnumake
@ -55,8 +49,5 @@
rxvt_unicode.terminfo
krebspaste
# TODO:
taskwarrior
pass
];
}

11
makefu/2configs/tools/desktop.nix Normal file
View File

@ -0,0 +1,11 @@
{ pkgs, ... }:
{
users.users.makefu.packages = with pkgs; [
taskwarrior
pass
mutt
weechat
tmux
];
}

5
makefu/source.nix
View File

@ -23,8 +23,9 @@ let
];
};
# TODO: automate updating of this ref + cherry-picks
ref = "a09afbfb8a4"; # nixos-18.03 @ 2018-04-04
# + do_sqlite3 ruby: 55a952be5b5
ref = "60b6ab055ad"; # nixos-18.03 @ 2018-05-31
# + do_sqlite3 ruby: 55a952be5b5
# + exfat-nofuse bump: ee6a5296a35
in
evalSource (toString _file) [