diff --git a/modules/ai-tools.nix b/modules/ai-tools.nix index ff4457f..0c19aa5 100644 --- a/modules/ai-tools.nix +++ b/modules/ai-tools.nix @@ -5,6 +5,15 @@ inputs', ... }: { + home.packages = [ + inputs'.llm-agents.packages.claude-code + pkgs.nono + ]; + + home.shellAliases = { + noc = "nono run -s --allow-cwd --profile opencode --allow ~/.bun --allow ~/.local/share/opensrc --allow ~/.config/jj --network-profile developer --proxy-allow models.dev --proxy-allow chatgpt.com --proxy-allow mcp.grep.app --proxy-allow mcp.context7.com --proxy-allow mcp.exa.ai -- opencode"; + }; + programs.opencode = { enable = true; package = inputs'.llm-agents.packages.opencode; @@ -61,15 +70,6 @@ }; }; - home.shellAliases = { - noc = "nono run -s --allow-cwd --profile opencode --allow ~/.bun --allow ~/.local/share/opensrc --allow ~/.config/jj --network-profile developer --proxy-allow models.dev --proxy-allow chatgpt.com --proxy-allow mcp.grep.app --proxy-allow mcp.context7.com --proxy-allow mcp.exa.ai -- opencode"; - }; - - home.packages = [ - inputs'.llm-agents.packages.claude-code - pkgs.nono - ]; - systemd.user.services.opencode-server = { Unit = { Description = "OpenCode AI server"; diff --git a/modules/core.nix b/modules/core.nix index 3368df0..c6a65fc 100644 --- a/modules/core.nix +++ b/modules/core.nix @@ -4,6 +4,12 @@ lib, ... }: { + # System utilities + environment.systemPackages = + lib.optionals pkgs.stdenv.isLinux [ + pkgs.lm_sensors + ]; + programs.fish.enable = true; environment.shells = [pkgs.nushell]; @@ -33,11 +39,5 @@ experimental-features = nix-command flakes ''; }; - - # System utilities - environment.systemPackages = - lib.optionals pkgs.stdenv.isLinux [ - pkgs.lm_sensors - ]; }; } diff --git a/modules/darwin.nix b/modules/darwin.nix index ec2685e..ef33ddb 100644 --- a/modules/darwin.nix +++ b/modules/darwin.nix @@ -8,6 +8,13 @@ system.primaryUser = "cschmatzler"; + # Darwin system utilities + environment.systemPackages = with pkgs; [ + alcove + dockutil + mas + ]; + system.defaults = { NSGlobalDomain = { AppleInterfaceStyle = null; @@ -140,12 +147,5 @@ "tidal" ]; }; - - # Darwin system utilities - environment.systemPackages = with pkgs; [ - alcove - dockutil - mas - ]; }; } diff --git a/modules/dendritic.nix b/modules/dendritic.nix index a4e5c7e..c4916af 100644 --- a/modules/dendritic.nix +++ b/modules/dendritic.nix @@ -63,6 +63,10 @@ jj-starship.url = "github:dmmulroy/jj-starship"; zjstatus.url = "github:dj95/zjstatus"; tuicr.url = "github:agavra/tuicr"; + fenix = { + url = "github:nix-community/fenix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; naersk = { url = "github:nix-community/naersk/master"; inputs.nixpkgs.follows = "nixpkgs"; @@ -71,6 +75,10 @@ url = "github:always-further/nono"; flake = false; }; + vite-plus = { + url = "github:voidzero-dev/vite-plus/v0.1.11"; + flake = false; + }; # Secrets inputs sops-nix = { url = "github:Mic92/sops-nix"; diff --git a/modules/desktop.nix b/modules/desktop.nix index 109e27d..520baf9 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -4,6 +4,12 @@ lib, ... }: { + home.packages = with pkgs; + lib.optionals stdenv.isDarwin [ + _1password-gui + raycast + ]; + programs.aerospace = { enable = true; launchd.enable = true; @@ -144,11 +150,5 @@ }; }; }; - - home.packages = with pkgs; - lib.optionals stdenv.isDarwin [ - _1password-gui - raycast - ]; }; } diff --git a/modules/dev-tools.nix b/modules/dev-tools.nix index c27d1a6..7dc6ced 100644 --- a/modules/dev-tools.nix +++ b/modules/dev-tools.nix @@ -6,6 +6,40 @@ }: let name = "Christoph Schmatzler"; in { + home.packages = with pkgs; + [ + alejandra + ast-grep + bun + delta + deadnix + devenv + docker + docker-compose + gh + gnumake + hyperfine + jj-ryu + jj-starship + nil + nodejs_24 + nurl + pnpm + postgresql_17 + serie + sqlite + statix + tea + tokei + tree-sitter + ] + ++ lib.optionals stdenv.isDarwin [ + xcodes + ] + ++ lib.optionals stdenv.isLinux [ + gcc15 + ]; + # Git configuration programs.git = { enable = true; @@ -197,39 +231,5 @@ auto_install = false; }; }; - - home.packages = with pkgs; - [ - alejandra - ast-grep - bun - delta - deadnix - devenv - docker - docker-compose - gh - gnumake - hyperfine - jj-ryu - jj-starship - nil - nodejs_24 - nurl - pnpm - postgresql_17 - serie - sqlite - statix - tea - tokei - tree-sitter - ] - ++ lib.optionals stdenv.isDarwin [ - xcodes - ] - ++ lib.optionals stdenv.isLinux [ - gcc15 - ]; }; } diff --git a/modules/shell.nix b/modules/shell.nix index d1147cf..869ae36 100644 --- a/modules/shell.nix +++ b/modules/shell.nix @@ -4,6 +4,10 @@ pkgs, ... }: { + home.packages = with pkgs; [ + vivid + ]; + programs.nushell = { enable = true; @@ -277,9 +281,5 @@ }; }; }; - - home.packages = with pkgs; [ - vivid - ]; }; } diff --git a/modules/terminal.nix b/modules/terminal.nix index ea7daa1..6a65622 100644 --- a/modules/terminal.nix +++ b/modules/terminal.nix @@ -10,6 +10,44 @@ lib, ... }: { + home.packages = with pkgs; + [ + dust + fastfetch + fd + glow + htop + jq + killall + lsof + ouch + ov + sd + tree + tuicr + ] + ++ lib.optionals stdenv.isLinux [ + ghostty.terminfo + ]; + + home.sessionVariables = { + FZF_DEFAULT_OPTS = '' + --bind=alt-k:up,alt-j:down + --expect=tab,enter + --layout=reverse + --delimiter='\t' + --with-nth=1 + --preview-window='border-rounded' --prompt=' ' --marker=' ' --pointer=' ' + --separator='─' --scrollbar='┃' --layout='reverse' + + --color=bg+:#f2e9e1,bg:#faf4ed,spinner:#ea9d34,hl:#d7827e + --color=fg:#797593,header:#286983,info:#56949f,pointer:#907aa9 + --color=marker:#b4637a,fg+:#575279,prompt:#797593,hl+:#d7827e + --color=selected-bg:#f2e9e1 + --color=border:#dfdad9,label:#575279 + ''; + }; + xdg.configFile."ghostty/config".text = '' command = ${pkgs.nushell}/bin/nu theme = Rose Pine Dawn @@ -51,24 +89,6 @@ enable = true; }; - home.sessionVariables = { - FZF_DEFAULT_OPTS = '' - --bind=alt-k:up,alt-j:down - --expect=tab,enter - --layout=reverse - --delimiter='\t' - --with-nth=1 - --preview-window='border-rounded' --prompt=' ' --marker=' ' --pointer=' ' - --separator='─' --scrollbar='┃' --layout='reverse' - - --color=bg+:#f2e9e1,bg:#faf4ed,spinner:#ea9d34,hl:#d7827e - --color=fg:#797593,header:#286983,info:#56949f,pointer:#907aa9 - --color=marker:#b4637a,fg+:#575279,prompt:#797593,hl+:#d7827e - --color=selected-bg:#f2e9e1 - --color=border:#dfdad9,label:#575279 - ''; - }; - programs.ripgrep = { enable = true; arguments = [ @@ -135,25 +155,5 @@ }; }; }; - - home.packages = with pkgs; - [ - dust - fastfetch - fd - glow - htop - jq - killall - lsof - ouch - ov - sd - tree - tuicr - ] - ++ lib.optionals stdenv.isLinux [ - ghostty.terminfo - ]; }; }