Compare commits
6 Commits
2efccdb4de
...
0dbc007a90
| Author | SHA1 | Date | |
|---|---|---|---|
| 0dbc007a90 | |||
| 57e0d49278 | |||
| ee44b26147 | |||
| 675306ec91 | |||
| a829f160fb | |||
| 4cfe0387e2 |
12
dots/.config/nvim/flake.lock
generated
12
dots/.config/nvim/flake.lock
generated
@@ -42,11 +42,11 @@
|
||||
},
|
||||
"nixCats": {
|
||||
"locked": {
|
||||
"lastModified": 1776724015,
|
||||
"narHash": "sha256-kFpzUivYI8F75cZcggmjKM8HEEJPajKNLweYsTYdM7Q=",
|
||||
"lastModified": 1777273601,
|
||||
"narHash": "sha256-xBUa8Tl9V7IXI+VmLEuDc81La/EhoSn1C3EVSnJ3cfU=",
|
||||
"owner": "BirdeeHub",
|
||||
"repo": "nixCats-nvim",
|
||||
"rev": "da76c45b33d589836946bb566bd91df4cd3cfb09",
|
||||
"rev": "f69ea013e328841a7def7037ed59788a76be8816",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -73,11 +73,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1776949667,
|
||||
"narHash": "sha256-GMSVw35Q+294GlrTUKlx087E31z7KurReQ1YHSKp5iw=",
|
||||
"lastModified": 1777270315,
|
||||
"narHash": "sha256-yKB4G6cKsQsWN7M6rZGk6gkJPDNPIzT05y4qzRyCDlI=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "01fbdeef22b76df85ea168fbfe1bfd9e63681b30",
|
||||
"rev": "6368eda62c9775c38ef7f714b2555a741c20c72d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -75,6 +75,7 @@
|
||||
black
|
||||
clang
|
||||
clang-tools
|
||||
curl # → plenary-nvim, mcp-hub
|
||||
delta
|
||||
emmet-language-server
|
||||
eslint_d
|
||||
@@ -88,6 +89,8 @@
|
||||
mcp-hub
|
||||
nixd
|
||||
nixfmt
|
||||
prettier
|
||||
typescript-language-server
|
||||
ormolu
|
||||
prettierd
|
||||
rust-analyzer
|
||||
@@ -96,6 +99,7 @@
|
||||
stylelint
|
||||
stylua
|
||||
tree-sitter
|
||||
tailwindcss-language-server
|
||||
typescript-language-server
|
||||
vscode-langservers-extracted
|
||||
vtsls
|
||||
|
||||
@@ -73,8 +73,11 @@
|
||||
tirith.enable = true;
|
||||
opencode.enable = true;
|
||||
};
|
||||
database.mssql.enable = true;
|
||||
database.postgresql.enable = true;
|
||||
database = {
|
||||
mssql.enable = true;
|
||||
postgresql.enable = true;
|
||||
redis.enable = true;
|
||||
};
|
||||
git.github.enable = true;
|
||||
git.gitlab.enable = true;
|
||||
secrets.vault.enable = true;
|
||||
|
||||
60
home/modules/ai-tools/claude-code.nix
Normal file
60
home/modules/ai-tools/claude-code.nix
Normal file
@@ -0,0 +1,60 @@
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.ai-tools.claude-code;
|
||||
rtk-version = "0.18.1";
|
||||
in
|
||||
{
|
||||
options.ai-tools.claude-code.enable = lib.mkEnableOption "claude code with rtk and ccline";
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
programs.claude-code.enable = true;
|
||||
|
||||
home.packages = with pkgs; [
|
||||
(stdenv.mkDerivation {
|
||||
name = "ccline";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Haleclipse/CCometixLine/releases/download/v1.0.8/ccline-linux-x64.tar.gz";
|
||||
hash = "sha256-Joe3Dd6uSMGi66QT6xr2oY/Tz8rA5RuKa6ckBVJIzI0=";
|
||||
};
|
||||
unpackPhase = "tar xzf $src";
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp ccline $out/bin/
|
||||
chmod +x $out/bin/ccline
|
||||
'';
|
||||
meta = {
|
||||
description = "CCometixLine Linux x64 CLI (Claude Code statusline)";
|
||||
homepage = "https://github.com/Haleclipse/CCometixLine";
|
||||
license = lib.licenses.mit;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
})
|
||||
(stdenv.mkDerivation {
|
||||
name = "rtk-${rtk-version}";
|
||||
version = rtk-version;
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rtk-ai/rtk/releases/download/v${rtk-version}/rtk-x86_64-unknown-linux-gnu.tar.gz";
|
||||
hash = "sha256-XoTia5K8b00OzcKYCufwx8ApkAS31DxUCpGSU0jFs2Q=";
|
||||
};
|
||||
unpackPhase = "tar xzf $src";
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp rtk $out/bin/
|
||||
chmod +x $out/bin/rtk
|
||||
'';
|
||||
meta = {
|
||||
description = "RTK - AI coding tool enhancer";
|
||||
homepage = "https://www.rtk-ai.app";
|
||||
license = lib.licenses.mit;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
})
|
||||
mcp-nixos
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -1,116 +1,8 @@
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.ai-tools;
|
||||
rtk-version = "0.18.1";
|
||||
in
|
||||
{
|
||||
options.ai-tools = {
|
||||
claude-code.enable = lib.mkEnableOption "claude code with rtk and ccline";
|
||||
tirith.enable = lib.mkEnableOption "tirith shell security guard";
|
||||
opencode.enable = lib.mkEnableOption "opencode";
|
||||
};
|
||||
|
||||
config = lib.mkMerge [
|
||||
(lib.mkIf cfg.claude-code.enable {
|
||||
home.packages = with pkgs; [
|
||||
claude-code
|
||||
(pkgs.stdenv.mkDerivation {
|
||||
name = "ccline";
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://github.com/Haleclipse/CCometixLine/releases/download/v1.0.8/ccline-linux-x64.tar.gz";
|
||||
hash = "sha256-Joe3Dd6uSMGi66QT6xr2oY/Tz8rA5RuKa6ckBVJIzI0=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
tar xzf $src
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp ccline $out/bin/
|
||||
chmod +x $out/bin/ccline
|
||||
'';
|
||||
|
||||
meta = with pkgs.lib; {
|
||||
description = "CCometixLine Linux x64 CLI (Claude Code statusline)";
|
||||
homepage = "https://github.com/Haleclipse/CCometixLine";
|
||||
license = licenses.mit;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
})
|
||||
(pkgs.stdenv.mkDerivation {
|
||||
name = "rtk-${rtk-version}";
|
||||
version = rtk-version;
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://github.com/rtk-ai/rtk/releases/download/v${rtk-version}/rtk-x86_64-unknown-linux-gnu.tar.gz";
|
||||
hash = "sha256-XoTia5K8b00OzcKYCufwx8ApkAS31DxUCpGSU0jFs2Q=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
tar xzf $src
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp rtk $out/bin/
|
||||
chmod +x $out/bin/rtk
|
||||
'';
|
||||
|
||||
meta = with pkgs.lib; {
|
||||
description = "RTK - AI coding tool enhancer";
|
||||
homepage = "https://www.rtk-ai.app";
|
||||
license = licenses.mit;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
})
|
||||
# mcp-nixos
|
||||
];
|
||||
})
|
||||
(lib.mkIf cfg.tirith.enable {
|
||||
home.packages = with pkgs; [
|
||||
tirith
|
||||
];
|
||||
})
|
||||
(lib.mkIf (cfg.tirith.enable && cfg.claude-code.enable) {
|
||||
home.file.".claude/hooks/tirith-check.py" = {
|
||||
source = ./tirith-check.py;
|
||||
executable = true;
|
||||
};
|
||||
|
||||
home.activation.tirith-claude-code = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
|
||||
${pkgs.tirith}/bin/tirith setup claude-code --with-mcp --scope user --force 2>/dev/null || true
|
||||
'';
|
||||
})
|
||||
(lib.mkIf cfg.opencode.enable {
|
||||
home.packages = with pkgs; [
|
||||
opencode
|
||||
];
|
||||
home.file.".config/opencode/opencode.json".text = builtins.toJSON {
|
||||
"$schema" = "https://opencode.ai/config.json";
|
||||
permission = {
|
||||
external_directory = {
|
||||
"/run/secrets/" = "deny";
|
||||
"~/.config/sops/age/keys.txt" = "deny";
|
||||
"~/.ssh/id_rsa" = "deny";
|
||||
"~/.ssh/id_ed25519" = "deny";
|
||||
"~/.ssh/id_ecdsa" = "deny";
|
||||
"~/.ssh/id_dsa" = "deny";
|
||||
"/etc/ssh/ssh_host_rsa_key" = "deny";
|
||||
"/etc/ssh/ssh_host_ed25519_key" = "deny";
|
||||
"/etc/ssh/ssh_host_ecdsa_key" = "deny";
|
||||
"/etc/ssh/ssh_host_dsa_key" = "deny";
|
||||
};
|
||||
command = {
|
||||
sops = "deny";
|
||||
};
|
||||
};
|
||||
plugin = [ "@mohak34/opencode-notifier@latest" ];
|
||||
};
|
||||
})
|
||||
imports = [
|
||||
./claude-code.nix
|
||||
./opencode.nix
|
||||
./skills.nix
|
||||
./tirith.nix
|
||||
];
|
||||
}
|
||||
|
||||
40
home/modules/ai-tools/opencode.nix
Normal file
40
home/modules/ai-tools/opencode.nix
Normal file
@@ -0,0 +1,40 @@
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.ai-tools.opencode;
|
||||
in
|
||||
{
|
||||
options.ai-tools.opencode = {
|
||||
enable = lib.mkEnableOption "opencode";
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
home.packages = [ pkgs.opencode ];
|
||||
|
||||
home.file.".config/opencode/opencode.json".text = builtins.toJSON {
|
||||
"$schema" = "https://opencode.ai/config.json";
|
||||
permission = {
|
||||
external_directory = {
|
||||
"/run/secrets/" = "deny";
|
||||
"~/.config/sops/age/keys.txt" = "deny";
|
||||
"~/.ssh/id_rsa" = "deny";
|
||||
"~/.ssh/id_ed25519" = "deny";
|
||||
"~/.ssh/id_ecdsa" = "deny";
|
||||
"~/.ssh/id_dsa" = "deny";
|
||||
"/etc/ssh/ssh_host_rsa_key" = "deny";
|
||||
"/etc/ssh/ssh_host_ed25519_key" = "deny";
|
||||
"/etc/ssh/ssh_host_ecdsa_key" = "deny";
|
||||
"/etc/ssh/ssh_host_dsa_key" = "deny";
|
||||
};
|
||||
command = {
|
||||
sops = "deny";
|
||||
};
|
||||
};
|
||||
plugin = [ "@mohak34/opencode-notifier@latest" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
49
home/modules/ai-tools/skills.nix
Normal file
49
home/modules/ai-tools/skills.nix
Normal file
@@ -0,0 +1,49 @@
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.ai-tools.claude-code;
|
||||
|
||||
skillType = lib.types.submodule {
|
||||
options = {
|
||||
owner = lib.mkOption { type = lib.types.str; };
|
||||
repo = lib.mkOption { type = lib.types.str; };
|
||||
rev = lib.mkOption { type = lib.types.str; };
|
||||
hash = lib.mkOption { type = lib.types.str; };
|
||||
skill = lib.mkOption { type = lib.types.str; };
|
||||
};
|
||||
};
|
||||
|
||||
fetchSkill =
|
||||
skill:
|
||||
let
|
||||
src = pkgs.fetchFromGitHub {
|
||||
inherit (skill)
|
||||
owner
|
||||
repo
|
||||
rev
|
||||
hash
|
||||
;
|
||||
};
|
||||
in
|
||||
{
|
||||
name = ".claude/skills/${skill.skill}";
|
||||
value = {
|
||||
source = "${src}/${skill.skill}";
|
||||
recursive = true;
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
options.ai-tools.claude-code.skills = lib.mkOption {
|
||||
type = lib.types.listOf skillType;
|
||||
default = [ ];
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
home.file = builtins.listToAttrs (map fetchSkill cfg.skills);
|
||||
};
|
||||
}
|
||||
30
home/modules/ai-tools/tirith.nix
Normal file
30
home/modules/ai-tools/tirith.nix
Normal file
@@ -0,0 +1,30 @@
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.ai-tools.tirith;
|
||||
in
|
||||
{
|
||||
options.ai-tools.tirith = {
|
||||
enable = lib.mkEnableOption "tirith shell security guard";
|
||||
};
|
||||
|
||||
config = lib.mkMerge [
|
||||
(lib.mkIf cfg.enable {
|
||||
home.packages = [ pkgs.tirith ];
|
||||
})
|
||||
(lib.mkIf (cfg.enable && config.ai-tools.claude-code.enable) {
|
||||
home.file.".claude/hooks/tirith-check.py" = {
|
||||
source = ./tirith-check.py;
|
||||
executable = true;
|
||||
};
|
||||
|
||||
home.activation.tirith-claude-code = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
|
||||
${pkgs.tirith}/bin/tirith setup claude-code --with-mcp --scope user --force 2>/dev/null || true
|
||||
'';
|
||||
})
|
||||
];
|
||||
}
|
||||
@@ -9,14 +9,18 @@
|
||||
options.database = {
|
||||
mssql.enable = lib.mkEnableOption "MSSQL";
|
||||
postgresql.enable = lib.mkEnableOption "PostgreSQL";
|
||||
redis.enable = lib.mkEnableOption "Redis";
|
||||
};
|
||||
|
||||
config = lib.mkMerge [
|
||||
(lib.mkIf config.database.mssql.enable {
|
||||
home.packages = [ (config.nixgl.wrap pkgs.dbeaver-bin) ];
|
||||
home.packages = with pkgs; [ (config.nixgl.wrap dbeaver-bin) ];
|
||||
})
|
||||
(lib.mkIf config.database.postgresql.enable {
|
||||
home.packages = [ (config.nixgl.wrap pkgs.pgadmin4-desktopmode) ];
|
||||
home.packages = with pkgs; [ (config.nixgl.wrap pgadmin4-desktopmode) ];
|
||||
})
|
||||
(lib.mkIf config.database.postgresql.enable {
|
||||
home.packages = with pkgs; [ redis ];
|
||||
})
|
||||
];
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@ in
|
||||
clock-show-weekday = true;
|
||||
color-scheme = "prefer-dark";
|
||||
enable-hot-corners = false;
|
||||
font-name = font;
|
||||
# font-name = font;
|
||||
locate-pointer = true;
|
||||
monospace-font-name = font;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user