From b7f7dd18abb8cfafe9883a7885f117d4809c9ee6 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Sat, 22 Mar 2025 08:23:37 +0100 Subject: [PATCH] feat(flakes): add claude desktop package and overlay Introduced `claude-desktop-with-fhs` package by adding the `claude` flake to the inputs. Updated the system configuration and overlays to integrate the new package for usage. --- flake.lock | 93 +++++++++++++++++++++++------ flake.nix | 10 +++- systems/x86_64-linux/x1/default.nix | 1 + 3 files changed, 84 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index 6e4b09b..9b154d1 100644 --- a/flake.lock +++ b/flake.lock @@ -33,6 +33,27 @@ "type": "github" } }, + "claude": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1742506150, + "narHash": "sha256-Yk/7pIspgG6/7WYGNrwDmAgh96g2bQ5v/dD13kjEcSE=", + "owner": "k3d3", + "repo": "claude-desktop-linux-flake", + "rev": "ae324d0bfda981b23df75ae41c9665aeba737729", + "type": "github" + }, + "original": { + "owner": "k3d3", + "repo": "claude-desktop-linux-flake", + "type": "github" + } + }, "crane": { "inputs": { "flake-compat": [ @@ -215,11 +236,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -230,7 +251,7 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_3" + "flake-utils": "flake-utils_4" }, "locked": { "lastModified": 1715533576, @@ -249,7 +270,7 @@ }, "flake-utils-plus_2": { "inputs": { - "flake-utils": "flake-utils_4" + "flake-utils": "flake-utils_5" }, "locked": { "lastModified": 1715533576, @@ -270,6 +291,24 @@ "inputs": { "systems": "systems_2" }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -284,9 +323,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_4": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1694529238, @@ -302,9 +341,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1694529238, @@ -416,7 +455,7 @@ "crane": "crane", "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ], @@ -479,7 +518,7 @@ "neovim-flake": { "inputs": { "flake-parts": "flake-parts_2", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "mnw": "mnw", "nil": "nil", "nixpkgs": [ @@ -589,7 +628,7 @@ "plugin-vim-vsnip": "plugin-vim-vsnip", "plugin-which-key": "plugin-which-key", "rnix-lsp": "rnix-lsp", - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1731965250, @@ -760,11 +799,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1742268799, - "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", + "lastModified": 1742512142, + "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "da044451c6a70518db5b730fe277b70f494188f1", + "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", "type": "github" }, "original": { @@ -2511,6 +2550,7 @@ }, "root": { "inputs": { + "claude": "claude", "darwin": "darwin", "disko": "disko", "home-manager": "home-manager", @@ -2761,13 +2801,28 @@ "type": "github" } }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "unstable": { "locked": { - "lastModified": 1742288794, - "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { @@ -2794,7 +2849,7 @@ }, "utils_2": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1709126324, diff --git a/flake.nix b/flake.nix index e96f779..d866d0f 100644 --- a/flake.nix +++ b/flake.nix @@ -55,6 +55,9 @@ simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05"; simple-nixos-mailserver.inputs.nixpkgs.follows = "nixpkgs"; + + claude.url = "github:k3d3/claude-desktop-linux-flake"; + claude.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = @@ -90,7 +93,12 @@ simple-nixos-mailserver.nixosModule ]; - overlays = with inputs; [ nixsgx-flake.overlays.default ]; + overlays = with inputs; [ + nixsgx-flake.overlays.default + (final: prev: { + inherit (claude.packages.${prev.system}) claude-desktop-with-fhs; + }) + ]; outputs-builder = channels: { formatter = channels.nixpkgs.nixfmt-rfc-style; diff --git a/systems/x86_64-linux/x1/default.nix b/systems/x86_64-linux/x1/default.nix index c402916..d7f1e54 100644 --- a/systems/x86_64-linux/x1/default.nix +++ b/systems/x86_64-linux/x1/default.nix @@ -59,6 +59,7 @@ with lib.metacfg; gtypist logseq claude-code + claude-desktop-with-fhs ]; zramSwap.enable = true;