Merge remote-tracking branch 'cd/master'
This commit is contained in:
commit
403f567411
@ -164,10 +164,6 @@ types // rec {
|
|||||||
pubkey = mkOption {
|
pubkey = mkOption {
|
||||||
type = str;
|
type = str;
|
||||||
};
|
};
|
||||||
pubkeys = mkOption {
|
|
||||||
type = attrsOf str;
|
|
||||||
default = {};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -11,6 +11,8 @@ with lib;
|
|||||||
../2configs/hw/AO753.nix
|
../2configs/hw/AO753.nix
|
||||||
#../2configs/consul-server.nix
|
#../2configs/consul-server.nix
|
||||||
../2configs/git.nix
|
../2configs/git.nix
|
||||||
|
../2configs/pulse.nix
|
||||||
|
../2configs/xserver
|
||||||
{
|
{
|
||||||
tv.iptables = {
|
tv.iptables = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -11,7 +11,7 @@ with lib;
|
|||||||
source = {
|
source = {
|
||||||
git.nixpkgs = {
|
git.nixpkgs = {
|
||||||
url = mkDefault https://github.com/NixOS/nixpkgs;
|
url = mkDefault https://github.com/NixOS/nixpkgs;
|
||||||
rev = mkDefault "c44a593aa43bba6a0708f6f36065a514a5110613";
|
rev = mkDefault "b7ff0301d6f26bd8419e888fd0e129f3dc8bd328";
|
||||||
target-path = mkDefault "/var/src/nixpkgs";
|
target-path = mkDefault "/var/src/nixpkgs";
|
||||||
};
|
};
|
||||||
dir.secrets = {
|
dir.secrets = {
|
||||||
@ -142,7 +142,12 @@ with lib;
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.ssh.startAgent = false;
|
programs.ssh = {
|
||||||
|
extraConfig = ''
|
||||||
|
UseRoaming no
|
||||||
|
'';
|
||||||
|
startAgent = false;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
with lib;
|
||||||
let
|
let
|
||||||
pkg = pkgs.pulseaudioLight;
|
pkg = pkgs.pulseaudioLight;
|
||||||
runDir = "/run/pulse";
|
runDir = "/run/pulse";
|
||||||
@ -35,36 +36,43 @@ let
|
|||||||
in
|
in
|
||||||
|
|
||||||
{
|
{
|
||||||
systemd.tmpfiles.rules = [
|
|
||||||
"d ${runDir} 0750 pulse pulse - -"
|
|
||||||
"d ${runDir}/home 0700 pulse pulse - -"
|
|
||||||
];
|
|
||||||
|
|
||||||
system.activationScripts.pulseaudio-hack = ''
|
|
||||||
ln -fns ${clientConf} /etc/pulse/client.conf
|
|
||||||
'';
|
|
||||||
|
|
||||||
environment = {
|
environment = {
|
||||||
etc = {
|
etc = {
|
||||||
"asound.conf".source = alsaConf;
|
"asound.conf".source = alsaConf;
|
||||||
#"pulse/client.conf" = lib.mkForce { source = clientConf; };
|
# XXX mkForce is not strong enough (and neither is mkOverride) to create
|
||||||
|
# /etc/pulse/client.conf, see pulseaudio-hack below for a solution.
|
||||||
|
#"pulse/client.conf" = mkForce { source = clientConf; };
|
||||||
|
#"pulse/client.conf".source = mkForce clientConf;
|
||||||
"pulse/default.pa".source = configFile;
|
"pulse/default.pa".source = configFile;
|
||||||
};
|
};
|
||||||
systemPackages = [ pkg ];
|
systemPackages = [
|
||||||
|
pkg
|
||||||
|
] ++ optionals config.services.xserver.enable [
|
||||||
|
pkgs.pavucontrol
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# Allow PulseAudio to get realtime priority using rtkit.
|
# Allow PulseAudio to get realtime priority using rtkit.
|
||||||
security.rtkit.enable = true;
|
security.rtkit.enable = true;
|
||||||
|
|
||||||
|
system.activationScripts.pulseaudio-hack = ''
|
||||||
|
ln -fns ${clientConf} /etc/pulse/client.conf
|
||||||
|
'';
|
||||||
|
|
||||||
systemd.services.pulse = {
|
systemd.services.pulse = {
|
||||||
wantedBy = [ "sound.target" ];
|
wantedBy = [ "sound.target" ];
|
||||||
before = [ "sound.target" ];
|
before = [ "sound.target" ];
|
||||||
environment = {
|
environment = {
|
||||||
PULSE_RUNTIME_PATH = "${runDir}/home";
|
PULSE_RUNTIME_PATH = "${runDir}/home";
|
||||||
#DISPLAY = ":${toString config.services.xserver.display}";
|
|
||||||
};
|
};
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = "${pkg}/bin/pulseaudio";
|
ExecStart = "${pkg}/bin/pulseaudio";
|
||||||
|
ExecStartPre = pkgs.writeScript "pulse-start" ''
|
||||||
|
#! /bin/sh
|
||||||
|
install -o pulse -g pulse -m 0750 -d ${runDir}
|
||||||
|
install -o pulse -g pulse -m 0700 -d ${runDir}/home
|
||||||
|
'';
|
||||||
|
PermissionsStartOnly = "true";
|
||||||
User = "pulse";
|
User = "pulse";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -89,7 +89,7 @@ let
|
|||||||
\ | hi Normal ctermfg=White
|
\ | hi Normal ctermfg=White
|
||||||
|
|
||||||
au BufRead,BufNewFile *.hs so ${pkgs.writeText "hs.vim" ''
|
au BufRead,BufNewFile *.hs so ${pkgs.writeText "hs.vim" ''
|
||||||
syn region String start=+\[[^|]*|+ end=+|]+
|
syn region String start=+\[[[:alnum:]]*|+ end=+|]+
|
||||||
''}
|
''}
|
||||||
|
|
||||||
au BufRead,BufNewFile *.nix so ${pkgs.writeText "nix.vim" ''
|
au BufRead,BufNewFile *.nix so ${pkgs.writeText "nix.vim" ''
|
||||||
|
@ -37,7 +37,6 @@ let
|
|||||||
pkgs.ff
|
pkgs.ff
|
||||||
pkgs.gitAndTools.qgit
|
pkgs.gitAndTools.qgit
|
||||||
pkgs.mpv
|
pkgs.mpv
|
||||||
pkgs.pavucontrol
|
|
||||||
pkgs.slock
|
pkgs.slock
|
||||||
pkgs.sxiv
|
pkgs.sxiv
|
||||||
pkgs.xsel
|
pkgs.xsel
|
||||||
|
Loading…
Reference in New Issue
Block a user