Compare commits

..

9 Commits

12 changed files with 122 additions and 55 deletions

View File

@@ -103,13 +103,6 @@ if [[ -z "${SSH_CONNECTION}" ]]; then
fi fi
# }}} # }}}
# pnpm
export PNPM_HOME="/home/h/.local/share/pnpm"
case ":$PATH:" in
*":$PNPM_HOME:"*) ;;
*) export PATH="$PNPM_HOME:$PATH" ;;
esac
# pnpm end
# Codi # Codi
# Usage: codi [filetype] [filename] # Usage: codi [filetype] [filename]

30
flake.lock generated
View File

@@ -121,11 +121,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1771669320, "lastModified": 1771732978,
"narHash": "sha256-LqmgIBpjpMQKkHKCSGJkluMVFFoBdkUhJnu+Cq+jgGc=", "narHash": "sha256-o7gZh/eXFkEEmzwlBdIbgCJhmdlqQhOhVjudqgsIefg=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "496abb3aef244b896bf7cdd65e071cf624f16338", "rev": "18226106e18bc40cce99d436ee741a946f1888f6",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@@ -284,11 +284,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770726378, "lastModified": 1771857445,
"narHash": "sha256-kck+vIbGOaM/dHea7aTBxdFYpeUl/jHOy5W3eyRvVx8=", "narHash": "sha256-NCrhxU9wq5+4jQG1fvRbyTnH8GSbH6LovreVoH2fOL4=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae", "rev": "3d7a52f678227930ab089f5d9b384f2d50f7d534",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -344,11 +344,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1771683283, "lastModified": 1771851181,
"narHash": "sha256-WxAEkAbo8dP7qiyPM6VN4ZGAxfuBVlNBNPkrqkrXVEc=", "narHash": "sha256-gFgE6mGUftwseV3DUENMb0k0EiHd739lZexPo5O/sdQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c6ed3eab64d23520bcbb858aa53fe2b533725d4a", "rev": "9a4b494b1aa1b93d8edf167f46dc8e0c0011280c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -667,11 +667,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1771524872, "lastModified": 1771735105,
"narHash": "sha256-eksVUcUsfS9mQx4D9DrYu88u9w70bAf+n6KmTDuIGEE=", "narHash": "sha256-MJuVJeszZEziquykEHh/hmgIHYxUcuoG/1aowpLiSeU=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "e85540ffe97322dc1fea14dd11cdc2f59d540ac7", "rev": "d7755d820f5fa8acf7f223309c33e25d4f92e74f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -717,11 +717,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1771626923, "lastModified": 1771787992,
"narHash": "sha256-Mn6oeKrY+Sw6kH0jK+hp5QQH4MTcqwBRQL/ScZDNcz8=", "narHash": "sha256-Vg4bGwwenNYI8p3nJTl9FRyeIyrjATeZrZr+GyUSDrw=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "b09847414b50c65788936199918272377f70fb91", "rev": "30054cca073b49b42a71289edec858f535b27fe9",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -9,11 +9,9 @@ with pkgs;
htop htop
jq jq
nmap nmap
nodejs_24
nvimpager nvimpager
parallel parallel
pass pass
pnpm
ripgrep ripgrep
silver-searcher silver-searcher
sops sops

View File

@@ -13,14 +13,15 @@ in
inputs.sops-nix.homeManagerModules.sops inputs.sops-nix.homeManagerModules.sops
../../modules ../../modules
../../modules/stylix.nix ../../modules/stylix.nix
../../modules/lib.nix
../../modules/ai-tools.nix ../../modules/ai-tools.nix
../../modules/cloud ../../modules/cloud
../../modules/comms ../../modules/comms
../../modules/desktop/niri
../../modules/dconf.nix ../../modules/dconf.nix
../../modules/direnv ../../modules/direnv
../../modules/docker ../../modules/docker
../../modules/git ../../modules/git
../../modules/go
../../modules/k8s ../../modules/k8s
../../modules/k8s/k9s.nix ../../modules/k8s/k9s.nix
../../modules/keepassxc.nix ../../modules/keepassxc.nix
@@ -30,8 +31,11 @@ in
../../modules/browser ../../modules/browser
../../modules/shell ../../modules/shell
../../modules/music ../../modules/music
../../modules/nodejs.nix
../../modules/taskwarrior.nix ../../modules/taskwarrior.nix
../../modules/bruno.nix ../../modules/bruno.nix
../../modules/pandoc.nix
../../modules/vscode.nix
]; ];
sops = { sops = {
@@ -44,15 +48,30 @@ in
taskwarrior_sync_encryption_secret = { }; taskwarrior_sync_encryption_secret = { };
anki_sync_user = { }; anki_sync_user = { };
anki_sync_key = { }; anki_sync_key = { };
opencode_api_key = { };
}; };
templates."taskrc.d/sync" = { templates = {
"taskrc.d/sync" = {
content = '' content = ''
sync.server.url=${config.sops.placeholder.taskwarrior_sync_server_url} sync.server.url=${config.sops.placeholder.taskwarrior_sync_server_url}
sync.server.client_id=${config.sops.placeholder.taskwarrior_sync_server_client_id} sync.server.client_id=${config.sops.placeholder.taskwarrior_sync_server_client_id}
sync.encryption_secret=${config.sops.placeholder.taskwarrior_sync_encryption_secret} sync.encryption_secret=${config.sops.placeholder.taskwarrior_sync_encryption_secret}
''; '';
}; };
"opencode/auth.json" = {
path = "${config.home.homeDirectory}/.local/share/opencode/auth.json";
content = ''
{
"zai-coding-plan": {
"type": "api",
"key": "${config.sops.placeholder.opencode_api_key}"
}
}
'';
};
};
}; };
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
@@ -73,7 +92,10 @@ in
cloud.azure.enable = true; cloud.azure.enable = true;
comms.signal.enable = true; comms.signal.enable = true;
comms.teams.enable = true; comms.teams.enable = true;
ai-tools.claude-code.enable = true; ai-tools = {
claude-code.enable = true;
opencode.enable = true;
};
github.enable = true; github.enable = true;
gitlab.enable = true; gitlab.enable = true;
pandoc.enable = true; pandoc.enable = true;

View File

@@ -1,19 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let
needsNixGL = config.lib ? nixGL;
bruno =
if needsNixGL then
pkgs.bruno.overrideAttrs (old: {
postInstall = (old.postInstall or "") + ''
wrapProgram $out/bin/bruno --add-flags "--no-sandbox"
'';
})
else
pkgs.bruno;
in
{ {
config = { config = {
home.packages = [ (config.nixgl.wrap bruno) ]; home.packages = [ (config.nixgl.wrap (config.wrapApp pkgs.bruno "--no-sandbox")) ];
}; };
} }

View File

@@ -4,8 +4,9 @@
pkgs, pkgs,
... ...
}: }:
{ {
config = lib.mkIf config.comms.signal.enable { config = lib.mkIf config.comms.signal.enable {
home.packages = [ (config.nixgl.wrap pkgs.signal-desktop) ]; home.packages = [ (config.nixgl.wrap (config.wrapApp pkgs.signal-desktop "--no-sandbox")) ];
}; };
} }

View File

@@ -7,6 +7,6 @@
{ {
config = lib.mkIf config.comms.teams.enable { config = lib.mkIf config.comms.teams.enable {
home.packages = [ (config.nixgl.wrap pkgs.teams-for-linux) ]; home.packages = [ (config.nixgl.wrap (config.wrapApp pkgs.teams-for-linux "--no-sandbox")) ];
}; };
} }

View File

@@ -6,4 +6,19 @@
default = if config.lib ? nixGL then config.lib.nixGL.wrap else lib.id; default = if config.lib ? nixGL then config.lib.nixGL.wrap else lib.id;
readOnly = true; readOnly = true;
}; };
options.wrapApp = lib.mkOption {
type = lib.types.raw;
default =
pkg: flags:
if config.lib ? nixGL then
pkg.overrideAttrs (old: {
postInstall = (old.postInstall or "") + ''
wrapProgram $out/bin/${pkg.meta.mainProgram} --add-flags "${flags}"
'';
})
else
pkg;
readOnly = true;
};
} }

View File

@@ -0,0 +1,18 @@
{
config,
lib,
pkgs,
...
}:
{
options.go = {
enable = lib.mkEnableOption "go language";
};
config = lib.mkIf config.go.enable {
home.packages = with pkgs; [
go
gopls
];
};
}

26
home/modules/nodejs.nix Normal file
View File

@@ -0,0 +1,26 @@
{
config,
lib,
pkgs,
...
}:
{
options.nodejs = {
enable = lib.mkEnableOption "nodejs (and related packages)";
package = lib.mkOption {
type = lib.types.package;
default = pkgs.nodejs_24;
};
};
config = lib.mkIf config.nodejs.enable {
home.packages = with pkgs; [
config.nodejs.package
pnpm
yarn
biome
tsx
];
};
}

View File

@@ -1,20 +1,19 @@
{ {
lib,
config, config,
lib,
pkgs, pkgs,
... ...
}: }:
let
cfg = config.pandoc;
in
{ {
options.pandoc.enable = lib.mkEnableOption "pandoc with crossref"; options.pandoc = {
enable = lib.mkEnableOption "pandoc";
};
config = lib.mkIf cfg.enable { config = lib.mkIf config.pandoc.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
pandoc
haskellPackages.pandoc-crossref haskellPackages.pandoc-crossref
pandoc
texliveSmall
]; ];
}; };
} }

7
home/modules/vscode.nix Normal file
View File

@@ -0,0 +1,7 @@
{ config, pkgs, ... }:
{
config = {
home.packages = [ (config.nixgl.wrap (config.wrapApp pkgs.vscode "--disable-gpu-sandbox")) ];
};
}