From 95ed33ae0463be339ee3a060342da73dfc62e773 Mon Sep 17 00:00:00 2001 From: Gabe Venberg Date: Sun, 4 Jan 2026 16:44:18 +0100 Subject: [PATCH] flake update. --- flake.lock | 52 +++++++++++++++---------------- flake.nix | 16 +++++----- hosts/cirrostratus/default.nix | 2 -- hosts/cumulus/default.nix | 2 +- hosts/harmatan/default.nix | 1 + roles/home-manager/music-prod.nix | 16 ++++++++++ 6 files changed, 52 insertions(+), 37 deletions(-) create mode 100644 roles/home-manager/music-prod.nix diff --git a/flake.lock b/flake.lock index 0eaece3..65a0b8f 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1766769718, - "narHash": "sha256-HUFMhHktTdcdXL31Bhhjm+35W32xhts7ki67zADYwmw=", + "lastModified": 1767530379, + "narHash": "sha256-1TKk9TuhGqEMkQhPN53n6skMT4qFfkbEWWscCIE0UMw=", "owner": "9001", "repo": "copyparty", - "rev": "4642d32366e30c131d933c8bd0a519b69f4d3fff", + "rev": "364f74a1bd1020a3d7663c453ac5bf1b1408ff8f", "type": "github" }, "original": { @@ -23,7 +23,7 @@ "type": "github" } }, - "deploy-rs": { + "deploy-rs-flake": { "inputs": { "flake-compat": [ "flake-compat" @@ -71,11 +71,11 @@ }, "flake-compat": { "locked": { - "lastModified": 1766661267, - "narHash": "sha256-QN1r/zNqvXHwWqlRAnRtFf4CQwIOJx58PtdExIzAw94=", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", "owner": "edolstra", "repo": "flake-compat", - "rev": "f275e157c50c3a9a682b4c9b4aa4db7a4cd3b5f2", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { @@ -109,11 +109,11 @@ ] }, "locked": { - "lastModified": 1766850854, - "narHash": "sha256-asWZx7X5FRrna8ntfE0+vTBUIPLth8R8bckbOpfT3Us=", + "lastModified": 1767525999, + "narHash": "sha256-1E9xlYlyl3EnUrwxoaJMTK7dFrC2llL/TJ+T4xIcXDY=", "owner": "nix-community", "repo": "home-manager", - "rev": "2d36a6de2fee5cd232b0a28137d95541c21eb7f0", + "rev": "7d5927b63cea63deb655b3e8421ae17ebb9feac2", "type": "github" }, "original": { @@ -141,11 +141,11 @@ }, "nixCats": { "locked": { - "lastModified": 1758545673, - "narHash": "sha256-MMcEImF7vHqImzrdRlSFCbzGq0ebi/5eSYwypNGr+AA=", + "lastModified": 1767159145, + "narHash": "sha256-rnx/0p6D7rKd7mjtgsdSZjpkutJMzUaVyo2mj0rmjWQ=", "owner": "BirdeeHub", "repo": "nixCats-nvim", - "rev": "91f9a4b4605cc3aed835e180eb58a5bd73236407", + "rev": "479ab18fbeabaf87564d3fb0eaf99ebebb05f2f8", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1766568855, - "narHash": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=", + "lastModified": 1767185284, + "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80", + "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe", "type": "github" }, "original": { @@ -196,11 +196,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1766651565, - "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", + "lastModified": 1767379071, + "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", + "rev": "fb7944c166a3b630f177938e478f0378e64ce108", "type": "github" }, "original": { @@ -218,10 +218,10 @@ ] }, "locked": { - "lastModified": 1764020811, - "narHash": "sha256-o+DLaTUYgUI40Q7gHAdCauGTUwumUbHr/lcS8e1hvVA=", + "lastModified": 1767537038, + "narHash": "sha256-VD5xfh0tvNwoo4Zu9v2drieYadf/FXpwLOLWzwRLOYw=", "ref": "refs/heads/main", - "rev": "fecca27e9229212a7b238383993c97dc8a52e0f0", + "rev": "89b6a830f8ab05a8f3711f80b5c8c2606a923e89", "shallow": true, "type": "git", "url": "ssh://forgejo@git.venberg.xyz/Gabe/nvim-config.git" @@ -235,7 +235,7 @@ "root": { "inputs": { "copyparty": "copyparty", - "deploy-rs": "deploy-rs", + "deploy-rs-flake": "deploy-rs-flake", "disko": "disko", "flake-compat": "flake-compat", "flake-utils": "flake-utils", @@ -255,11 +255,11 @@ ] }, "locked": { - "lastModified": 1766289575, - "narHash": "sha256-BOKCwOQQIP4p9z8DasT5r+qjri3x7sPCOq+FTjY8Z+o=", + "lastModified": 1767499857, + "narHash": "sha256-0zUU/PW09d6oBaR8x8vMHcAhg1MOvo3CwoXgHijzzNE=", "owner": "mic92", "repo": "sops-nix", - "rev": "9836912e37aef546029e48c8749834735a6b9dad", + "rev": "ecc41505948ec2ab0325f14c9862a4329c2b4190", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f580922..cfd0873 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - deploy-rs = { + deploy-rs-flake = { url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs"; inputs.utils.follows = "flake-utils"; @@ -66,7 +66,7 @@ outputs = { self, nixpkgs, - deploy-rs, + deploy-rs-flake, ... } @ inputs: let forAllSystems = nixpkgs.lib.genAttrs [ @@ -86,7 +86,7 @@ packages = with pkgs; [ just nixos-rebuild - deploy-rs.packages.${system}.deploy-rs + deploy-rs ]; }; } @@ -115,25 +115,25 @@ nodes = { cumulus = { hostname = "cumulus"; - profiles.system.path = deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.cumulus; + profiles.system.path = deploy-rs-flake.lib.aarch64-linux.activate.nixos self.nixosConfigurations.cumulus; remoteBuild = true; }; cirrus = { hostname = "cirrus"; - profiles.system.path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.cirrus; + profiles.system.path = deploy-rs-flake.lib.x86_64-linux.activate.nixos self.nixosConfigurations.cirrus; }; cirrostratus = { hostname = "cirrostratus"; - profiles.system.path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.cirrostratus; + profiles.system.path = deploy-rs-flake.lib.x86_64-linux.activate.nixos self.nixosConfigurations.cirrostratus; remoteBuild = true; }; altostratus = { hostname = "altostratus"; - profiles.system.path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.altostratus; + profiles.system.path = deploy-rs-flake.lib.x86_64-linux.activate.nixos self.nixosConfigurations.altostratus; }; harmatan = { hostname = "harmatan"; - profiles.system.path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.harmatan; + profiles.system.path = deploy-rs-flake.lib.x86_64-linux.activate.nixos self.nixosConfigurations.harmatan; }; }; sshUser = "root"; diff --git a/hosts/cirrostratus/default.nix b/hosts/cirrostratus/default.nix index 8c0875c..77d240c 100644 --- a/hosts/cirrostratus/default.nix +++ b/hosts/cirrostratus/default.nix @@ -23,11 +23,9 @@ inputs.nixpkgs.lib.nixosSystem { ../../configs/nixos/jellyfin.nix ../../configs/nixos/syncthing.nix ../../configs/nixos/grocy.nix - ../../configs/nixos/factorio-docker.nix ../../configs/nixos/cyberchef.nix ../../configs/nixos/miniserve-directory.nix ../../configs/nixos/miniserve-tmp-upload.nix - ../../configs/nixos/minecraft-docker.nix ../../configs/nixos/nginx-static.nix ../../configs/nixos/immich.nix ({ diff --git a/hosts/cumulus/default.nix b/hosts/cumulus/default.nix index 30fb2ae..639cdab 100644 --- a/hosts/cumulus/default.nix +++ b/hosts/cumulus/default.nix @@ -32,7 +32,7 @@ inputs.nixpkgs.lib.nixosSystem { "rockchipdrm" "phy_rockchip_pcie" ]; - nixpkgs.hostPlatform ="x86_64-linux"; + nixpkgs.hostPlatform ="aarch64-linux"; hardware.enableRedistributableFirmware = true; host.details = { user = "gabe"; diff --git a/hosts/harmatan/default.nix b/hosts/harmatan/default.nix index 00abab6..a97d02c 100644 --- a/hosts/harmatan/default.nix +++ b/hosts/harmatan/default.nix @@ -97,6 +97,7 @@ inputs.nixpkgs.lib.nixosSystem { ../../roles/home-manager/terminal.nix ../../roles/home-manager/music.nix ../../roles/home-manager/3dprinting.nix + ../../roles/home-manager/music-prod.nix ../../configs/home-manager/common.nix ../../configs/home-manager/secrets.nix ../../configs/home-manager/email.nix diff --git a/roles/home-manager/music-prod.nix b/roles/home-manager/music-prod.nix new file mode 100644 index 0000000..5c29562 --- /dev/null +++ b/roles/home-manager/music-prod.nix @@ -0,0 +1,16 @@ +{ + config, + pkgs, + lib, + ... +}: { + # when it gets packaged, will want cadquery and build123d + home.packages = with pkgs; [ + ardour + cardinal + vmpk + bespokesynth + surge + helio-workstation + ]; +}