diff --git a/flake.lock b/flake.lock index 8367fa3..03a9172 100644 --- a/flake.lock +++ b/flake.lock @@ -39,11 +39,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1613153184, - "narHash": "sha256-9ZIBmZuEjcxWON6zeEzCUfobTf/WTVQVOdg3gyNfhTw=", + "lastModified": 1615753545, + "narHash": "sha256-FR6vHvQlmQFAA26wNguEGWwav40Xgy9U6vRpT6UneTg=", "owner": "nix-community", "repo": "home-manager", - "rev": "1ee1d01daa19b3a6d16b5fb680c31a2bc110ce24", + "rev": "07f6c6481e0cbbcaf3447f43e964baf99465c8e1", "type": "github" }, "original": { @@ -71,11 +71,11 @@ "materia-theme": { "flake": false, "locked": { - "lastModified": 1606538708, - "narHash": "sha256-Sje1j/k+g0MXP1wQi+KSVXIt1LQPeJ5KYJwfyxgmxPw=", + "lastModified": 1615115449, + "narHash": "sha256-Ee3ssXytFuKbWKMv/RCfD5FehSxrMwoos9Evmgljir8=", "owner": "nana-4", "repo": "materia-theme", - "rev": "c63ca3285c4b5fcd652d1f054745251c60d4c32e", + "rev": "3e2220a133746a7fc80b0f995a40ffda55443de0", "type": "github" }, "original": { @@ -89,11 +89,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1612967703, - "narHash": "sha256-SAKaRKKDd1jM4fgbXUze+ynaHetHOPVkVrMfkRiA5XE=", + "lastModified": 1615911544, + "narHash": "sha256-2V0qJ9EaPjOetEzEx0vxP+dxKOX8ZXJi7PIlLjkxymA=", "owner": "NixOS", "repo": "nix", - "rev": "4e98f0345c144b9d85bed1f6b0bc509bf7ddc000", + "rev": "66fa1c7375e4b3073a16df4678cf1d37446ed20b", "type": "github" }, "original": { @@ -134,11 +134,11 @@ }, "nixpkgs-old": { "locked": { - "lastModified": 1613208951, - "narHash": "sha256-pxDu+9KZBnZkMcKBqSAqw1oQwTIbxTeIwcMtygLsWio=", + "lastModified": 1615879109, + "narHash": "sha256-2FX/qmp6IX255zhJaYL6ClGIaCyJVh4sNDYcnT7TvJU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2118cf551b9944cfdb929b8ea03556f097dd0381", + "rev": "36e15cd6e7d55ba143caf3dc930467ace573d85c", "type": "github" }, "original": { @@ -150,11 +150,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1613447542, - "narHash": "sha256-jUnEQK7wi9G5q1lO1ITzgWEvkOiyCY//TwUGgimu0SI=", + "lastModified": 1615938548, + "narHash": "sha256-BYuu+UfFAuQFa2itTyT9lmzR9knjtF1z2npmZ4l8weY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3d0056a49140a29d0d782c5293c2c8f1e62c040d", + "rev": "31ced622faa531aac45cd4484945cf1b2011060b", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1602702596, - "narHash": "sha256-fqJ4UgOb4ZUnCDIapDb4gCrtAah5Rnr2/At3IzMitig=", + "lastModified": 1614309161, + "narHash": "sha256-93kRxDPyEW9QIpxU71kCaV1r+hgOgP6/aVgC7vvO8IU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad0d20345219790533ebe06571f82ed6b034db31", + "rev": "0e499fde7af3c28d63e9b13636716b86c3162b93", "type": "github" }, "original": { @@ -179,11 +179,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1613226215, - "narHash": "sha256-3rA5cGIrBHD6yeKhNhsF7/t461ww25oJY8KyBb0IhjU=", + "lastModified": 1615797423, + "narHash": "sha256-5NGDZXPQzuoxf/42NiyC9YwwhwzfMfIRrz3aT0XHzSc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ff96a0fa5635770390b184ae74debea75c3fd534", + "rev": "266dc8c3d052f549826ba246d06787a219533b8f", "type": "github" }, "original": { @@ -229,11 +229,11 @@ "zsh-cod": { "flake": false, "locked": { - "lastModified": 1604780773, - "narHash": "sha256-FNtM2D7ALBWE3rNFiXfixKpXgT51jXMjUD3OpHShpuU=", + "lastModified": 1615111792, + "narHash": "sha256-kVK7PhYLcy0EJyhz6t3Mm554BdNrNQXAMHOFv2WhVLs=", "owner": "dim-an", "repo": "cod", - "rev": "e08812e3568d91dac7b0f71870893b8c73a694b2", + "rev": "9096c4bd0b4a34121f35c323e174a139c30aa8f6", "type": "github" }, "original": { @@ -245,11 +245,11 @@ "zsh-nix-shell": { "flake": false, "locked": { - "lastModified": 1600944392, - "narHash": "sha256-C+6zHE0xDX2RndaR4T1b0hJ4xcf4bhBiADIc0amXw4M=", + "lastModified": 1615130687, + "narHash": "sha256-lo89ODpbE31Jannvj3D1ziscIf8JFfPkSniPYl17zJg=", "owner": "chisui", "repo": "zsh-nix-shell", - "rev": "5dc081265cdd0d03631e9dc20b5e656530ae3af2", + "rev": "b6ac21e77d6d8e48f6ac08842345c8c9cd3460d5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f1f7bf1..3b3ecf7 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs.url = github:nixos/nixpkgs/nixos-unstable; + # nixpkgs.url = github:AlukardBF/nixpkgs/nixos-unstable; nixpkgs-old.url = github:nixos/nixpkgs/nixos-20.09; home-manager.url = github:nix-community/home-manager; base16.url = github:alukardbf/base16-nix; diff --git a/modules/applications/packages.nix b/modules/applications/packages.nix index 69f5533..e593f26 100644 --- a/modules/applications/packages.nix +++ b/modules/applications/packages.nix @@ -62,7 +62,7 @@ with config.deviceSpecific; { gparted keepassxc pinta - pulseeffects-legacy + pulseeffects-pw qbittorrent quodlibet spotifywm @@ -88,11 +88,12 @@ with config.deviceSpecific; { # retroarch steam-run (steam.override { withJava = true; }) - multimc + steam-run ] ++ lib.optionals isLaptop [ # acpi # blueman ] ++ lib.optionals (config.device == "AMD-Workstation") [ + multimc # xonar-fp # Android dev # androidenv.androidPkgs_9_0.androidsdk diff --git a/modules/default.nix b/modules/default.nix index a3f17cb..2139488 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -14,6 +14,8 @@ builtins.listToAttrs (builtins.map (path: { ./applications/urxvt.nix ./applications/vscode.nix + # ./sound/pulseeffects + # ./workspace/barrier.nix ./workspace/cursor.nix ./workspace/dunst.nix @@ -28,7 +30,6 @@ builtins.listToAttrs (builtins.map (path: { ./workspace/locale.nix ./workspace/misc.nix ./workspace/picom.nix - ./workspace/pulseeffects ./workspace/ssh.nix ./workspace/xresources.nix ./workspace/zsh.nix diff --git a/modules/overlay.nix b/modules/overlay.nix index 263de1a..772e55e 100644 --- a/modules/overlay.nix +++ b/modules/overlay.nix @@ -8,6 +8,8 @@ let in { nixpkgs.overlays = [ + # (import "${inputs.nixpkgs-mozilla}/lib-overlay.nix") + (import "${inputs.nixpkgs-mozilla}/rust-overlay.nix") (self: super: rec { inherit inputs; @@ -23,14 +25,30 @@ in bibata-cursors = pkgs.callPackage ./packages/bibata-cursors.nix { }; spotifyd = pkgs.callPackage ./packages/spotifyd.nix { }; # UPDATE - vivaldi = super.vivaldi.overrideAttrs (old: rec { - version = "3.6.2165.36-1"; - src = super.fetchurl { - url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}_amd64.deb"; - sha256 = "1wgxzggy5sg98k4lzd34k4hyw2jgc14db41z7s7j3c5whlnifh08"; + # vivaldi = super.vivaldi.overrideAttrs (old: rec { + # version = "3.6.2165.36-1"; + # src = super.fetchurl { + # url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}_amd64.deb"; + # 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 { }; # wpgtk = super.wpgtk.overrideAttrs (old: rec { # propagatedBuildInputs = with pkgs; [ @@ -46,4 +64,8 @@ in allowUnfree = true; android_sdk.accept_license = true; }; + + home-manager.users.alukard.xdg.configFile."nixpkgs/config.nix".text = '' + { allowUnfree = true; } + ''; } diff --git a/modules/sound/default.nix b/modules/sound/default.nix index 3ec7319..bd8b9ec 100644 --- a/modules/sound/default.nix +++ b/modules/sound/default.nix @@ -2,7 +2,9 @@ sound.enable = true; imports = [ - ./pulseaudio.nix + ./pipewire.nix + ./pulseeffects + # ./pulseaudio.nix # ./mopidy.nix ]; diff --git a/modules/sound/pipewire.nix b/modules/sound/pipewire.nix new file mode 100644 index 0000000..6c2d373 --- /dev/null +++ b/modules/sound/pipewire.nix @@ -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; +} \ No newline at end of file diff --git a/modules/sound/pulseaudio.nix b/modules/sound/pulseaudio.nix index 4c98feb..5825dd1 100644 --- a/modules/sound/pulseaudio.nix +++ b/modules/sound/pulseaudio.nix @@ -33,6 +33,9 @@ default-fragment-size-msec = "10"; deferred-volume-safety-margin-usec = "1"; + + # FIXIT + enable-memfd = "no"; }; }; } \ No newline at end of file diff --git a/modules/workspace/pulseeffects/ATH-M50_Harman.json b/modules/sound/pulseeffects/ATH-M50_Harman.json similarity index 100% rename from modules/workspace/pulseeffects/ATH-M50_Harman.json rename to modules/sound/pulseeffects/ATH-M50_Harman.json diff --git a/modules/workspace/pulseeffects/HE4XX.json b/modules/sound/pulseeffects/HE4XX.json similarity index 100% rename from modules/workspace/pulseeffects/HE4XX.json rename to modules/sound/pulseeffects/HE4XX.json diff --git a/modules/workspace/pulseeffects/HE4XX_Harman.json b/modules/sound/pulseeffects/HE4XX_Harman.json similarity index 100% rename from modules/workspace/pulseeffects/HE4XX_Harman.json rename to modules/sound/pulseeffects/HE4XX_Harman.json diff --git a/modules/workspace/pulseeffects/default.nix b/modules/sound/pulseeffects/default.nix similarity index 68% rename from modules/workspace/pulseeffects/default.nix rename to modules/sound/pulseeffects/default.nix index 3e095c5..3d254bb 100644 --- a/modules/workspace/pulseeffects/default.nix +++ b/modules/sound/pulseeffects/default.nix @@ -7,11 +7,12 @@ (builtins.readFile ./HE4XX.json); systemd.user.services."pulseeffects" = { - after = [ "sound.target" ]; + after = [ "sound.target" "pipewire-pulse.service" ]; description = "PulseEffects daemon"; wantedBy = [ "default.target" ]; - path = [ pkgs.pulseeffects-legacy ]; - serviceConfig.ExecStart = "${pkgs.pulseeffects-legacy}/bin/pulseeffects --gapplication-service"; + path = [ pkgs.pulseeffects-pw ]; + serviceConfig.ExecStart = "${pkgs.pulseeffects-pw}/bin/pulseeffects --gapplication-service"; + serviceConfig.ExecStop = "${pkgs.pulseeffects-pw}/bin/pulseeffects --quit"; serviceConfig.Restart = "on-failure"; }; } \ No newline at end of file diff --git a/profiles/desktop.nix b/profiles/desktop.nix index 031f2f6..891a8df 100644 --- a/profiles/desktop.nix +++ b/profiles/desktop.nix @@ -33,7 +33,7 @@ kde light picom - pulseeffects + # pulseeffects xresources ]; }