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

update system, move to pipewire

Browse Source
This commit is contained in:
Dmitriy Kholkin 2021-03-17 23:06:12 +03:00
parent f9e43598b1
commit 01e4732257
13 changed files with 109 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
flake.lock generated
View File

@ -39,11 +39,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1613153184, "lastModified": 1615753545,
"narHash": "sha256-9ZIBmZuEjcxWON6zeEzCUfobTf/WTVQVOdg3gyNfhTw=", "narHash": "sha256-FR6vHvQlmQFAA26wNguEGWwav40Xgy9U6vRpT6UneTg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1ee1d01daa19b3a6d16b5fb680c31a2bc110ce24", "rev": "07f6c6481e0cbbcaf3447f43e964baf99465c8e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -71,11 +71,11 @@
"materia-theme": { "materia-theme": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1606538708, "lastModified": 1615115449,
"narHash": "sha256-Sje1j/k+g0MXP1wQi+KSVXIt1LQPeJ5KYJwfyxgmxPw=", "narHash": "sha256-Ee3ssXytFuKbWKMv/RCfD5FehSxrMwoos9Evmgljir8=",
"owner": "nana-4", "owner": "nana-4",
"repo": "materia-theme", "repo": "materia-theme",
"rev": "c63ca3285c4b5fcd652d1f054745251c60d4c32e", "rev": "3e2220a133746a7fc80b0f995a40ffda55443de0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -89,11 +89,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1612967703, "lastModified": 1615911544,
"narHash": "sha256-SAKaRKKDd1jM4fgbXUze+ynaHetHOPVkVrMfkRiA5XE=", "narHash": "sha256-2V0qJ9EaPjOetEzEx0vxP+dxKOX8ZXJi7PIlLjkxymA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "4e98f0345c144b9d85bed1f6b0bc509bf7ddc000", "rev": "66fa1c7375e4b3073a16df4678cf1d37446ed20b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -134,11 +134,11 @@
}, },
"nixpkgs-old": { "nixpkgs-old": {
"locked": { "locked": {
"lastModified": 1613208951, "lastModified": 1615879109,
"narHash": "sha256-pxDu+9KZBnZkMcKBqSAqw1oQwTIbxTeIwcMtygLsWio=", "narHash": "sha256-2FX/qmp6IX255zhJaYL6ClGIaCyJVh4sNDYcnT7TvJU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2118cf551b9944cfdb929b8ea03556f097dd0381", "rev": "36e15cd6e7d55ba143caf3dc930467ace573d85c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -150,11 +150,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1613447542, "lastModified": 1615938548,
"narHash": "sha256-jUnEQK7wi9G5q1lO1ITzgWEvkOiyCY//TwUGgimu0SI=", "narHash": "sha256-BYuu+UfFAuQFa2itTyT9lmzR9knjtF1z2npmZ4l8weY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3d0056a49140a29d0d782c5293c2c8f1e62c040d", "rev": "31ced622faa531aac45cd4484945cf1b2011060b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -164,11 +164,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1602702596, "lastModified": 1614309161,
"narHash": "sha256-fqJ4UgOb4ZUnCDIapDb4gCrtAah5Rnr2/At3IzMitig=", "narHash": "sha256-93kRxDPyEW9QIpxU71kCaV1r+hgOgP6/aVgC7vvO8IU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ad0d20345219790533ebe06571f82ed6b034db31", "rev": "0e499fde7af3c28d63e9b13636716b86c3162b93",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -179,11 +179,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1613226215, "lastModified": 1615797423,
"narHash": "sha256-3rA5cGIrBHD6yeKhNhsF7/t461ww25oJY8KyBb0IhjU=", "narHash": "sha256-5NGDZXPQzuoxf/42NiyC9YwwhwzfMfIRrz3aT0XHzSc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ff96a0fa5635770390b184ae74debea75c3fd534", "rev": "266dc8c3d052f549826ba246d06787a219533b8f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -229,11 +229,11 @@
"zsh-cod": { "zsh-cod": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1604780773, "lastModified": 1615111792,
"narHash": "sha256-FNtM2D7ALBWE3rNFiXfixKpXgT51jXMjUD3OpHShpuU=", "narHash": "sha256-kVK7PhYLcy0EJyhz6t3Mm554BdNrNQXAMHOFv2WhVLs=",
"owner": "dim-an", "owner": "dim-an",
"repo": "cod", "repo": "cod",
"rev": "e08812e3568d91dac7b0f71870893b8c73a694b2", "rev": "9096c4bd0b4a34121f35c323e174a139c30aa8f6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -245,11 +245,11 @@
"zsh-nix-shell": { "zsh-nix-shell": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1600944392, "lastModified": 1615130687,
"narHash": "sha256-C+6zHE0xDX2RndaR4T1b0hJ4xcf4bhBiADIc0amXw4M=", "narHash": "sha256-lo89ODpbE31Jannvj3D1ziscIf8JFfPkSniPYl17zJg=",
"owner": "chisui", "owner": "chisui",
"repo": "zsh-nix-shell", "repo": "zsh-nix-shell",
"rev": "5dc081265cdd0d03631e9dc20b5e656530ae3af2", "rev": "b6ac21e77d6d8e48f6ac08842345c8c9cd3460d5",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
flake.nix
View File

@ -3,6 +3,7 @@
inputs = { inputs = {
nixpkgs.url = github:nixos/nixpkgs/nixos-unstable; nixpkgs.url = github:nixos/nixpkgs/nixos-unstable;
# nixpkgs.url = github:AlukardBF/nixpkgs/nixos-unstable;
nixpkgs-old.url = github:nixos/nixpkgs/nixos-20.09; nixpkgs-old.url = github:nixos/nixpkgs/nixos-20.09;
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;

5
modules/applications/packages.nix
View File

@ -62,7 +62,7 @@ with config.deviceSpecific; {
gparted gparted
keepassxc keepassxc
pinta pinta
pulseeffects-legacy pulseeffects-pw
qbittorrent qbittorrent
quodlibet quodlibet
spotifywm spotifywm
@ -88,11 +88,12 @@ with config.deviceSpecific; {
# retroarch # retroarch
steam-run steam-run
(steam.override { withJava = true; }) (steam.override { withJava = true; })
multimc steam-run
] ++ lib.optionals isLaptop [ ] ++ lib.optionals isLaptop [
# acpi # acpi
# blueman # blueman
] ++ lib.optionals (config.device == "AMD-Workstation") [ ] ++ lib.optionals (config.device == "AMD-Workstation") [
multimc
# xonar-fp # xonar-fp
# Android dev # Android dev
# androidenv.androidPkgs_9_0.androidsdk # androidenv.androidPkgs_9_0.androidsdk

3
modules/default.nix
View File

@ -14,6 +14,8 @@ builtins.listToAttrs (builtins.map (path: {
./applications/urxvt.nix ./applications/urxvt.nix
./applications/vscode.nix ./applications/vscode.nix
# ./sound/pulseeffects
# ./workspace/barrier.nix # ./workspace/barrier.nix
./workspace/cursor.nix ./workspace/cursor.nix
./workspace/dunst.nix ./workspace/dunst.nix
@ -28,7 +30,6 @@ builtins.listToAttrs (builtins.map (path: {
./workspace/locale.nix ./workspace/locale.nix
./workspace/misc.nix ./workspace/misc.nix
./workspace/picom.nix ./workspace/picom.nix
./workspace/pulseeffects
./workspace/ssh.nix ./workspace/ssh.nix
./workspace/xresources.nix ./workspace/xresources.nix
./workspace/zsh.nix ./workspace/zsh.nix

34
modules/overlay.nix
View File

@ -8,6 +8,8 @@ let
in in
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
# (import "${inputs.nixpkgs-mozilla}/lib-overlay.nix")
(import "${inputs.nixpkgs-mozilla}/rust-overlay.nix")
(self: super: (self: super:
rec { rec {
inherit inputs; inherit inputs;
@ -23,14 +25,30 @@ in
bibata-cursors = pkgs.callPackage ./packages/bibata-cursors.nix { }; bibata-cursors = pkgs.callPackage ./packages/bibata-cursors.nix { };
spotifyd = pkgs.callPackage ./packages/spotifyd.nix { }; spotifyd = pkgs.callPackage ./packages/spotifyd.nix { };
# UPDATE # UPDATE
vivaldi = super.vivaldi.overrideAttrs (old: rec { # vivaldi = super.vivaldi.overrideAttrs (old: rec {
version = "3.6.2165.36-1"; # version = "3.6.2165.36-1";
src = super.fetchurl { # src = super.fetchurl {
url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}_amd64.deb"; # url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}_amd64.deb";
sha256 = "1wgxzggy5sg98k4lzd34k4hyw2jgc14db41z7s7j3c5whlnifh08"; # sha256 = "1wgxzggy5sg98k4lzd34k4hyw2jgc14db41z7s7j3c5whlnifh08";
# };
# });
multimc = super.multimc.overrideAttrs (old: rec {
version = "unstable-2021-02-10";
src = super.fetchFromGitHub {
owner = "AlukardBF";
repo = "MultiMC5-Cracked";
rev = "e377b4d11c8ce7fc71442e4a84a0f93a1579e9e6";
sha256 = "eES2UndRLQ4sNdxufcE8pOmzUWXzWsayVm21ClXRVP4=";
fetchSubmodules = true;
}; };
}); });
rust-stable = pkgs.latest.rustChannels.stable.rust.override {
extensions = [
"rls-preview"
"clippy-preview"
"rustfmt-preview"
];
};
# material-icons = pkgs.callPackage ./packages/material-icons-inline.nix { }; # material-icons = pkgs.callPackage ./packages/material-icons-inline.nix { };
# wpgtk = super.wpgtk.overrideAttrs (old: rec { # wpgtk = super.wpgtk.overrideAttrs (old: rec {
# propagatedBuildInputs = with pkgs; [ # propagatedBuildInputs = with pkgs; [
@ -46,4 +64,8 @@ in
allowUnfree = true; allowUnfree = true;
android_sdk.accept_license = true; android_sdk.accept_license = true;
}; };
home-manager.users.alukard.xdg.configFile."nixpkgs/config.nix".text = ''
{ allowUnfree = true; }
'';
} }

4
modules/sound/default.nix
View File

@ -2,7 +2,9 @@
sound.enable = true; sound.enable = true;
imports = [ imports = [
./pulseaudio.nix ./pipewire.nix
./pulseeffects
# ./pulseaudio.nix
# ./mopidy.nix # ./mopidy.nix
]; ];

37
modules/sound/pipewire.nix Normal file
View File

@ -0,0 +1,37 @@
{ pkgs, lib, ... }: {
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
jack.enable = true;
# config = { };
# media-session = {
# enable = true;
# # config = { };
# alsaMonitorConfig = {
# rules = [
# {
# matches = [
# { node.name = "~alsa_input.*"; }
# { node.name = "~alsa_output.*"; }
# ];
# actions = {
# update-props = {
# resample.quality = 6;
# audio.rate = 48000;
# };
# };
# }
# ];
# };
# };
};
security.rtkit.enable = true;
home-manager.users.alukard.home.packages = [ pkgs.pavucontrol pkgs.pulseaudio ];
hardware.pulseaudio.enable = lib.mkForce false;
services.jack.jackd.enable = lib.mkForce false;
}

3
modules/sound/pulseaudio.nix
View File

@ -33,6 +33,9 @@
default-fragment-size-msec = "10"; default-fragment-size-msec = "10";
deferred-volume-safety-margin-usec = "1"; deferred-volume-safety-margin-usec = "1";
# FIXIT
enable-memfd = "no";
}; };
}; };
} }

0
modules/workspace/pulseeffects/ATH-M50_Harman.json → modules/sound/pulseeffects/ATH-M50_Harman.json
View File

0
modules/workspace/pulseeffects/HE4XX.json → modules/sound/pulseeffects/HE4XX.json
View File

0
modules/workspace/pulseeffects/HE4XX_Harman.json → modules/sound/pulseeffects/HE4XX_Harman.json
View File

7
modules/workspace/pulseeffects/default.nix → modules/sound/pulseeffects/default.nix
View File

@ -7,11 +7,12 @@
(builtins.readFile ./HE4XX.json); (builtins.readFile ./HE4XX.json);
systemd.user.services."pulseeffects" = { systemd.user.services."pulseeffects" = {
after = [ "sound.target" ]; after = [ "sound.target" "pipewire-pulse.service" ];
description = "PulseEffects daemon"; description = "PulseEffects daemon";
wantedBy = [ "default.target" ]; wantedBy = [ "default.target" ];
path = [ pkgs.pulseeffects-legacy ]; path = [ pkgs.pulseeffects-pw ];
serviceConfig.ExecStart = "${pkgs.pulseeffects-legacy}/bin/pulseeffects --gapplication-service"; serviceConfig.ExecStart = "${pkgs.pulseeffects-pw}/bin/pulseeffects --gapplication-service";
serviceConfig.ExecStop = "${pkgs.pulseeffects-pw}/bin/pulseeffects --quit";
serviceConfig.Restart = "on-failure"; serviceConfig.Restart = "on-failure";
}; };
} }

2
profiles/desktop.nix
View File

@ -33,7 +33,7 @@
kde kde
light light
picom picom
pulseeffects # pulseeffects
xresources xresources
]; ];
} }