From 2a8d033f7daaea1e0c6eaa03d79c8617f92dc6e7 Mon Sep 17 00:00:00 2001 From: Rachel Lambda Samuelsson Date: Tue, 25 Jun 2024 13:57:09 +0200 Subject: [PATCH] bump flake --- flake.lock | 42 +++++++++++++++++------------------ flake.nix | 11 ++++++--- home-manager/applications.nix | 2 +- home-manager/plasma.nix | 3 ++- pkgs/renoise.nix | 21 ++++++++++++++++++ 5 files changed, 53 insertions(+), 26 deletions(-) create mode 100644 pkgs/renoise.nix diff --git a/flake.lock b/flake.lock index 7ce65a1..a67f8bb 100644 --- a/flake.lock +++ b/flake.lock @@ -31,11 +31,11 @@ ] }, "locked": { - "lastModified": 1712595875, - "narHash": "sha256-KaAhKeESwOQ0R0vxeAO/CDPiPimiemoARyr0uIVTQ4w=", + "lastModified": 1715930772, + "narHash": "sha256-gP32IWxjIApK0jxQn3Xorul5SXtMS2tq+K8Wj8afHgg=", "owner": "isovector", "repo": "cornelis", - "rev": "9d3347e7d8589a28bcdd283001367d60bacf6b05", + "rev": "06d6020eed1a3520bb2887337dd5b27b1755968b", "type": "github" }, "original": { @@ -118,11 +118,11 @@ ] }, "locked": { - "lastModified": 1716736833, - "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", + "lastModified": 1718530513, + "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", "owner": "nix-community", "repo": "home-manager", - "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", + "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", "type": "github" }, "original": { @@ -134,11 +134,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717144377, - "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", + "lastModified": 1719145550, + "narHash": "sha256-K0i/coxxTEl30tgt4oALaylQfxqbotTSNb1/+g+mKMQ=", "owner": "NixOs", "repo": "nixpkgs", - "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "rev": "e4509b3a560c87a8d4cb6f9992b8915abf9e36d8", "type": "github" }, "original": { @@ -150,11 +150,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1713297878, - "narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=", + "lastModified": 1719075281, + "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "owner": "NixOs", "repo": "nixpkgs", - "rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c", + "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1719241096, - "narHash": "sha256-36De9zA7fp976ZPxATQ2LHcQohUUISCGlAcCKJqRC/0=", + "lastModified": 1719302143, + "narHash": "sha256-PMtSsKvbgfoI5+rb7UBIBfIwQ4Zvjt1iChWwQL+BkGo=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "d67f2f550a26da44554f239c7043112e0cfbb231", + "rev": "a3b881f62eb3aabb97e4fc68041ef34e8029e186", "type": "github" }, "original": { @@ -203,11 +203,11 @@ "slippi-desktop": { "flake": false, "locked": { - "lastModified": 1711346593, - "narHash": "sha256-WWgGRT58w1a4UcEe924hqa4ZVodQtsbXC44aCOEj528=", + "lastModified": 1713234497, + "narHash": "sha256-UOZo3YybBldkn1McZRr0oAYEieTtjCGgcA4YqpEOyXI=", "owner": "project-slippi", "repo": "slippi-desktop-app", - "rev": "02f3f007cd03c6e2b0da57db65c90646efc04a86", + "rev": "ae8bb69e235b6e46b24bc966aeaa80f45030c6f9", "type": "github" }, "original": { @@ -224,11 +224,11 @@ "slippi-desktop": "slippi-desktop" }, "locked": { - "lastModified": 1712071998, - "narHash": "sha256-k95NCkXJ61PGMFuqyMtfvP3yTLozED/7DkN+lBWK0gs=", + "lastModified": 1716565139, + "narHash": "sha256-kjfc9Mg/YdY8OQU+Irm8v9iIhtgIw5qW/6VAehjW6GA=", "owner": "lytedev", "repo": "ssbm-nix", - "rev": "eff966a97287d1d86b189d59a14bf744d86836b0", + "rev": "922b91f3f9c0dbdf2ce17921dfc07872d7d41c4b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0809531..8b5b843 100644 --- a/flake.nix +++ b/flake.nix @@ -44,11 +44,11 @@ useUserPackages = true; users.rachel = import ./home-manager/all.nix { pkgs = import nixpkgs { - system = system; + inherit system; config.allowUnfree = true; }; unstable = import nixpkgs-unstable { - system = system; + inherit system; config.allowUnfree = true; }; extra = { @@ -63,6 +63,7 @@ shell-menu = self.packages.${system}.shell-menu; pash = self.packages.${system}.pash; cpypsk = self.packages.${system}.cpypsk; + renoise = self.packages.${system}.renoise; }; }; }; @@ -98,7 +99,10 @@ keyboardLayouts.sus = ./resources/fox.xkb; } // flake-utils.lib.eachDefaultSystem (system: - let pkgs = nixpkgs.legacyPackages.${system}; + let pkgs = import nixpkgs { + inherit system; + config.allowUnfree = true; + }; in { packages = rec { bqn-vim = import ./pkgs/bqn-vim.nix { inherit pkgs; }; @@ -107,6 +111,7 @@ shell-menu = import ./pkgs/shell-menu.nix { inherit pkgs; }; pash = import ./pkgs/pash.nix { inherit pkgs; }; cpypsk = import ./pkgs/cpypsk.nix { inherit pkgs pash; }; + renoise = import ./pkgs/renoise.nix { inherit pkgs; }; }; }); } diff --git a/home-manager/applications.nix b/home-manager/applications.nix index 0a6c89c..437d38d 100644 --- a/home-manager/applications.nix +++ b/home-manager/applications.nix @@ -69,6 +69,6 @@ extra.cornelis extra.slippi-netplay unstable.kicad - unstable.renoise + extra.renoise ]; } diff --git a/home-manager/plasma.nix b/home-manager/plasma.nix index f26bd2b..fc7789b 100644 --- a/home-manager/plasma.nix +++ b/home-manager/plasma.nix @@ -1,8 +1,9 @@ -{ pkgs, extra, ... }: +{ extra, ... }: { programs.plasma = { enable = true; overrideConfig = true; + immutableByDefault = true; workspace = { lookAndFeel = "org.kde.breezedark.desktop"; diff --git a/pkgs/renoise.nix b/pkgs/renoise.nix new file mode 100644 index 0000000..485245e --- /dev/null +++ b/pkgs/renoise.nix @@ -0,0 +1,21 @@ +{ pkgs, ... }: +let + platforms = { + x86_64-linux = { + archSuffix = "x86_64"; + hash = "sha256-b+YXBVnxu54HfC/tWapcs/ZYzwBOJswYbEbEU3SVNss="; + }; + aarch64-linux = { + archSuffix = "arm64"; + hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; + }; + }; + platform = platforms.${pkgs.stdenv.system} or (throw "unsupported system ${pkgs.stdenv.hostPlatform.system}"); +in +pkgs.renoise.overrideAttrs (final: prev: { + version = "3.4.4"; + src = pkgs.fetchurl { + url = "https://files.renoise.com/demo/Renoise_3_4_4_Demo_Linux_${platform.archSuffix}.tar.gz"; + hash = platform.hash; + }; +})