From acc038535022bbffe9c40245e10574338cb9922f Mon Sep 17 00:00:00 2001 From: Joe Frikker Date: Wed, 16 Sep 2026 10:53:47 -0400 Subject: [PATCH] Formatting flake --- flake.nix | 136 ++++++++++++++++++++++++++++++++++-------------------- home.org | 3 +- 2 files changed, 88 insertions(+), 51 deletions(-) diff --git a/flake.nix b/flake.nix index da1a757..f96fc96 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ url = "github:sadjow/claude-code-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - + home-manager = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; @@ -24,8 +24,18 @@ }; }; - outputs = { nixpkgs, home-manager, claude-code, nix-index-database, ... }: - let modules-for-system = pkgs: pkgs.stdenv.mkDerivation { + outputs = + { + nixpkgs, + home-manager, + claude-code, + nix-index-database, + ... + }: + let + modules-for-system = + pkgs: + pkgs.stdenv.mkDerivation { name = "home-manager-modules"; src = pkgs.lib.fileset.toSource { root = ./.; @@ -33,31 +43,37 @@ ./home.org ]; }; - + buildPhase = '' - runHook preBuild - ${pkgs.emacs}/bin/emacs --batch --eval "(require 'org)" --eval '(org-babel-tangle-file "home.org")' - runHook postBuild - ''; + runHook preBuild + ${pkgs.emacs}/bin/emacs --batch --eval "(require 'org)" --eval '(org-babel-tangle-file "home.org")' + runHook postBuild + ''; installPhase = '' - runHook preInstall - cp -R target $out - runHook postInstall - ''; + runHook preInstall + cp -R target $out + runHook postInstall + ''; }; - in { + in + { homeConfigurations.redbook = - let pkgs = import nixpkgs { system = "aarch64-darwin"; config.allowUnfree = true; }; - modules = modules-for-system pkgs; - in home-manager.lib.homeManagerConfiguration { + let + pkgs = import nixpkgs { + system = "aarch64-darwin"; + config.allowUnfree = true; + }; + modules = modules-for-system pkgs; + in + home-manager.lib.homeManagerConfiguration { inherit pkgs; - - modules = - [ - nix-index-database.homeModules.default - "${modules}" - ] ++ - [{ + + modules = [ + nix-index-database.homeModules.default + "${modules}" + ] + ++ [ + { home.stateVersion = "22.05"; home.username = "jfrikker"; home.homeDirectory = "/Users/jfrikker"; @@ -65,41 +81,58 @@ jfrikker.enable = true; jfrikker.desktop.enable = true; jfrikker.redbook.enable = true; - }]; + } + ]; - extraSpecialArgs = { claude-code = claude-code.packages.aarch64-darwin.default; }; + extraSpecialArgs = { + claude-code = claude-code.packages.aarch64-darwin.default; + }; }; homeConfigurations.home = - let pkgs = import nixpkgs { system = "x86_64-linux"; config.allowUnfree = true; }; - modules = modules-for-system pkgs; - in home-manager.lib.homeManagerConfiguration { + let + pkgs = import nixpkgs { + system = "x86_64-linux"; + config.allowUnfree = true; + }; + modules = modules-for-system pkgs; + in + home-manager.lib.homeManagerConfiguration { inherit pkgs; - + modules = [ nix-index-database.homeModules.default "${modules}" - ] ++ - [{ - home.stateVersion = "22.05"; - home.username = "jfrikker"; - home.homeDirectory = "/home/jfrikker"; - jfrikker.enable = true; - }]; + ] + ++ [ + { + home.stateVersion = "22.05"; + home.username = "jfrikker"; + home.homeDirectory = "/home/jfrikker"; + jfrikker.enable = true; + } + ]; - extraSpecialArgs = { claude-code = claude-code.packages.x86_64-linux.default; }; + extraSpecialArgs = { + claude-code = claude-code.packages.x86_64-linux.default; + }; }; homeConfigurations.home-laptop = - let pkgs = import nixpkgs { system = "x86_64-linux"; config.allowUnfree = true; }; - modules = modules-for-system pkgs; - in home-manager.lib.homeManagerConfiguration { + let + pkgs = import nixpkgs { + system = "x86_64-linux"; + config.allowUnfree = true; + }; + modules = modules-for-system pkgs; + in + home-manager.lib.homeManagerConfiguration { inherit pkgs; - - modules = - [ - nix-index-database.homeModules.default - "${modules}" - ] ++ - [{ + + modules = [ + nix-index-database.homeModules.default + "${modules}" + ] + ++ [ + { home.stateVersion = "22.05"; home.username = "jfrikker"; home.homeDirectory = "/home/jfrikker"; @@ -131,7 +164,7 @@ sway.enable = true; gtk.enable = true; }; - + wayland.windowManager.sway = { enable = true; config.modifier = "Mod4"; @@ -144,10 +177,13 @@ }; programs.emacs.package = pkgs.emacs-pgtk; - }]; + } + ]; # extraSpecialArgs = { kube = kube.packages.x86_64-linux.default; }; - extraSpecialArgs = { claude-code = claude-code.packages.x86_64-linux.default; }; + extraSpecialArgs = { + claude-code = claude-code.packages.x86_64-linux.default; + }; }; packages.x86_64-linux.default = modules-for-system nixpkgs.legacyPackages.x86_64-linux; packages.aarch64-darwin.default = modules-for-system nixpkgs.legacyPackages.aarch64-darwin; diff --git a/home.org b/home.org index 0a5ecee..7975c75 100644 --- a/home.org +++ b/home.org @@ -132,7 +132,8 @@ tools. They boost better speed, or simply more streamlined features. #+BEGIN_SRC nix { home.packages = with pkgs; [ - nil + nil + nixfmt ]; } #+END_SRC