@@ -1,15 +1,11 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
system,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
selfPkgs = inputs.self.packages.${system};
|
||||
in
|
||||
{
|
||||
security.pki.certificateFiles = lib.lists.optionals config.sas.build.private [
|
||||
"${selfPkgs.sas-cacert}/etc/ssl/certs/ca-bundle.crt"
|
||||
];
|
||||
security.pki.certificateFiles =
|
||||
with pkgs;
|
||||
lib.lists.optionals config.sas.build.private [ "${sas-cacert}/etc/ssl/certs/ca-bundle.crt" ];
|
||||
}
|
||||
|
@@ -1,13 +1,10 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
system,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
selfPkgs = inputs.self.packages.${system};
|
||||
in
|
||||
{
|
||||
sops.secrets = {
|
||||
"ssh/personal/key" = {
|
||||
@@ -45,10 +42,7 @@ in
|
||||
'';
|
||||
|
||||
knownHostsFiles =
|
||||
with selfPkgs;
|
||||
(
|
||||
[ ssh-known-hosts-github ]
|
||||
++ lib.lists.optionals config.sas.build.private [ ssh-known-hosts-sas-gitlab ]
|
||||
);
|
||||
with pkgs.sshKnownHosts;
|
||||
([ github ] ++ lib.lists.optionals config.sas.build.private [ sas-gitlab ]);
|
||||
};
|
||||
}
|
||||
|
@@ -1,5 +1,12 @@
|
||||
{ config, inputs, ... }:
|
||||
{
|
||||
nixpkgs.overlays = [
|
||||
inputs.lib.overlays.default
|
||||
inputs.self.overlays.default
|
||||
inputs.nur.overlays.default
|
||||
inputs.sas.overlays.default
|
||||
];
|
||||
|
||||
imports = [
|
||||
./options.nix
|
||||
|
||||
@@ -7,6 +14,8 @@
|
||||
./format.nix
|
||||
./hardware
|
||||
|
||||
inputs.sas.nixosModules.default
|
||||
|
||||
../common/configs/system
|
||||
|
||||
../common/configs/system/bluetooth
|
||||
@@ -47,11 +56,10 @@
|
||||
../common/configs/system/users
|
||||
../common/configs/system/zsh
|
||||
|
||||
./configs/globalprotect
|
||||
./configs/pki
|
||||
./configs/ssh
|
||||
|
||||
"${inputs.sas}/hosts/elara/configs/globalprotect"
|
||||
|
||||
./users/nikara
|
||||
];
|
||||
|
||||
|
@@ -1,8 +0,0 @@
|
||||
{ user, home }:
|
||||
{ inputs, ... }:
|
||||
{
|
||||
home-manager.users.${user}.sops.secrets = {
|
||||
"artifactory/cdp/user".sopsFile = "${inputs.secrets}/domains/sas/secrets.yaml";
|
||||
"artifactory/cdp/password".sopsFile = "${inputs.secrets}/domains/sas/secrets.yaml";
|
||||
};
|
||||
}
|
@@ -1,9 +0,0 @@
|
||||
{ user, home }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
home-manager.users.${user}.home.packages = with pkgs; [
|
||||
gcc
|
||||
cmake
|
||||
gnumake
|
||||
];
|
||||
}
|
@@ -1,26 +0,0 @@
|
||||
{ user, home }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.persistence."/persist/cache"."${home}/.local/share/go" = { };
|
||||
|
||||
home-manager.users.${user} = {
|
||||
programs.go = {
|
||||
enable = true;
|
||||
goPath = ".local/share/go";
|
||||
};
|
||||
|
||||
home = {
|
||||
packages = with pkgs; [
|
||||
gopls
|
||||
go-tools
|
||||
golangci-lint
|
||||
golangci-lint-langserver
|
||||
];
|
||||
|
||||
sessionVariables = {
|
||||
GOPROXY = "goproxy.unx.sas.com";
|
||||
GONOSUMDB = "*.sas.com,sassoftware.io";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
@@ -1,23 +0,0 @@
|
||||
{ user, home }:
|
||||
{ config, pkgs, ... }:
|
||||
let
|
||||
hmConfig = config.home-manager.users.${user};
|
||||
in
|
||||
{
|
||||
environment.persistence."/persist/cache"."${home}/.local/share/gradle" = { };
|
||||
|
||||
home-manager.users.${user} = {
|
||||
programs.gradle = {
|
||||
enable = true;
|
||||
home = ".local/share/gradle";
|
||||
};
|
||||
|
||||
sops.templates."gradle.properties" = {
|
||||
content = ''
|
||||
cdpUser=${hmConfig.sops.placeholder."artifactory/cdp/user"}
|
||||
cdpPassword=${hmConfig.sops.placeholder."artifactory/cdp/password"}
|
||||
'';
|
||||
path = "${home}/.local/share/gradle/gradle.properties";
|
||||
};
|
||||
};
|
||||
}
|
@@ -1,8 +0,0 @@
|
||||
{ user, home }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
home-manager.users.${user}.programs.java = {
|
||||
enable = true;
|
||||
package = pkgs.jdk17;
|
||||
};
|
||||
}
|
@@ -1,17 +0,0 @@
|
||||
{ user, home }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
nixpkgs.overlays = [
|
||||
(final: prev: {
|
||||
telepresence = prev.telepresence.overrideAttrs (oldAttrs: {
|
||||
patches = oldAttrs.patches or [ ] ++ [ ./extend-timeout.patch ];
|
||||
});
|
||||
})
|
||||
];
|
||||
|
||||
home-manager.users.${user}.home.packages = with pkgs; [
|
||||
telepresence
|
||||
kubeval
|
||||
calicoctl
|
||||
];
|
||||
}
|
@@ -1,13 +0,0 @@
|
||||
diff --git a/telepresence/proxy/remote.py b/telepresence/proxy/remote.py
|
||||
index 835d42054..d910bd03f 100644
|
||||
--- a/telepresence/proxy/remote.py
|
||||
+++ b/telepresence/proxy/remote.py
|
||||
@@ -112,7 +112,7 @@ def wait_for_pod(runner: Runner, remote_info: RemoteInfo) -> None:
|
||||
runner.kubectl(
|
||||
"wait",
|
||||
"--for=condition=ready",
|
||||
- "--timeout=60s",
|
||||
+ "--timeout=240s",
|
||||
"pod/" + remote_info.pod_name,
|
||||
)
|
||||
)
|
@@ -1,12 +1,82 @@
|
||||
{ user, home }:
|
||||
{ inputs, system, ... }:
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
selfPkgs = inputs.self.packages.${system};
|
||||
hmConfig = config.home-manager.users.${user};
|
||||
in
|
||||
{
|
||||
home-manager.users.${user}.home.packages = with selfPkgs; [
|
||||
sagew
|
||||
sonder
|
||||
klog
|
||||
];
|
||||
environment.persistence."/persist/cache" = {
|
||||
"${home}/.local/share/go" = { };
|
||||
"${home}/.local/share/gradle" = { };
|
||||
};
|
||||
|
||||
home-manager.users.${user} = {
|
||||
sops = {
|
||||
secrets = {
|
||||
"artifactory/cdp/user".sopsFile = "${inputs.secrets}/domains/sas/secrets.yaml";
|
||||
"artifactory/cdp/password".sopsFile = "${inputs.secrets}/domains/sas/secrets.yaml";
|
||||
"viya/orders-api/key".sopsFile = "${inputs.secrets}/domains/sas/secrets.yaml";
|
||||
"viya/orders-api/secret".sopsFile = "${inputs.secrets}/domains/sas/secrets.yaml";
|
||||
};
|
||||
|
||||
templates."gradle.properties" = {
|
||||
content = ''
|
||||
cdpUser=${hmConfig.sops.placeholder."artifactory/cdp/user"}
|
||||
cdpPassword=${hmConfig.sops.placeholder."artifactory/cdp/password"}
|
||||
'';
|
||||
path = "${home}/.local/share/gradle/gradle.properties";
|
||||
};
|
||||
};
|
||||
|
||||
programs = {
|
||||
go = {
|
||||
enable = true;
|
||||
goPath = ".local/share/go";
|
||||
};
|
||||
|
||||
gradle = {
|
||||
enable = true;
|
||||
home = ".local/share/gradle";
|
||||
};
|
||||
|
||||
java = {
|
||||
enable = true;
|
||||
package = pkgs.jdk17;
|
||||
};
|
||||
};
|
||||
|
||||
home = {
|
||||
packages =
|
||||
with pkgs;
|
||||
[
|
||||
gopls
|
||||
go-tools
|
||||
golangci-lint
|
||||
golangci-lint-langserver
|
||||
]
|
||||
++ lib.lists.optionals config.sas.build.private [
|
||||
viya4-orders-cli
|
||||
sagew
|
||||
sonder
|
||||
klog
|
||||
];
|
||||
|
||||
sessionVariables = {
|
||||
GOPROXY = "goproxy.unx.sas.com";
|
||||
GONOSUMDB = "*.sas.com,sassoftware.io";
|
||||
};
|
||||
};
|
||||
|
||||
xdg.configFile."viya4-orders-cli/config.yaml" = lib.mkIf config.sas.build.private {
|
||||
source = (pkgs.formats.yaml { }).generate "config.yaml" {
|
||||
clientCredentialsIdFile = hmConfig.sops.secrets."viya/orders-api/key".path;
|
||||
clientCredentialsSecretFile = hmConfig.sops.secrets."viya/orders-api/secret".path;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@@ -2,13 +2,12 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
system,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
hmConfig = config.home-manager.users.${user};
|
||||
selfPkgs = inputs.self.packages.${system};
|
||||
in
|
||||
{
|
||||
home-manager.users.${user} = {
|
||||
@@ -143,18 +142,22 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
userKnownHostsFiles =
|
||||
with selfPkgs;
|
||||
[
|
||||
ssh-known-hosts-github
|
||||
ssh-known-hosts-gitlab
|
||||
]
|
||||
++ lib.lists.optionals config.sas.build.private [
|
||||
ssh-known-hosts-sas-cldlgn
|
||||
ssh-known-hosts-sas-gitlab
|
||||
ssh-known-hosts-sas-gerrit
|
||||
ssh-known-hosts-sas-artifact
|
||||
];
|
||||
userKnownHostsFile = builtins.concatStringsSep " " (
|
||||
with pkgs.sshKnownHosts;
|
||||
(
|
||||
[
|
||||
"${home}/.ssh/known_hosts"
|
||||
github
|
||||
gitlab
|
||||
]
|
||||
++ lib.lists.optionals config.sas.build.private [
|
||||
sas-cldlgn
|
||||
sas-gitlab
|
||||
sas-gerrit
|
||||
sas-artifact
|
||||
]
|
||||
)
|
||||
);
|
||||
};
|
||||
|
||||
git.extraConfig.url = {
|
||||
|
@@ -1,29 +0,0 @@
|
||||
{ user, home }:
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
pkgs,
|
||||
system,
|
||||
...
|
||||
}:
|
||||
let
|
||||
selfPkgs = inputs.self.packages.${system};
|
||||
hmConfig = config.home-manager.users.${user};
|
||||
in
|
||||
{
|
||||
home-manager.users.${user} = {
|
||||
sops.secrets = {
|
||||
"viya/orders-api/key".sopsFile = "${inputs.secrets}/domains/sas/secrets.yaml";
|
||||
"viya/orders-api/secret".sopsFile = "${inputs.secrets}/domains/sas/secrets.yaml";
|
||||
};
|
||||
|
||||
home.packages = [ selfPkgs.viya4-orders-cli ];
|
||||
|
||||
xdg.configFile."viya4-orders-cli/config.yaml".source =
|
||||
(pkgs.formats.yaml { }).generate "config.yaml"
|
||||
{
|
||||
clientCredentialsIdFile = hmConfig.sops.secrets."viya/orders-api/key".path;
|
||||
clientCredentialsSecretFile = hmConfig.sops.secrets."viya/orders-api/secret".path;
|
||||
};
|
||||
};
|
||||
}
|
@@ -85,17 +85,10 @@ in
|
||||
(import ../../../common/configs/user/gui/x11 { inherit user home; })
|
||||
(import ../../../common/configs/user/gui/xdg { inherit user home; })
|
||||
|
||||
(import ./configs/console/artifactory { inherit user home; })
|
||||
(import ./configs/console/c { inherit user home; })
|
||||
(import ./configs/console/go { inherit user home; })
|
||||
(import ./configs/console/gpg { inherit user home; })
|
||||
(import ./configs/console/gradle { inherit user home; })
|
||||
(import ./configs/console/java { inherit user home; })
|
||||
(import ./configs/console/kubernetes { inherit user home; })
|
||||
(import ./configs/console/podman { inherit user home; })
|
||||
(import ./configs/console/sas { inherit user home; })
|
||||
(import ./configs/console/ssh { inherit user home; })
|
||||
(import ./configs/console/viya4-orders-cli { inherit user home; })
|
||||
|
||||
(import ./configs/gui/obsidian { inherit user home; })
|
||||
(import ./configs/gui/vscode { inherit user home; })
|
||||
|
Reference in New Issue
Block a user