AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

usdate system and pulseaudio

Browse Source
This commit is contained in:
Dmitriy Kholkin 2021-02-17 01:03:23 +03:00
parent a75b704ae5
commit 1cbcbabed7
5 changed files with 27 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
flake.lock generated
View File

@ -5,11 +5,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1597074767, "lastModified": 1612815054,
"narHash": "sha256-WrctYb/drpAsxvBJLDbA+wPCEx9fVDoHHKTMnjVZ4ZU=", "narHash": "sha256-5FA1MW0sLGBUuEOq25iXx7f17TPE1+FLlL+ah7nLIP0=",
"owner": "alukardbf", "owner": "alukardbf",
"repo": "base16-nix", "repo": "base16-nix",
"rev": "d2a9a9a8cf652049f02bbd8671684d8a3e4fcc24", "rev": "f35d18e9912423e99d62c1d29529f518bdb5ce1d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -39,11 +39,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1612646749, "lastModified": 1613153184,
"narHash": "sha256-m2o9E4PHMJHRrp9udYfPp/onqY9flMD2dTKJuhvp7TM=", "narHash": "sha256-9ZIBmZuEjcxWON6zeEzCUfobTf/WTVQVOdg3gyNfhTw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6dfa9ef85cf4e23ec42f34c9e988baaf793617a1", "rev": "1ee1d01daa19b3a6d16b5fb680c31a2bc110ce24",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -89,11 +89,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1612537053, "lastModified": 1612967703,
"narHash": "sha256-3y05uB7OkEtWngIKYx+xiY+oG+1QPvRROJkKBxO1XFc=", "narHash": "sha256-SAKaRKKDd1jM4fgbXUze+ynaHetHOPVkVrMfkRiA5XE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "480426a364f09e7992230b32f2941a09fb52d729", "rev": "4e98f0345c144b9d85bed1f6b0bc509bf7ddc000",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -134,11 +134,11 @@
}, },
"nixpkgs-old": { "nixpkgs-old": {
"locked": { "locked": {
"lastModified": 1612568312, "lastModified": 1613208951,
"narHash": "sha256-DbJ2aiZaFBYUTscEfjOqW/v1bCSE35X2g0rfmQQLEUs=", "narHash": "sha256-pxDu+9KZBnZkMcKBqSAqw1oQwTIbxTeIwcMtygLsWio=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "22a2b332378b99461edeaf9754dc2d6b4a210148", "rev": "2118cf551b9944cfdb929b8ea03556f097dd0381",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -150,11 +150,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1612647598, "lastModified": 1613447542,
"narHash": "sha256-XAXgwTCxwvHxhvSKWSwkA0FGsRepTgoXHwHNx2ww5sg=", "narHash": "sha256-jUnEQK7wi9G5q1lO1ITzgWEvkOiyCY//TwUGgimu0SI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d1dc3064b974503e9f90d5bceaf0a3b4b030b86d", "rev": "3d0056a49140a29d0d782c5293c2c8f1e62c040d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -179,11 +179,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1612545171, "lastModified": 1613226215,
"narHash": "sha256-AZkSuO7H055eDD4KWBEDCX/R5fvw0vUMCErvQvYSEhA=", "narHash": "sha256-3rA5cGIrBHD6yeKhNhsF7/t461ww25oJY8KyBb0IhjU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "536fe36e23ab0fc8b7f35c24603422eee9fc17a2", "rev": "ff96a0fa5635770390b184ae74debea75c3fd534",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -204,29 +204,12 @@
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"nixpkgs-mozilla": "nixpkgs-mozilla", "nixpkgs-mozilla": "nixpkgs-mozilla",
"nixpkgs-old": "nixpkgs-old", "nixpkgs-old": "nixpkgs-old",
"spotify-tui": "spotify-tui",
"zsh-autosuggestions": "zsh-autosuggestions", "zsh-autosuggestions": "zsh-autosuggestions",
"zsh-cod": "zsh-cod", "zsh-cod": "zsh-cod",
"zsh-nix-shell": "zsh-nix-shell", "zsh-nix-shell": "zsh-nix-shell",
"zsh-you-should-use": "zsh-you-should-use" "zsh-you-should-use": "zsh-you-should-use"
} }
}, },
"spotify-tui": {
"flake": false,
"locked": {
"lastModified": 1612427519,
"narHash": "sha256-9N+0DUsCNZhw4QViJxmbTWxvFV9X6wyrzlYVjtHhJG8=",
"owner": "Rigellute",
"repo": "spotify-tui",
"rev": "38c095884919bebc6c592d3662ddd1f9a93131f1",
"type": "github"
},
"original": {
"owner": "Rigellute",
"repo": "spotify-tui",
"type": "github"
}
},
"zsh-autosuggestions": { "zsh-autosuggestions": {
"flake": false, "flake": false,
"locked": { "locked": {

34
flake.nix
View File

@ -3,12 +3,9 @@
inputs = { inputs = {
nixpkgs.url = github:nixos/nixpkgs/nixos-unstable; nixpkgs.url = github:nixos/nixpkgs/nixos-unstable;
# nixpkgs-old.url = github:nixos/nixpkgs/nixos-20.09;
nixpkgs-old.url = github:nixos/nixpkgs/nixos-20.09; nixpkgs-old.url = github:nixos/nixpkgs/nixos-20.09;
# nix.url = github:nixos/nix/6ff9aa8df7ce8266147f74c65e2cc529a1e72ce0;
home-manager.url = github:nix-community/home-manager; home-manager.url = github:nix-community/home-manager;
base16.url = github:alukardbf/base16-nix; base16.url = github:alukardbf/base16-nix;
# base16.url = "/media/base16";
base16-horizon-scheme = { base16-horizon-scheme = {
url = github:michael-ball/base16-horizon-scheme; url = github:michael-ball/base16-horizon-scheme;
flake = false; flake = false;
@ -37,10 +34,6 @@
url = github:yvbbrjdr/i3lock-fancy-rapid; url = github:yvbbrjdr/i3lock-fancy-rapid;
flake = false; flake = false;
}; };
spotify-tui = {
url = github:Rigellute/spotify-tui;
flake = false;
};
nixpkgs-mozilla = { nixpkgs-mozilla = {
url = github:mozilla/nixpkgs-mozilla; url = github:mozilla/nixpkgs-mozilla;
flake = false; flake = false;
@ -56,33 +49,6 @@
let let
hosts = builtins.attrNames (builtins.readDir ./machines); hosts = builtins.attrNames (builtins.readDir ./machines);
mkHost = name: let mkHost = name: let
# pkgs = inputs.nixpkgs.legacyPackages.${system};
# inherit (inputs.nixpkgs) lib;
# specialArgsOld = {
# inherit inputs;
# };
# specialArgs = specialArgsOld // {
# inherit name;
# };
# hm-nixos-as-super = { config, ... }: {
# options.home-manager.users = lib.mkOption {
# type = lib.types.attrsOf (lib.types.submoduleWith {
# modules = [ ];
# specialArgs = specialArgsOld // {
# super = config;
# };
# });
# };
# };
# modules = [
# (import ./default.nix)
# inputs.home-manager.nixosModules.home-manager
# hm-nixos-as-super
# ];
system = builtins.readFile (./machines + "/${name}/system"); system = builtins.readFile (./machines + "/${name}/system");
modules = [ (import (./machines + "/${name}")) { device = name; } ]; modules = [ (import (./machines + "/${name}")) { device = name; } ];
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };

2
modules/applications/packages.nix
View File

@ -59,7 +59,7 @@ with config.deviceSpecific; {
gparted gparted
keepassxc keepassxc
pinta pinta
pulseeffects pulseeffects-legacy
qbittorrent qbittorrent
spotifywm spotifywm
system-config-printer system-config-printer

12
modules/sound/pulseaudio.nix
View File

@ -9,28 +9,28 @@
anonymousClients.allowedIpRanges = ["127.0.0.1"]; anonymousClients.allowedIpRanges = ["127.0.0.1"];
}; };
daemon.config = { daemon.config = {
avoid-resampling = "yes";
high-priority = "yes"; high-priority = "yes";
nice-level = "-17"; nice-level = "-15";
realtime-scheduling = "yes"; realtime-scheduling = "yes";
realtime-priority = "9"; realtime-priority = "9";
resample-method = "speex-float-8"; resample-method = "speex-float-8";
enable-lfe-remixing = "no"; avoid-resampling = "yes";
enable-lfe-remixing = "no";
flat-volumes = "no"; flat-volumes = "no";
rlimit-rtprio = "9"; rlimit-rtprio = "9";
default-sample-format = "float32le"; default-sample-format = "float32le";
default-sample-rate = "44100"; default-sample-rate = "48000";
alternate-sample-rate = "96000"; alternate-sample-rate = "96000";
default-sample-channels = "2"; default-sample-channels = "2";
default-channel-map = "front-left,front-right"; default-channel-map = "front-left,front-right";
default-fragments = "2"; default-fragments = "2";
default-fragment-size-msec = "125"; default-fragment-size-msec = "10";
deferred-volume-safety-margin-usec = "1"; deferred-volume-safety-margin-usec = "1";
}; };

5
modules/workspace/pulseeffects/default.nix
View File

@ -1,5 +1,4 @@
{ config, lib, pkgs, ... }: { { config, lib, pkgs, ... }: {
# home-manager.users.alukard.xdg.configFile."PulseEffects/output/ATH-M50.json".source = ./ATH-M50.json;
home-manager.users.alukard.xdg.configFile."PulseEffects/output/ATH-M50_Harman.json".text = home-manager.users.alukard.xdg.configFile."PulseEffects/output/ATH-M50_Harman.json".text =
(builtins.readFile ./ATH-M50_Harman.json); (builtins.readFile ./ATH-M50_Harman.json);
home-manager.users.alukard.xdg.configFile."PulseEffects/output/HE4XX_Harman.json".text = home-manager.users.alukard.xdg.configFile."PulseEffects/output/HE4XX_Harman.json".text =
@ -11,8 +10,8 @@
after = [ "sound.target" ]; after = [ "sound.target" ];
description = "PulseEffects daemon"; description = "PulseEffects daemon";
wantedBy = [ "default.target" ]; wantedBy = [ "default.target" ];
path = [ pkgs.pulseeffects ]; path = [ pkgs.pulseeffects-legacy ];
serviceConfig.ExecStart = "${pkgs.pulseeffects}/bin/pulseeffects --gapplication-service"; serviceConfig.ExecStart = "${pkgs.pulseeffects-legacy}/bin/pulseeffects --gapplication-service";
serviceConfig.Restart = "on-failure"; serviceConfig.Restart = "on-failure";
}; };
} }