Commit 164caf899134
Changed files (9)
home
common
desktop
home/common/desktop/default.nix
@@ -17,7 +17,7 @@
./passage.nix
./xdg.nix
- ../dev/base.nix
+ ../dev/default.nix
../dev/desktop.nix
];
home/common/dev/base.nix
@@ -1,12 +1,5 @@
{ config, pkgs, ... }:
{
- imports = [
- ./ai.nix
- ./go.nix
- ./nix.nix
- ./python.nix
- ];
-
home.sessionVariables = {
CARGO_HOME = "${config.xdg.dataHome}/cargo";
};
@@ -47,7 +40,6 @@
yamlfmt
yq-go
# radicle-node
- vscode-fhs
bash-language-server
];
home/common/dev/containers.nix
@@ -24,8 +24,6 @@
snazy
kubelogin-oidc
chmouzies-kubernetes
- tektoncd-cli
- tektoncd-cli-pac
# knd
# build
dagger
home/common/dev/default.nix
@@ -1,10 +1,10 @@
-{
- lib,
- desktop,
- ...
-}:
+{ lib, desktop, ... }:
{
imports = [
+ ./ai.nix
+ ./go.nix
+ ./nix.nix
+ ./python.nix
./base.nix
]
++ lib.optional (builtins.isString desktop) ./desktop.nix;
home/common/dev/desktop.nix
@@ -1,6 +1,10 @@
-{ ... }:
+{ pkgs, ... }:
{
imports = [
./emacs.nix
];
+
+ home.packages = with pkgs; [
+ vscode-fhs
+ ];
}
home/common/dev/tektoncd.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+ home.packages = with pkgs; [
+ tektoncd-cli
+ tektoncd-cli-pac
+ ];
+}
systems/aomi/home.nix
@@ -1,9 +1,10 @@
{ pkgs, ... }:
{
imports = [
- ../../home/common/dev/base.nix
+ ../../home/common/dev/default.nix
../../home/common/dev/emacs.nix
../../home/common/dev/containers.nix
+ ../../home/common/dev/tekton.nix
];
services.ssh-agent.enable = true;
systemd.user.services.syncthing.Install.WantedBy = [ "multi-user.target" ];
systems/kyushu/home.nix
@@ -2,6 +2,7 @@
{
imports = [
../../home/common/dev/containers.nix
+ ../../home/common/dev/tektoncd.nix
];
nixpkgs.config.allowUnfree = true;
systems/nagoya/home.nix
@@ -1,7 +1,7 @@
_: {
imports = [
../../home/common/dev/base.nix
- ../../home/common/dev/emacs.nix
+ # ../../home/common/dev/emacs.nix
../../home/common/dev/containers.nix
];
systemd.user.services.syncthing.Install.WantedBy = [ "multi-user.target" ];