From f60a0bc019fb47fca5aa334ae0f838facdcaa12e Mon Sep 17 00:00:00 2001 From: teutat3s Date: Thu, 18 May 2023 00:04:39 +0200 Subject: [PATCH] wip: track nixos-23.05 --- flake.lock | 61 +++++++++++++-------------------------- modules/audio/default.nix | 11 ------- overlays/blesh.nix | 34 ++++------------------ pkgs/sources.toml | 8 ++--- 4 files changed, 29 insertions(+), 85 deletions(-) diff --git a/flake.lock b/flake.lock index c283b206..a3c54d5c 100644 --- a/flake.lock +++ b/flake.lock @@ -10,7 +10,7 @@ ] }, "locked": { - "lastModified": 1683754942, + "lastModified": 1680281360, "narHash": "sha256-MdAhtjrLKnk2uiqun1FWABbKpLH090oeqCSiWemtuck=", "owner": "ryantm", "repo": "agenix", @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1683754942, - "narHash": "sha256-L+Bj8EL4XLmODRIuOkk9sI6FDECVzK+C8jeZFv7q6eY=", + "lastModified": 1686210161, + "narHash": "sha256-cgP8P2Gk4WtOzd/Y7nEmweLpPOtMKVvHCIcq9zm9qMk=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "252541bd05a7f55f3704a3d014ad1badc1e3360d", + "rev": "40e4b85baac86969f94d6dba893aeae015c562c1", "type": "github" }, "original": { @@ -235,34 +235,13 @@ "type": "github" } }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1682203081, - "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "latest": { "locked": { - "lastModified": 1683408522, - "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", + "lastModified": 1686226982, + "narHash": "sha256-nLuiPoeiVfqqzeq9rmXxpybh77VS37dsY/k8N2LoxVg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7", + "rev": "a64b73e07d4aa65cfcbda29ecf78eaf9e72e44bd", "type": "github" }, "original": { @@ -294,11 +273,11 @@ }, "nixlib": { "locked": { - "lastModified": 1681001314, - "narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=", + "lastModified": 1685840432, + "narHash": "sha256-VJIbiKsY7Xy4E4WcgwUt/UiwYDmN5BAk8tngAjcWsqY=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "367c0e1086a4eb4502b24d872cea2c7acdd557f4", + "rev": "961e99baaaa57f5f7042fe7ce089a88786c839f4", "type": "github" }, "original": { @@ -309,11 +288,11 @@ }, "nixos": { "locked": { - "lastModified": 1683928319, - "narHash": "sha256-maz0DRKixJVcNRMiAMWlJniiF8IuQ+WbfmlJJ8D+jfM=", + "lastModified": 1686190112, + "narHash": "sha256-BRDO/tnq+ruwv14caQLIqejYJ6w5icja5KYpNunOW24=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9656e85a15a0fe67847ee8cdb99a20d8df499962", + "rev": "41b86284d3e073bb322da076ae8cd6e116b2ee2a", "type": "github" }, "original": { @@ -329,11 +308,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1683530131, - "narHash": "sha256-R0RSqj6JdZfru2x/cM19KJMHsU52OjtyxI5cccd+uFc=", + "lastModified": 1685943944, + "narHash": "sha256-GpaQwOkvwkmSWxvWaZqbMKyyOSaBAwgdEcHCqLW/240=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "10079333313ff62446e6f2b0e7c5231c7431d269", + "rev": "122dcc32cadf14c5015aa021fae8882c5058263a", "type": "github" }, "original": { @@ -359,11 +338,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1683442750, - "narHash": "sha256-IiJ0WWW6OcCrVFl1ijE+gTaP0ChFfV6dNkJR05yStmw=", + "lastModified": 1685894048, + "narHash": "sha256-QKqv1QS+22k9oxncj1AnAxeqS5jGnQiUW3Jq3B+dI1w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eb751d65225ec53de9cf3d88acbf08d275882389", + "rev": "2e56a850786211972d99d2bb39665a9b5a1801d6", "type": "github" }, "original": { @@ -380,7 +359,7 @@ "locked": { "lastModified": 1666884246, "narHash": "sha256-nSiYCIlMiYodY7GPCFPMF6YHVS2RM/XQZwn2Zrhu2eU=", - "ref": "refs/heads/master", + "ref": "master", "rev": "f1863fb8e3866c1559ca885e1b319ea82baecdbb", "revCount": 23, "type": "git", diff --git a/modules/audio/default.nix b/modules/audio/default.nix index 2ecd1826..8ff6f2e6 100644 --- a/modules/audio/default.nix +++ b/modules/audio/default.nix @@ -73,17 +73,6 @@ in { alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; - - config.pipewire = { - context.default.clock = { - allowed-rates = [44100 48000 88200 96000]; - rate = 44100; - quantum = 2048; - min-quantum = 1024; - max-quantum = 4096; - }; - }; - config.pipewire-pulse = builtins.fromJSON (builtins.readFile ./pipewire-pulse.conf.json); }; # Make pulseaudio listen on port 4713 for mopidy, extending the default diff --git a/overlays/blesh.nix b/overlays/blesh.nix index f29c29ec..ee25e015 100644 --- a/overlays/blesh.nix +++ b/overlays/blesh.nix @@ -1,32 +1,10 @@ final: prev: { blesh = prev.blesh.overrideAttrs (oldAttrs: rec { - inherit (prev.sources.blesh-nvfetcher) version src; - - dontBuild = false; - buildInputs = [prev.git]; - patchPhase = '' - substituteInPlace GNUmakefile \ - --replace "git submodule update --init --recursive" "" - ''; - nativeCheckInputs = oldAttrs.nativeCheckInputs ++ [prev.busybox]; - - installPhase = '' - runHook preInstall - - mkdir -p "$out/share/blesh/lib" - - cat <"$out/share/blesh/lib/_package.sh" - _ble_base_package_type=nix - - function ble/base/package:nix/update { - echo "Ble.sh is installed by Nix. You can update it there." >&2 - return 1 - } - EOF - - make install INSDIR=$out/share/blesh - - runHook postInstall - ''; + #inherit (prev.sources.blesh-nvfetcher) version src; + version = "0.4.0-devel3"; + src = prev.fetchzip { + url = "https://github.com/akinomyoga/ble.sh/releases/download/v${version}/ble-${version}.tar.xz"; + sha256 = "sha256-kGLp8RaInYSrJEi3h5kWEOMAbZV/gEPFUjOLgBuMhCI="; + }; }); } diff --git a/pkgs/sources.toml b/pkgs/sources.toml index 929cecbc..779ea5c8 100644 --- a/pkgs/sources.toml +++ b/pkgs/sources.toml @@ -31,8 +31,6 @@ fetch.github = "zeekay/vim-beautify" src.git = "https://github.com/romainl/Apprentice" fetch.github = "romainl/Apprentice" -[blesh-nvfetcher] -src.git = "https://github.com/akinomyoga/ble.sh" -fetch.github = "akinomyoga/ble.sh" -git.fetchSubmodules = true -git.leaveDotGit = true +[waybar-nvfetcher] +src.git = "https://github.com/Alexays/Waybar" +fetch.github = "Alexays/Waybar"