From 204a1d6b8faec19094a0851acec59aede466e7f6 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Fri, 29 Nov 2024 17:11:57 -0500 Subject: [PATCH] lots of updates --- flake.lock | 69 +++++++++++++++++++++++++++++++--- flake.nix | 12 +++--- home/home.nix | 15 ++++++-- system/eddie/configuration.nix | 37 +++++++----------- 4 files changed, 94 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index de2b839..de76ca1 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,26 @@ { "nodes": { + "audio": { + "inputs": { + "nix-buildproxy": "nix-buildproxy", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1732817120, + "narHash": "sha256-oidfS7NRyewczLrauC6s8/dpoYgwyNQQb2LgmzXlc9E=", + "owner": "polygon", + "repo": "audio.nix", + "rev": "4fc71592d18314e8a77cd1f2cf452b1999966345", + "type": "github" + }, + "original": { + "owner": "polygon", + "repo": "audio.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -65,6 +86,25 @@ "type": "github" } }, + "nix-buildproxy": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1708455753, + "narHash": "sha256-qP79WfPiTl92KrZkmvacba9Xas4WwSFln5DjkP2Q/Lg=", + "owner": "polygon", + "repo": "nix-buildproxy", + "rev": "77d486cb4b0458cb4c4a296c3140f7a6c36ab3e6", + "type": "github" + }, + "original": { + "owner": "polygon", + "ref": "v0.1.0", + "repo": "nix-buildproxy", + "type": "github" + } + }, "nix-flatpak": { "locked": { "lastModified": 1732867134, @@ -118,15 +158,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", - "owner": "nixos", + "lastModified": 1708118438, + "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -148,15 +188,32 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1732350895, + "narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { + "audio": "audio", "home-manager": "home-manager", "kmonad": "kmonad", "musnix": "musnix", "nix-flatpak": "nix-flatpak", "nix-ld": "nix-ld", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable" } } diff --git a/flake.nix b/flake.nix index 9d925a4..5b7a04a 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; home-manager = { url = "github:nix-community/home-manager/release-24.11"; @@ -25,13 +25,16 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + audio = { + url = "github:polygon/audio.nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nix-ld.url = "github:Mic92/nix-ld"; nix-ld.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = inputs @ {nixpkgs, nixpkgs-stable, home-manager, nix-flatpak, kmonad, musnix, nix-ld, ... }: { - nixpkgs.overlays = [ inputs.nixpkgs-wayland.overlay ]; - + outputs = inputs @ {nixpkgs, nixpkgs-stable, home-manager, audio, nix-flatpak, kmonad, musnix, nix-ld, ... }: { nixosConfigurations = { eddie = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -47,7 +50,6 @@ homeConfigurations = { - home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; diff --git a/home/home.nix b/home/home.nix index 6950f49..1b1da1d 100644 --- a/home/home.nix +++ b/home/home.nix @@ -3,6 +3,8 @@ nixpkgs.config.allowUnfree = true; + # nixpkgs.overlays = [ inputs.audio.overlays.default ]; + home = { packages = with pkgs; [ just @@ -173,6 +175,7 @@ gnomeExtensions.paperwm gnomeExtensions.media-controls gnomeExtensions.looking-glass-button + gnomeExtensions.auto-power-profile gnome-software gnome-tweaks gnome-photos @@ -228,11 +231,12 @@ audacity supercollider-with-plugins bitwig-studio - pkgs-stable.blender + # bitwig-studio5-latest + blender davinci-resolve-studio steam zotero_7 - pkgs-stable.handbrake + handbrake renoise yabridge yabridgectl @@ -241,7 +245,7 @@ inkscape gimp epson-escpr - pkgs-stable.kicad #install stable kicad because unstable breaks on python12 dependency + kicad openscad-unstable openscad-lsp picard @@ -263,7 +267,7 @@ eq10q geonkick bespokesynth - pkgs-stable.helm + helm surge odin2 calf @@ -276,6 +280,8 @@ cardinal roomeqwizard guitarix + # paulxstretch + vital (callPackage ../packages/tal/bassline.nix {}) (callPackage ../packages/tal/j8.nix {}) (callPackage ../packages/tal/u-no-lx.nix {}) @@ -460,6 +466,7 @@ renoise = pkgs.renoise.override { releasePath = ../binary-installers/rns_344_linux_x86_64.tar.gz; }; + raylib = pkgs.raylib.overrideDerivation (previous: { name = "raylib-head"; src = pkgs.fetchFromGitHub { diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix index 3e349c1..18522b6 100644 --- a/system/eddie/configuration.nix +++ b/system/eddie/configuration.nix @@ -38,6 +38,7 @@ glfw-wayland libGL.dev openssl + linuxKernel.packages.linux_6_12.openrazer ]; # Bootloader. @@ -53,18 +54,18 @@ systemd.services.tailscaled.after = ["NetworkManager-wait-online.service"]; - nixpkgs.config.packageOverrides = pkgs: { - openrazer-daemon = pkgs.openrazer-daemon.overrideDerivation (previous: { - name = "openrazer-daemon390"; - src = pkgs.fetchFromGitHub { - owner = "openrazer"; - repo = "openrazer"; - hash = "sha256-MLwhqLPWdjg1ZUZP5Sig37RgZEeHlU+DyELpyMif6iY="; - rev = "ae5791101e39b91518abb16f26978f2f0eea5e03"; - }; - # patches = [""]; - }); - }; + # nixpkgs.config.packageOverrides = pkgs: { + # openrazer-daemon = pkgs.openrazer-daemon.overrideDerivation (previous: { + # name = "openrazer-daemon390"; + # src = pkgs.fetchFromGitHub { + # owner = "openrazer"; + # repo = "openrazer"; + # hash = "sha256-MLwhqLPWdjg1ZUZP5Sig37RgZEeHlU+DyELpyMif6iY="; + # rev = "ae5791101e39b91518abb16f26978f2f0eea5e03"; + # }; + # # patches = [""]; + # }); + # }; hardware = { openrazer = { @@ -98,18 +99,6 @@ package = config.boot.kernelPackages.nvidiaPackages.beta; - #package = config.boot.kernelPackages.nvidiaPackages.mkDriver { - # version = "565.57.01"; - # sha256_64bit = "sha256-buvpTlheOF6IBPWnQVLfQUiHv4GcwhvZW3Ks0PsYLHo="; - # sha256_aarch64 = "sha256-aDVc3sNTG4O3y+vKW87mw+i9AqXCY29GVqEIUlsvYfE="; - # openSha256 = "sha256-/tM3n9huz1MTE6KKtTCBglBMBGGL/GOHi5ZSUag4zXA="; - # settingsSha256 = "sha256-H7uEe34LdmUFcMcS6bz7sbpYhg9zPCb/5AmZZFTx1QA="; - # persistencedSha256 = "sha256-hdszsACWNqkCh8G4VBNitDT85gk9gJe1BlQ8LdrYIkg="; - # patchesOpen = [ - # ./nvidia-6_12-patch - # ]; - #}; - prime = { amdgpuBusId = "PCI:101:0:0"; nvidiaBusId = "PCI:1:0:0";