Compare commits

...

36 Commits

Author SHA1 Message Date
arnie 9503c33f24 Mac things 2026-01-13 13:26:57 +01:00
arnie fa9c2115e9 Add claude code to mac 2026-01-02 23:28:02 +01:00
arnie b9b62ea3c3 Formatting and hammerspoon 2025-12-29 12:23:03 +01:00
arnie c34274413a Add session manager plugin 2025-12-29 12:21:57 +01:00
arnie 0a7d543ff4 Update darwin stuff 2025-12-29 10:16:31 +01:00
Arnie 4c7d1aabea Add tree 2025-12-14 21:57:38 +01:00
Arnie 43fe34151a Update becky 2025-12-14 20:10:10 +01:00
Arnie ebcc853148 Fix pinentry for linux 2025-12-08 16:05:39 +01:00
Arnie 524ccea715 Update flake 2025-12-08 16:05:28 +01:00
Arnie 5c15c6885d Update flakes 2025-11-09 21:35:53 +01:00
arnie 7e2ae203da veracode gov stage access 2025-09-04 17:03:40 +02:00
arnie b163b2f9ce Formatting 2025-08-21 12:33:25 +02:00
arnie 7385941c96 Implement okta aws cli 2025-08-21 12:33:12 +02:00
arnie 22511d0238 Implement okta gov aws cli 2025-08-21 11:32:28 +02:00
arnie 0a9f041a3d Increase scollback limit in ghostty 2025-08-21 11:32:10 +02:00
arnie de2805aea2 Pass inputs to nix darwin 2025-08-21 11:31:52 +02:00
arnie 92d6ff3520 Update flakes 2025-08-21 11:31:42 +02:00
arnie 405af3517e Fix nix darwin activation script after update 2025-08-21 11:31:24 +02:00
arnie 2972486a85 Add shell script to cleanup aws clusters from kubeconfig 2025-07-29 10:51:13 +02:00
arnie 409a96c224 Fix grep reference from coreutils 2025-07-17 15:44:33 +02:00
arnie a7feabf2b8 Refactor zsh, add aws-sharable-url shell alias 2025-07-16 10:27:02 +02:00
arnie b7ff5d4869 Configure wireguard and ssh access for mac 2025-07-10 11:01:56 +02:00
arnie 261331252a Replace wireshark with wireshark-qt on mac 2025-07-09 10:17:04 +02:00
arnie a11c62c437 Add git insteadOf url for gitlab ssh 2025-07-09 10:00:49 +02:00
arnie a8a693cd95 Add wireshark to mac 2025-07-09 10:00:37 +02:00
arnie 0ae905e88f Add trusted substituters for nixpkgs terraform 2025-07-09 10:00:19 +02:00
arnie 8a56ff1571 Add rigrep 2025-07-09 09:59:29 +02:00
arnie c90d529ff6 Add yq to common packages 2025-06-11 10:10:08 +02:00
arnie 334780b2f4 QoL window move 2025-05-28 11:12:33 +02:00
arnie a9f26cfd6b Prepare window switching for all spaces 2025-04-30 09:21:52 +02:00
arnie f8807df81c Update mac config for aws and keepass 2025-04-30 09:13:04 +02:00
arnie 6372897237 Update flake inputs 2025-04-30 09:12:38 +02:00
arnie 6288dedcfe Increase ghostty scrollback limit 2025-04-23 11:33:27 +02:00
arnie 4026e78eb2 Update veracode-eu cli 2025-03-25 15:30:46 +01:00
arnie 51e76513c0 Add scrollback-limit to ghostty config 2025-03-25 12:19:19 +01:00
arnie 3a44cf40b7 Update veracode aws cli profiles 2025-03-25 12:19:00 +01:00
28 changed files with 777 additions and 222 deletions
+1
View File
@@ -0,0 +1 @@
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKxA6m6fD1jch/HwkWBaaYyr0HPttzM0i1D+V2MtMmFK becky@dingleberry
+1
View File
@@ -0,0 +1 @@
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKFOQaA7023StG5vSl0txUbAXmPdsIFeWHLDHXlT5yZp lcech@lcech-mac-veracode
+8 -6
View File
@@ -52,6 +52,7 @@ in
git git
coreutils coreutils
vim vim
flameshot
wireguard-tools wireguard-tools
]; ];
@@ -94,12 +95,6 @@ in
# $ darwin-rebuild changelog # $ darwin-rebuild changelog
system.stateVersion = 5; system.stateVersion = 5;
system.activationScripts.postUserActivation.text = ''
# activateSettings -u will reload the settings from the database and apply them to the current session,
# so we do not need to logout and login again to make the changes take effect.
/System/Library/PrivateFrameworks/SystemAdministration.framework/Resources/activateSettings -u
'';
system.defaults = { system.defaults = {
dock = { dock = {
autohide = true; autohide = true;
@@ -183,6 +178,13 @@ in
nix.settings = { nix.settings = {
experimental-features = lib.mkDefault "nix-command flakes"; experimental-features = lib.mkDefault "nix-command flakes";
trusted-substituters = [
"https://nixpkgs-terraform.cachix.org"
];
trusted-public-keys = [
"nixpkgs-terraform.cachix.org-1:8Sit092rIdAVENA3ZVeH9hzSiqI/jng6JiCrQ1Dmusw="
];
}; };
homebrew = { homebrew = {
+16 -2
View File
@@ -5,13 +5,23 @@
# brew install --cask # brew install --cask
# these need to be updated manually # these need to be updated manually
homebrew.casks = [ homebrew.casks = [
"flameshot" "drawio"
"ghostty" "ghostty"
"keepassxc" "keepassxc"
"spotify" "spotify"
"drawio" "wireshark-chmodbpf"
"visual-studio-code"
]; ];
system.primaryUser = "lcech";
system.activationScripts.postActivation.text = ''
# activateSettings -u will reload the settings from the database and apply them to the current session,
# so we do not need to logout and login again to make the changes take effect.
defaults write -g 'com.apple.mouse.linear' 1
sudo -u lcech /System/Library/PrivateFrameworks/SystemAdministration.framework/Resources/activateSettings -u
'';
system.defaults.dock.persistent-apps = [ system.defaults.dock.persistent-apps = [
"/Applications/Cursor.app" "/Applications/Cursor.app"
"/Applications/Firefox.app" "/Applications/Firefox.app"
@@ -23,4 +33,8 @@
"/Applications/zoom.us.app" "/Applications/zoom.us.app"
"/System/Applications/Notes.app" "/System/Applications/Notes.app"
]; ];
users.users.lcech.openssh.authorizedKeys.keys = [
"${builtins.readFile ../.authorized-keys/dingleberry}"
];
} }
Generated
+183 -26
View File
@@ -1,12 +1,18 @@
{ {
"nodes": { "nodes": {
"cl-nix-lite": { "cl-nix-lite": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs",
"systems": "systems",
"treefmt-nix": "treefmt-nix"
},
"locked": { "locked": {
"lastModified": 1728174978, "lastModified": 1766810506,
"narHash": "sha256-Grqqg+xuicANB85j0gNEXxi9SBKY7bzGeTuyi95eGcY=", "narHash": "sha256-I4BxozsEu205tA7jazufztI8ZQ5p7hcCnjqrSKPz9nI=",
"owner": "hraban", "owner": "hraban",
"repo": "cl-nix-lite", "repo": "cl-nix-lite",
"rev": "31cfe6275c341eb3120a99f4b1c8516c49a29d87", "rev": "038e341cede255a83a8f04af114dc95717461d32",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -32,6 +38,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1765835352,
"narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "a34fae9c08a15ad73f295041fec82323541400a9",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": [ "systems": [
@@ -53,12 +77,15 @@
} }
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": {
"systems": "systems_3"
},
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1731533236,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -74,11 +101,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741128660, "lastModified": 1766980997,
"narHash": "sha256-GWaZ+KGxWYbOB15CSqktwngq0ccA1l2Ov3aUfl9jeY4=", "narHash": "sha256-oegDNAvyQwaG3GqSi4U5jpKM7SYHGESGVIuKMRV/lbw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b1b964ea9348aef08cab514fa88e9c99def6fd63", "rev": "7a7b43c7231a439d248179ba8d561dd6cd81799b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -95,14 +122,15 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems" "systems": "systems_2",
"treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1739821351, "lastModified": 1766810876,
"narHash": "sha256-QlVtMzAhECs9Esq3txqVW7/vM78ipB5IcI8uyCbTP7A=", "narHash": "sha256-VPElWFQIiP31lXQXEom+L4sl85alZpZn33O4hewsP9k=",
"owner": "hraban", "owner": "hraban",
"repo": "mac-app-util", "repo": "mac-app-util",
"rev": "c00d5b21ca1fdab8acef65e696795f0f15ec1158", "rev": "4747968574ea58512c5385466400b2364c85d2d0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -118,11 +146,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741112248, "lastModified": 1766784396,
"narHash": "sha256-Y340xoE1Vgo0eCDJi4srVjuwlr50vYSoyJrZeXHw3n0=", "narHash": "sha256-rIlgatT0JtwxsEpzq+UrrIJCRfVAXgbYPzose1DmAcM=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "991bb2f6d46fc2ff7990913c173afdb0318314cb", "rev": "f0c8e1f6feb562b5db09cee9fb566a2f989e6b55",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -139,11 +167,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713543440, "lastModified": 1762090880,
"narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=", "narHash": "sha256-fbRQzIGPkjZa83MowjbD2ALaJf9y6KMDdJBQMKFeY/8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixGL", "repo": "nixGL",
"rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a", "rev": "b6105297e6f0cd041670c3e8628394d4ee247ed5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -154,11 +182,74 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1741037377, "lastModified": 1766736597,
"narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", "narHash": "sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f560ccec6b1116b22e6ed15f4c510997d99d5852",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1765674936,
"narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1761236834,
"narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1761236834,
"narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1766870016,
"narHash": "sha256-fHmxAesa6XNqnIkcS6+nIHuEmgd/iZSP/VXxweiEuQw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "02032da4af073d0f6110540c8677f16d4be0117f", "rev": "5c2bc52fb9f8c264ed6c93bd20afa2ff5e763dce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -178,11 +269,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1740569341, "lastModified": 1763909441,
"narHash": "sha256-WV8nY2IOfWdzBF5syVgCcgOchg/qQtpYh6LECYS9XkY=", "narHash": "sha256-56LwV51TX/FhgX+5LCG6akQ5KrOWuKgcJa+eUsRMxsc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "5eeb0172fb74392053b66a8149e61b5e191b2845", "rev": "b24ed4b272256dfc1cc2291f89a9821d5f9e14b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -197,11 +288,26 @@
"mac-app-util": "mac-app-util", "mac-app-util": "mac-app-util",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixgl": "nixgl", "nixgl": "nixgl",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_4",
"plasma-manager": "plasma-manager" "plasma-manager": "plasma-manager"
} }
}, },
"systems": { "systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": { "locked": {
"lastModified": 1689347925, "lastModified": 1689347925,
"narHash": "sha256-ozenz5bFe1UUqOn7f60HRmgc01BgTGIKZ4Xl+HbocGQ=", "narHash": "sha256-ozenz5bFe1UUqOn7f60HRmgc01BgTGIKZ4Xl+HbocGQ=",
@@ -215,6 +321,57 @@
"repo": "default-darwin", "repo": "default-darwin",
"type": "github" "type": "github"
} }
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1766000401,
"narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_2": {
"inputs": {
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1766000401,
"narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",
+21 -3
View File
@@ -52,7 +52,8 @@
function ( function (
import nixpkgs { import nixpkgs {
inherit system; inherit system;
config.allowUnfreePredicate = (pkg: builtins.elem (nixpkgs.lib.getName pkg) [ "nvidia" ]); config.allowUnfreePredicate = (pkg: builtins.elem (nixpkgs.lib.getName pkg) [ "nvidia" "claude-code" ]);
config.allowUnfree = true;
} }
) )
); );
@@ -81,7 +82,7 @@
inherit pkgs; inherit pkgs;
modules = [ modules = [
inputs.plasma-manager.homeManagerModules.plasma-manager inputs.plasma-manager.homeModules.plasma-manager
./home-manager/common.nix ./home-manager/common.nix
./home-manager/becky-dingleberry.nix ./home-manager/becky-dingleberry.nix
]; ];
@@ -97,13 +98,30 @@
system = "aarch64-darwin"; system = "aarch64-darwin";
specialArgs = { specialArgs = {
self = self; self = self;
inputs = inputs // {
darwin = inputs.nix-darwin;
};
}; };
modules = [ modules = [
# Add our overlay to the system configuration # Add our overlay to the system configuration
( (
{ ... }: { ... }:
{ {
nixpkgs.overlays = [ overlay ]; nixpkgs.overlays = [
overlay
(
self: super:
let
nixpkgsWithFree = import nixpkgs {
system = "aarch64-darwin";
config.allowUnfree = true;
};
in
{
claude-code = nixpkgsWithFree.claude-code;
}
)
];
} }
) )
mac-app-util.darwinModules.default mac-app-util.darwinModules.default
+69 -15
View File
@@ -46,6 +46,7 @@ in
"application/xhtml+xml" = "userapp-Firefox-5T0SK2.desktop"; "application/xhtml+xml" = "userapp-Firefox-5T0SK2.desktop";
"application/x-extension-xhtml" = "userapp-Firefox-5T0SK2.desktop"; "application/x-extension-xhtml" = "userapp-Firefox-5T0SK2.desktop";
"application/x-extension-xht" = "userapp-Firefox-5T0SK2.desktop"; "application/x-extension-xht" = "userapp-Firefox-5T0SK2.desktop";
"x-scheme-handler/lmstudio" = "LM Studio.desktop";
}; };
enable = true; enable = true;
}; };
@@ -54,8 +55,8 @@ in
# }; # };
}; };
nixGL.packages = pkgs.nixgl; targets.genericLinux.nixGL.packages = pkgs.nixgl;
nixGL.defaultWrapper = "nvidia"; targets.genericLinux.nixGL.defaultWrapper = "nvidia";
home.username = username; home.username = username;
@@ -65,7 +66,9 @@ in
home.packages = with pkgs; [ home.packages = with pkgs; [
android-tools android-tools
android-udev-rules direnv
nix-direnv
kdePackages.kdeconnect-kde
# TODO: Move from system to nix # TODO: Move from system to nix
# awscli2 # awscli2
# kubectl # kubectl
@@ -73,6 +76,17 @@ in
tcpdump tcpdump
]; ];
home.file = {
"${homedir}/.gnupg/gpg-agent.conf" = {
text = ''
default-cache-ttl 34560000
max-cache-ttl 34560000
allow-loopback-pinentry
pinentry-program ${pkgs.pinentry-curses}/bin/pinentry
'';
};
};
xdg.configFile = lib.mkMerge [ xdg.configFile = lib.mkMerge [
{ {
"ghostty/config" = { "ghostty/config" = {
@@ -89,7 +103,7 @@ in
} }
]; ];
# TODO: Manual ghostty injection # TODO: Manual ghostty injectionF
programs.bat.syntaxes.ghostty = { programs.bat.syntaxes.ghostty = {
src = pkgs.ghostty; src = pkgs.ghostty;
file = "share/bat/syntaxes/ghostty.sublime-syntax"; file = "share/bat/syntaxes/ghostty.sublime-syntax";
@@ -99,15 +113,11 @@ in
programs.git = { programs.git = {
enable = true; enable = true;
userName = "Arnie"; settings = {
userEmail = "i@cechis.cz"; user = {
ignores = [ name = "Arnie";
".vscode" email = "i@cechis.cz";
".direnv" };
".devenv"
".envrc"
];
extraConfig = {
core = { core = {
autocrlf = "input"; autocrlf = "input";
# TODO: Provide through nix # TODO: Provide through nix
@@ -119,6 +129,37 @@ in
init.defaultBranch = "main"; init.defaultBranch = "main";
}; };
ignores = [
".vscode"
".direnv"
".devenv"
".envrc"
];
signing = {
signByDefault = true;
key = "892F43F4";
};
};
# Generate key wth gpg --full-gen-key
# Kind of key: 10 ECC sign only, curve 25519
# Real name: <username>
# Email address: <email>
# Add to git: gpg --list-secret-keys --keyid-format SHORT
# get the bit after the key kind and put it in the signing.key in git config above
# gpg --armor --export <KEY> and add to git account
programs.gpg = {
enable = true;
settings = {
use-agent = true;
pinentry-mode = "loopback";
};
mutableKeys = false;
publicKeys = [ ];
}; };
# Can't use the nixgl wrapper due to GTK libraries # Can't use the nixgl wrapper due to GTK libraries
@@ -143,7 +184,6 @@ in
programs.lsd = { programs.lsd = {
enable = true; enable = true;
enableAliases = true;
settings = { settings = {
blocks = [ blocks = [
"permission" "permission"
@@ -218,6 +258,19 @@ in
"Switch One Desktop to the Left" = "none"; "Switch One Desktop to the Left" = "none";
"Edit Tiles" = "none"; "Edit Tiles" = "none";
# "MoveMouseToCenter" = "Meta+F6,Meta+F6,Move Mouse to Center";
"MoveMouseToCenter" = "none";
# "MoveMouseToFocus" = "Meta+F5,Meta+F5,Move Mouse to Focus";
"MoveMouseToFocus" = "none";
# "Switch to Screen 0" = "none,,Switch to Screen 0";
"Switch to Screen 0" = "Meta+Ctrl+Alt+0";
# "Switch to Screen 1" = "none,,Switch to Screen 1";
"Switch to Screen 1" = "Meta+Ctrl+Alt+1";
# "Switch to Screen 2" = "none,,Switch to Screen 2";
"Switch to Screen 2" = "Meta+Ctrl+Alt+2";
}; };
plasmashell = { plasmashell = {
@@ -254,6 +307,7 @@ in
vysokyujezd = "${homedir}/storage/.life/stavby/vysoky-ujezd"; vysokyujezd = "${homedir}/storage/.life/stavby/vysoky-ujezd";
work = "/mnt/yosuke/share/arnie/work"; work = "/mnt/yosuke/share/arnie/work";
smarthome = "/mnt/yosuke/share/arnie/smarthome"; smarthome = "/mnt/yosuke/share/arnie/smarthome";
lab = "/mnt/storage/.lab";
# Hardware # Hardware
v2-red = "${homedir}/storage/.hardware/3d-print/v2-red-V2-2201270017"; v2-red = "${homedir}/storage/.hardware/3d-print/v2-red-V2-2201270017";
@@ -271,7 +325,7 @@ in
c4 = "/mnt/yosuke/share/arnie/smarthome/control4/drivers"; c4 = "/mnt/yosuke/share/arnie/smarthome/control4/drivers";
}; };
initExtra = '' initContent = ''
${builtins.concatStringsSep "\n" ( ${builtins.concatStringsSep "\n" (
builtins.map (dir: '' builtins.map (dir: ''
for file in ${dir}/*.zsh; do for file in ${dir}/*.zsh; do
+11 -110
View File
@@ -3,24 +3,21 @@
pkgs, pkgs,
... ...
}: }:
let
zshSourceCommon = ./zsh/common;
isDarwin = pkgs.stdenv.hostPlatform.isDarwin;
isLinux = pkgs.stdenv.hostPlatform.isLinux;
in
{ {
imports = [ imports = [
(import ./nix-init-scripts.nix { (import ./nix-init-scripts.nix {
inherit lib pkgs; inherit lib pkgs;
}) })
./programs/zsh.nix
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
awscli2 awscli2
kubectl kubectl
nixd nixd
tree
viu viu
yq
]; ];
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.
@@ -95,6 +92,14 @@ in
enable = true; enable = true;
}; };
programs.ripgrep = {
enable = true;
arguments = [
"--smart-case"
"--hidden"
];
};
programs.vim = { programs.vim = {
enable = true; enable = true;
settings = { settings = {
@@ -103,110 +108,6 @@ in
}; };
}; };
programs.zsh = {
enable = true;
autocd = lib.mkDefault true;
shellAliases =
{
# use eval $(aws-export-credentials) to expose them to environment
aws-export-credentials = lib.mkDefault "${pkgs.awscli2}/bin/aws configure export-credentials --format env --profile";
aws-export-assume-role = lib.mkDefault "${pkgs.writeShellScript "aws-export-assume-role" ''
[[ -z "$1" || -z "$2" ]] && echo "Usage: aws-export-assume-role <profile> <role-arn>" && exit 1
${pkgs.coreutils}/bin/printf 'export AWS_ACCESS_KEY_ID=%s\nexport AWS_SECRET_ACCESS_KEY=%s\nexport AWS_SESSION_TOKEN=%s' $(${pkgs.awscli2}/bin/aws --profile "$1" sts assume-role --role-arn "$2" --role-session-name lcech --query "Credentials.[AccessKeyId,SecretAccessKey,SessionToken]" --output text)
''}";
aws-s3-cp-public = lib.mkDefault ''
${pkgs.awscli2}/bin/aws s3 cp --acl "public-read" --expires "$(${pkgs.coreutils}/bin/date '+%a, %d %b %Y 00:00:00 GMT' -d "$(${pkgs.coreutils}/bin/date +%Y-%m-%d) + 365 day")" --cache-control "max-age=31536000" --metadata-directive REPLACE
'';
bcrypt = lib.mkDefault "${pkgs.writeShellScript "bcrypt" ''
if [[ -z "$1" ]]; then
echo "Usage: bcrypt <password> [cost]"
exit 1
fi
echo -n "$1" | ${pkgs.apacheHttpd}/bin/htpasswd -i -nB -C ''${2:-12} "" | tr -d ':'
''}";
cat = lib.mkDefault "${pkgs.bat}/bin/bat --paging=never";
# use curl-aws --aws-sigv4 "aws:amz:region:service"
curl-aws = lib.mkDefault "${pkgs.curl}/bin/curl -H \"X-Amz-Security-Token: $AWS_SESSION_TOKEN\" --user \"$AWS_ACCESS_KEY_ID:$AWS_SECRET_ACCESS_KEY\"";
curl-timing = lib.mkDefault "${pkgs.curl}/bin/curl -w \" time_namelookup: %{time_namelookup}s\n time_connect: %{time_connect}s\n time_appconnect: %{time_appconnect}s\n time_pretransfer: %{time_pretransfer}s\n time_redirect: %{time_redirect}s\n time_starttransfer: %{time_starttransfer}s\n ----------\n time_total: %{time_total}s\n\" -o /dev/null";
dbase64 = lib.mkDefault "${pkgs.writeShellScript "dbase64" "echo -n \"$1\" | base64 -d"}";
git-sync-remote = lib.mkDefault "git remote update origin --prune";
klogs = lib.mkDefault "${pkgs.writeShellScript "klogs" ''
ctx="$1"
shift
namespace="$1"
shift
label="$1"
shift
if [[ "$ctx" == "" || "$namespace" == "" || "$label" == "" ]]; then
echo "Usage: klogs context namespace label"
echo "${"\n"}Contexts:"
kubectl config get-contexts -o name | sed 's/^/\t/g'
echo "Label examples:"
echo "${"\t"}app.kubernetes.io/name=..."
echo "${"\t"}eks.amazonaws.com/component=..."
exit 1
fi
kubectl --context "$ctx" logs -f -n "$namespace" -l "$label" $@
''}";
nixfix = lib.mkDefault "nix fmt ./**/*.nix";
# Git
a = "git add";
c = "git commit -m";
d = "git diff";
d-s = "git diff --staged";
gtag = "${pkgs.writeShellScript "gtag" "git tag -a $1 -m '$2'"}";
gtag-replace = "${pkgs.writeShellScript "gtag" ''
msg=$(git tag -l -n9 $1 | sed "s/$1\s\+//g")
git tag -d $1 && \
git push origin :refs/tags/$1 && \
git tag -a $1 -m "$msg" && \
git push origin $1
''}";
gtagl = "git fetch --tags && git tag -l -n9 --sort=-v:refname";
s = "git status";
}
// (
if isDarwin then
{
hm-switch = lib.mkDefault "darwin-rebuild switch --flake ~/.config/nix";
}
else if isLinux then
{
hm-switch = lib.mkDefault "home-manager switch --impure --flake ~/.config/nix";
}
else
{ }
);
initExtra = lib.mkBefore ''
for file in ${zshSourceCommon}/*.zsh; do
source "$file"
done
# [Ctrl-RightArrow] - move forward one word
bindkey '^[[1;3C' forward-word
# [Ctrl-LeftArrow] - move backward one word
bindkey '^[[1;3D' backward-word
'';
};
programs.starship = { programs.starship = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
+3 -1
View File
@@ -29,7 +29,9 @@
echo "Commands:" echo "Commands:"
echo -n '${ echo -n '${
builtins.toJSON ( builtins.toJSON (
builtins.mapAttrs (s: value: value.description) self.devShells.${pkgs.system}.default.config.scripts builtins.mapAttrs (
s: value: value.description
) self.devShells.${pkgs.stdenv.hostPlatform.system}.default.config.scripts
) )
}' | \ }' | \
${pkgs.jq}/bin/jq -r 'to_entries | map(" \(.key)\n" + " - \(if .value == "" then "no description provided" else .value end)") | "" + .[]' ${pkgs.jq}/bin/jq -r 'to_entries | map(" \(.key)\n" + " - \(if .value == "" then "no description provided" else .value end)") | "" + .[]'
@@ -12,27 +12,27 @@ return (function()
license = "MIT"; license = "MIT";
} }
-- DELL S2722DGM: 0F6BDB5B-840D-40BE-AAC9-B467A78E057A -- DELL S2722DGM: 394ACDEE-CA25-43C4-A533-D4EDF4A897AF
-- DELL S2721DGF: D3142823-261D-46EF-B9C2-5181C7FE2CA5 -- DELL S2721DGF: D3142823-261D-46EF-B9C2-5181C7FE2CA5
-- AV Receiver: B5A65BB6-E73E-4C3D-977C-33C86798AA5A -- AV Receiver: B5845603-D54C-44B8-9B55-96F7E5F50646
local appScreenMap = { local appScreenMap = {
Slack = { Slack = {
desktop = 1, desktop = 1,
screen = "0F6BDB5B-840D-40BE-AAC9-B467A78E057A", screen = "394ACDEE-CA25-43C4-A533-D4EDF4A897AF",
fullscreen = true, fullscreen = true,
}, },
Cursor = { Code = {
desktop = 1, desktop = 1,
screen = "B5A65BB6-E73E-4C3D-977C-33C86798AA5A", screen = "D3142823-261D-46EF-B9C2-5181C7FE2CA5",
fullscreen = true, fullscreen = true,
}, },
Spotify = { Spotify = {
desktop = 3, desktop = 2,
screen = "B5A65BB6-E73E-4C3D-977C-33C86798AA5A", screen = "D3142823-261D-46EF-B9C2-5181C7FE2CA5",
fullscreen = true, fullscreen = true,
}, },
["zoom.us"] = { ["zoom.us"] = {
screen = "B5A65BB6-E73E-4C3D-977C-33C86798AA5A", screen = "D3142823-261D-46EF-B9C2-5181C7FE2CA5",
fullscreen = true, fullscreen = true,
}, },
["Microsoft Outlook"] = { ["Microsoft Outlook"] = {
@@ -63,29 +63,52 @@ return (function()
local currentSpaces = spaces.allSpaces() local currentSpaces = spaces.allSpaces()
for _, v in pairs(window.list()) do local spaceMap = {}
local def = appScreenMap[v.kCGWindowOwnerName] for _, screenSpaces in pairs(currentSpaces) do
local win = window.get(v.kCGWindowNumber) for _, space in ipairs(screenSpaces) do
if def ~= nil and win ~= nil then spaceMap[space] = true
if def.desktop ~= nil and currentSpaces[def.screen] ~= nil then end
print(v.kCGWindowOwnerName .. " moving window into an index " .. def.desktop .. " which is space " .. currentSpaces[def.screen][def.desktop]) end
spaces.moveWindowToSpace(win, currentSpaces[def.screen][def.desktop])
end
local scr = screens[def.screen] local spaceIds = {}
if scr ~= nil then for spaceId, _ in pairs(spaceMap) do
timer.doAfter(1, function() table.insert(spaceIds, spaceId)
print(v.kCGWindowOwnerName .. " moving window into a screen " .. def.screen) end
win:moveToScreen(scr) local winMap = {}
if def.fullscreen then for _, spaceId in pairs(spaceIds) do
timer.doAfter(1, function() for _, winId in ipairs(spaces.windowsForSpace(spaceId)) do
print(v.kCGWindowOwnerName .. " fullscreening window") winMap[winId] = true
end
end
fullscreen(win) for winId, _ in pairs(winMap) do
end) -- Cannot get windows for non-active spaces, window.filter would have to be used, but performance is crap
end local win = window.get(winId)
end) if win ~= nil then
local name = win:application():name()
local def = appScreenMap[name]
if def ~= nil then
if def.desktop ~= nil and currentSpaces[def.screen] ~= nil then
print(name .. " moving window into an index " .. def.desktop .. " which is space " .. currentSpaces[def.screen][def.desktop])
spaces.moveWindowToSpace(win, currentSpaces[def.screen][def.desktop])
end
local scr = screens[def.screen]
if scr ~= nil then
timer.doAfter(1, function()
print(name .. " moving window into a screen " .. def.screen)
win:moveToScreen(scr)
if def.fullscreen then
timer.doAfter(1, function()
print(name .. " fullscreening window")
fullscreen(win)
end)
end
end)
end
end end
end end
end end
+49 -2
View File
@@ -35,7 +35,7 @@ windowMove = function()
hs.hotkey.bind({ "ctrl", "alt", "cmd" }, "pad1", function() hs.hotkey.bind({ "ctrl", "alt", "cmd" }, "pad1", function()
-- DELL S2722DGM -- DELL S2722DGM
local scr = getScreenById("0F6BDB5B-840D-40BE-AAC9-B467A78E057A") local scr = getScreenById("394ACDEE-CA25-43C4-A533-D4EDF4A897AF")
if scr == nil then if scr == nil then
return return
end end
@@ -63,7 +63,7 @@ windowMove = function()
hs.hotkey.bind({ "ctrl", "alt", "cmd" }, "pad3", function() hs.hotkey.bind({ "ctrl", "alt", "cmd" }, "pad3", function()
-- AV Receiver -- AV Receiver
local scr = getScreenById("B5A65BB6-E73E-4C3D-977C-33C86798AA5A") local scr = getScreenById("B5845603-D54C-44B8-9B55-96F7E5F50646")
if scr == nil then if scr == nil then
return return
end end
@@ -74,6 +74,53 @@ windowMove = function()
fullscreen(win) fullscreen(win)
end) end)
end) end)
hs.hotkey.bind({ "ctrl", "alt", "cmd", "shift" }, "pad1", function()
-- DELL S2722DGM
local scr = getScreenById("394ACDEE-CA25-43C4-A533-D4EDF4A897AF")
if scr == nil then
return
end
for _, win in ipairs(window.focusedWindow():application():allWindows()) do
win:moveToScreen(scr)
timer.doAfter(1, function()
fullscreen(win)
end)
end
end)
hs.hotkey.bind({ "ctrl", "alt", "cmd", "shift" }, "pad2", function()
-- DELL S2721DGF
local scr = getScreenById("D3142823-261D-46EF-B9C2-5181C7FE2CA5")
if scr == nil then
return
end
for _, win in ipairs(window.focusedWindow():application():allWindows()) do
win:moveToScreen(scr)
timer.doAfter(1, function()
fullscreen(win)
end)
end
end)
hs.hotkey.bind({ "ctrl", "alt", "cmd", "shift" }, "pad3", function()
-- AV Receiver
local scr = getScreenById("B5845603-D54C-44B8-9B55-96F7E5F50646")
if scr == nil then
return
end
for _, win in ipairs(window.focusedWindow():application():allWindows()) do
win:moveToScreen(scr)
timer.doAfter(1, function()
fullscreen(win)
end)
end
end)
end end
windowMove() windowMove()
+64 -12
View File
@@ -1,4 +1,5 @@
{ {
config,
lib, lib,
pkgs, pkgs,
... ...
@@ -11,12 +12,16 @@ let
gitUsername = "Lukas Cech"; gitUsername = "Lukas Cech";
gitEmail = "lcech@veracode.com"; gitEmail = "lcech@veracode.com";
in in
{ {
imports = [ imports = [
(import ./veracode/aws-cli.nix { (import ./veracode/aws-cli.nix {
inherit homedir lib pkgs; inherit
config
homedir
lib
pkgs
;
}) })
]; ];
@@ -27,11 +32,14 @@ in
home.stateVersion = "24.11"; home.stateVersion = "24.11";
home.packages = with pkgs; [ home.packages = with pkgs; [
hammerspoon claude-code
pstree
watch
colima colima
docker docker
hammerspoon
pstree
ssm-session-manager-plugin
watch
wireshark-qt
]; ];
# ghostty marked as broken as of 2025-01-05 in nix, using homebrew and custom config # ghostty marked as broken as of 2025-01-05 in nix, using homebrew and custom config
@@ -52,6 +60,23 @@ in
''; '';
}; };
"${homedir}/.ssh/config" = {
text = ''
Include /Users/lcech/.colima/ssh_config
host git.c3c.cz
Port 5522
host dingleberry
User becky
Hostname 10.196.196.5
IdentityFile ~/.ssh/id_ed25519_access
host gitlab.veracode-staging.us
IdentityFile ~/.ssh/id_rsa_fedramp
'';
};
"${homedir}/.hammerspoon/hmSpoons/C3CWorkspace.spoon" = { "${homedir}/.hammerspoon/hmSpoons/C3CWorkspace.spoon" = {
source = ./hammerspoon/C3CWorkspace.spoon; source = ./hammerspoon/C3CWorkspace.spoon;
recursive = true; recursive = true;
@@ -76,8 +101,6 @@ in
programs.git = { programs.git = {
enable = true; enable = true;
userName = gitUsername;
userEmail = gitEmail;
ignores = [ ignores = [
".vscode" ".vscode"
@@ -91,7 +114,10 @@ in
key = "5ABD6C5E"; key = "5ABD6C5E";
}; };
extraConfig = { settings = {
user.name = gitUsername;
user.email = gitEmail;
core = { core = {
autocrlf = "input"; autocrlf = "input";
editor = "vim"; editor = "vim";
@@ -100,6 +126,8 @@ in
pull.rebase = false; pull.rebase = false;
init.defaultBranch = "main"; init.defaultBranch = "main";
url."ssh://git@gitlab.laputa.veracode.io/".insteadOf = "https://gitlab.laputa.veracode.io/";
}; };
}; };
@@ -123,7 +151,6 @@ in
programs.lsd = { programs.lsd = {
enable = true; enable = true;
enableAliases = true;
settings = { settings = {
blocks = [ blocks = [
"permission" "permission"
@@ -156,9 +183,34 @@ in
shellAliases = { shellAliases = {
hammerspoon-config = "open -a ${pkgs.hammerspoon}/Applications/Hammerspoon.app/Contents/MacOS/Hammerspoon"; hammerspoon-config = "open -a ${pkgs.hammerspoon}/Applications/Hammerspoon.app/Contents/MacOS/Hammerspoon";
get-key = "${pkgs.writeShellScript "get-key" ''
set -e
scp dingleberry:/self/hintihint/keys/sum.key ${homedir}/hw.key
read -p "waiting for confirmation to delete the key"
rm ${homedir}/hw.key
''}";
wg-home = "${pkgs.writeShellScript "wg-home" ''
WG=$(sudo wg show)
if [[ "$WG" != "" ]]; then
if [[ $(echo "$WG" | grep endpoint | cut -c13-26) == "10.125.248.248" ]]; then
sudo wg-quick down /etc/wireguard/home.conf
else
sudo wg-quick down /etc/wireguard/home-remote.conf
fi
fi
if [[ "$(ipconfig getifaddr en0)" =~ "10.125.24" ]]; then
sudo wg-quick up /etc/wireguard/home.conf
else
sudo wg-quick up /etc/wireguard/home-remote.conf
fi
''}";
ssm = "${pkgs.writeShellScript "ssm" ''
aws --profile $1 --region ''${3:-us-east-1} ssm start-session --target $2
''}";
}; };
initExtra = '' initContent = ''
${builtins.concatStringsSep "\n" ( ${builtins.concatStringsSep "\n" (
builtins.map (dir: '' builtins.map (dir: ''
for file in ${dir}/*.zsh; do for file in ${dir}/*.zsh; do
@@ -182,10 +234,10 @@ in
TERMINAL = "ghostty"; TERMINAL = "ghostty";
}; };
launchd.agents.keepass-sync = { launchd.agents.keepass-sync-timer = {
enable = true; enable = true;
config = { config = {
Program = "${pkgs.writeShellScript "keepass-sync" '' Program = "${pkgs.writeShellScript "keepass-sync-timer" ''
${pkgs.coreutils}/bin/cp "${homedir}/storage/.macshare/.secret/arnie.kdbx" "${homedir}/.secret/arnie.kdbx" ${pkgs.coreutils}/bin/cp "${homedir}/storage/.macshare/.secret/arnie.kdbx" "${homedir}/.secret/arnie.kdbx"
''}"; ''}";
ProgramArguments = [ ]; ProgramArguments = [ ];
+174
View File
@@ -0,0 +1,174 @@
{
lib,
pkgs,
...
}:
let
isDarwin = pkgs.stdenv.hostPlatform.isDarwin;
isLinux = pkgs.stdenv.hostPlatform.isLinux;
in
{
programs.zsh = {
enable = true;
autocd = lib.mkDefault true;
history = {
expireDuplicatesFirst = true;
ignoreDups = true;
save = 10000;
share = false;
size = 10000;
};
shellAliases = {
# use eval $(aws-export-credentials) to expose them to environment
aws-export-credentials = lib.mkDefault "${pkgs.awscli2}/bin/aws configure export-credentials --format env --profile";
aws-export-assume-role = lib.mkDefault "${pkgs.writeShellScript "aws-export-assume-role" ''
[[ -z "$1" || -z "$2" ]] && echo "Usage: aws-export-assume-role <profile> <role-arn>" && exit 1
${pkgs.coreutils}/bin/printf 'export AWS_ACCESS_KEY_ID=%s\nexport AWS_SECRET_ACCESS_KEY=%s\nexport AWS_SESSION_TOKEN=%s' $(${pkgs.awscli2}/bin/aws --profile "$1" sts assume-role --role-arn "$2" --role-session-name lcech --query "Credentials.[AccessKeyId,SecretAccessKey,SessionToken]" --output text)
''}";
# https://docs.aws.amazon.com/singlesignon/latest/userguide/createshortcutlink.html
aws-sharable-url = lib.mkDefault "${pkgs.writeShellScript "aws-sharable-url" ''
set -e
URL=$1
[[ -z "$URL" ]] && read -p "Enter URL: " URL
# Strip schema
URL="''${URL#https://}"
# Parse Account ID from multi-session URL
ACCOUNT_ID="''${URL%%-*}"
# Strip account ID and hash up to the region part
URL="''${URL#*\.}"
PROFILE=$(${pkgs.gnugrep}/bin/grep "sso_account_id = $ACCOUNT_ID" ~/.aws/config -B 5 | ${pkgs.gnugrep}/bin/grep "\[profile" | ${pkgs.coreutils}/bin/tail -n 1 | ${pkgs.coreutils}/bin/tr -d '[]')
PROFILE="''${PROFILE#profile }"
ROLE_NAME=$(${pkgs.awscli2}/bin/aws configure get profile.$PROFILE.sso_role_name)
SSO_SESSION=$(${pkgs.awscli2}/bin/aws configure get profile.$PROFILE.sso_session)
SSO_URL=$(${pkgs.gnugrep}/bin/grep "\[sso-session $SSO_SESSION" ~/.aws/config -A5 | ${pkgs.gnugrep}/bin/grep sso_start_url | ${pkgs.coreutils}/bin/head -n 1)
SSO_URL="''${SSO_URL#sso_start_url = }"
# Strip trailing slash from SSO_URL if present
SSO_URL="''${SSO_URL%/}"
SHARABLE_URL="$SSO_URL/#/console?account_id=$ACCOUNT_ID&role_name=$ROLE_NAME&destination=$(${pkgs.urlencode}/bin/urlencode "https://$URL")"
${
if isDarwin then
''
echo -n "$SHARABLE_URL" | pbcopy
''
else
''
echo -n "$SHARABLE_URL" | ${pkgs.xclip}/bin/xclip -selection clipboard
''
}
echo "URL copied to clipboard"
''}";
aws-s3-cp-public = lib.mkDefault ''
${pkgs.awscli2}/bin/aws s3 cp --acl "public-read" --expires "$(${pkgs.coreutils}/bin/date '+%a, %d %b %Y 00:00:00 GMT' -d "$(${pkgs.coreutils}/bin/date +%Y-%m-%d) + 365 day")" --cache-control "max-age=31536000" --metadata-directive REPLACE
'';
bcrypt = lib.mkDefault "${pkgs.writeShellScript "bcrypt" ''
if [[ -z "$1" ]]; then
echo "Usage: bcrypt <password> [cost]"
exit 1
fi
echo -n "$1" | ${pkgs.apacheHttpd}/bin/htpasswd -i -nB -C ''${2:-12} "" | tr -d ':'
''}";
cat = lib.mkDefault "${pkgs.bat}/bin/bat --paging=never";
# use curl-aws --aws-sigv4 "aws:amz:region:service"
curl-aws = lib.mkDefault "${pkgs.curl}/bin/curl -H \"X-Amz-Security-Token: $AWS_SESSION_TOKEN\" --user \"$AWS_ACCESS_KEY_ID:$AWS_SECRET_ACCESS_KEY\"";
curl-timing = lib.mkDefault "${pkgs.curl}/bin/curl -w \" time_namelookup: %{time_namelookup}s\n time_connect: %{time_connect}s\n time_appconnect: %{time_appconnect}s\n time_pretransfer: %{time_pretransfer}s\n time_redirect: %{time_redirect}s\n time_starttransfer: %{time_starttransfer}s\n ----------\n time_total: %{time_total}s\n\" -o /dev/null";
dbase64 = lib.mkDefault "${pkgs.writeShellScript "dbase64" "echo -n \"$1\" | base64 -d"}";
git-sync-remote = lib.mkDefault "git remote update origin --prune";
cleanup-kube-config = "${
pkgs.writeShellApplication {
name = "app";
text = ./zsh/aliases/cleanup-kube-config.sh;
runtimeInputs = [
pkgs.gnugrep
pkgs.coreutils
];
}
}/bin/app";
klogs = lib.mkDefault "${pkgs.writeShellScript "klogs" ''
ctx="$1"
shift
namespace="$1"
shift
label="$1"
shift
if [[ "$ctx" == "" || "$namespace" == "" || "$label" == "" ]]; then
echo "Usage: klogs context namespace label"
echo "${"\n"}Contexts:"
kubectl config get-contexts -o name | sed 's/^/\t/g'
echo "Label examples:"
echo "${"\t"}app.kubernetes.io/name=..."
echo "${"\t"}eks.amazonaws.com/component=..."
exit 1
fi
kubectl --context "$ctx" logs -f -n "$namespace" -l "$label" $@
''}";
nixfix = lib.mkDefault "nix fmt ./**/*.nix";
# Git
a = "git add";
c = "git commit -m";
d = "git diff";
d-s = "git diff --staged";
gtag = "${pkgs.writeShellScript "gtag" "git tag -a $1 -m '$2'"}";
gtag-replace = "${pkgs.writeShellScript "gtag" ''
msg=$(git tag -l -n9 $1 | sed "s/$1\s\+//g")
git tag -d $1 && \
git push origin :refs/tags/$1 && \
git tag -a $1 -m "$msg" && \
git push origin $1
''}";
gtagl = "git fetch --tags && git tag -l -n9 --sort=-v:refname";
s = "git status";
}
// (
if isDarwin then
{
hm-switch = lib.mkDefault "sudo darwin-rebuild switch --flake ~/.config/nix";
}
else if isLinux then
{
hm-switch = lib.mkDefault "home-manager switch --impure --flake ~/.config/nix";
}
else
{ }
);
initContent = lib.mkBefore ''
for file in ${./zsh}/*.zsh; do
source "$file"
done
# [Ctrl-RightArrow] - move forward one word
bindkey '^[[1;3C' forward-word
# [Ctrl-LeftArrow] - move backward one word
bindkey '^[[1;3D' backward-word
'';
};
}
+53
View File
@@ -0,0 +1,53 @@
set -e
declare -A account_clusters
declare -A account_profiles
for ctx in $(kubectl config get-contexts -o name); do
if [[ "${ctx:0:7}" != "arn:aws" ]]; then
continue
fi
account_id="${ctx#*:*:*:*:}"
account_id="${account_id%%:*}"
cluster_name="${ctx#*cluster/}"
if [[ "${account_id}" == "" ]] || [[ "${cluster_name}" == "" ]]; then
continue
fi
if [[ ! -v account_profiles[$account_id] ]]; then
aws_profile=$(grep "sso_account_id = $account_id" ~/.aws/config -B 5 | grep "\[profile" | tail -n 1 | tr -d '[]')
aws_profile="${aws_profile#profile }"
if [[ "${aws_profile}" == "" ]]; then
continue
fi
account_profiles[$account_id]=$aws_profile
account_clusters[$account_id]=""
fi
account_clusters[$account_id]+="$cluster_name "
done
for acc in ${!account_profiles[@]}; do
profile=${account_profiles[$acc]}
declare -A current_clusters
for remote_cluster in $(aws --profile $profile eks list-clusters --query "clusters" --output text); do
current_clusters[$remote_cluster]=""
done
for cluster in ${account_clusters[$acc]}; do
if [[ -v current_clusters[$cluster] ]]; then
# check if credentials are current
echo "$cluster cluster exists"
else
kubectl config delete-context "$(kubectl config get-contexts -o name | grep "$acc:cluster/$cluster" | head -n 1)"
fi
done
unset -v current_clusters
done
+4 -1
View File
@@ -1,4 +1,4 @@
theme = "catppuccin-mocha" theme = "Catppuccin Mocha"
window-width = 9999 window-width = 9999
window-height = 9999 window-height = 9999
@@ -29,3 +29,6 @@ keybind = super+shift+j=resize_split:up,10
keybind = super+shift+k=resize_split:down,10 keybind = super+shift+k=resize_split:down,10
keybind = super+shift+h=resize_split:left,10 keybind = super+shift+h=resize_split:left,10
keybind = super+shift+l=resize_split:right,10 keybind = super+shift+l=resize_split:right,10
# https://ghostty.org/docs/config/reference#scrollback-limit
scrollback-limit = 100000000
@@ -0,0 +1,16 @@
[govus-stage]
okta_org_url = https://govus-staging-veracode.okta.com
gimme_creds_server = appurl
aws_rolename = arn:aws-us-gov:iam::403885414333:role/Corp-Engineer
write_aws_creds = True
cred_profile = 403885414333-Corp-Engineer
okta_username = lcech@veracode.com
app_url = https://govus-staging-veracode.okta.com/home/amazon_aws/0oame0n0rGjDo9BvZ4h6/272
resolve_aws_alias = False
include_path = True
preferred_mfa_type = push
remember_device = True
aws_default_duration = 3600
output_format = export
force_classic = True
enable_keychain = True
+53 -10
View File
@@ -1,4 +1,5 @@
{ {
config,
homedir, homedir,
lib, lib,
pkgs, pkgs,
@@ -25,7 +26,7 @@ let
}; };
"359955634867" = { "359955634867" = {
name = "veracode-eu-master"; name = "veracode-eu-master";
role = "ReadOnly"; role = "EngineerAdmin-Veracode-EU-All";
}; };
"675053010029" = { "675053010029" = {
name = "veracode-eu-networking"; name = "veracode-eu-networking";
@@ -223,10 +224,6 @@ let
}; };
}; };
old-world = { old-world = {
"932961976631" = {
name = "Veracode Laputa";
role = "EngineerAdmin";
};
"747166839737" = { "747166839737" = {
name = "Alternator Prod"; name = "Alternator Prod";
role = "EngineerAdmin"; role = "EngineerAdmin";
@@ -295,6 +292,14 @@ let
name = "Veracode GovCloud Parent Staging"; name = "Veracode GovCloud Parent Staging";
role = "EngineerAdmin"; role = "EngineerAdmin";
}; };
"932961976631" = {
name = "Veracode Laputa";
role = "EngineerAdmin";
};
"706178003760" = {
name = "Veracode Master";
role = "EngineerAdmin";
};
"227458413628" = { "227458413628" = {
name = "veracode-asc-ilt"; name = "veracode-asc-ilt";
role = "EngineerAdmin"; role = "EngineerAdmin";
@@ -351,7 +356,6 @@ let
name = "VeraRadio"; name = "VeraRadio";
role = "EngineerAdmin"; role = "EngineerAdmin";
}; };
}; };
longbow = { longbow = {
@@ -429,9 +433,21 @@ in
[sso-session veracode-longbow] [sso-session veracode-longbow]
sso_start_url = https://d-90677f445e.awsapps.com/start sso_start_url = https://d-90677f445e.awsapps.com/start
sso_region = eu-central-1 sso_region = us-east-1
sso_registration_scopes = sso:account:access sso_registration_scopes = sso:account:access
[sso-session veracode-gov-stag]
sso_start_url = https://???.awsapps.com/start
sso_region = us-east-1
sso_registration_scopes = sso:account:access
[profile veracode-gov-staging-gov]
sso_account_id = 403885414333
sso_session = veracode-gov-stag
sso_role_name = Corp-Engineer
region = us-east-1
output = json
${builtins.concatStringsSep "\n" ( ${builtins.concatStringsSep "\n" (
lib.mapAttrsToList (id: account: '' lib.mapAttrsToList (id: account: ''
[profile ${builtins.replaceStrings [ " " ] [ "" ] account.name}] [profile ${builtins.replaceStrings [ " " ] [ "" ] account.name}]
@@ -535,28 +551,50 @@ in
''; '';
}; };
home.file."${homedir}/.okta_aws_login_config" = {
source = config.lib.file.mkOutOfStoreSymlink "${homedir}/.config/nix/home-manager/veracode/.okta_aws_login_config";
};
home.packages = [
pkgs.gimme-aws-creds
];
programs.zsh.shellAliases = { programs.zsh.shellAliases = {
veracode-find = ''${pkgs.writeShellScript "veracode-find" '' veracode-find = ''${pkgs.writeShellScript "veracode-find" ''
for profile in $(aws configure list-profiles | grep -E '^(us|eu)-'); do for profile in $(aws configure list-profiles | grep -E '^(us|eu|old-world|longbow)-'); do
echo "=== $profile ===" echo "=== $profile ==="
aws --profile $profile "$@"; aws --profile $profile "$@";
done done
''}''; ''}'';
veracode-find-eu = ''${pkgs.writeShellScript "veracode-find" '' veracode-find-eu = ''${pkgs.writeShellScript "veracode-find-eu" ''
for profile in $(aws configure list-profiles | grep -E '^(eu)-'); do for profile in $(aws configure list-profiles | grep -E '^(eu)-'); do
echo "=== $profile ===" echo "=== $profile ==="
aws --profile $profile "$@"; aws --profile $profile "$@";
done done
''}''; ''}'';
veracode-find-us = ''${pkgs.writeShellScript "veracode-find" '' veracode-find-us = ''${pkgs.writeShellScript "veracode-find-us" ''
for profile in $(aws configure list-profiles | grep -E '^(us)-'); do for profile in $(aws configure list-profiles | grep -E '^(us)-'); do
echo "=== $profile ===" echo "=== $profile ==="
aws --profile $profile "$@"; aws --profile $profile "$@";
done done
''}''; ''}'';
veracode-find-old-world = ''${pkgs.writeShellScript "veracode-find-old-world" ''
for profile in $(aws configure list-profiles | grep -E '^(old-world)-'); do
echo "=== $profile ==="
aws --profile $profile "$@";
done
''}'';
veracode-find-longbow = ''${pkgs.writeShellScript "veracode-find-longbow" ''
for profile in $(aws configure list-profiles | grep -E '^(longbow)-'); do
echo "=== $profile ==="
aws --profile $profile "$@";
done
''}'';
veracode-login = ''${pkgs.writeShellScript "veracode-login" '' veracode-login = ''${pkgs.writeShellScript "veracode-login" ''
for region in us eu; do for region in us eu; do
aws sso login --profile $region-shared-services & aws sso login --profile $region-shared-services &
@@ -564,5 +602,10 @@ in
aws sso login --profile old-world-aws-devops & aws sso login --profile old-world-aws-devops &
aws sso login --profile longbow-SharedServices & aws sso login --profile longbow-SharedServices &
''}''; ''}'';
veracode-login-govus-stage = ''${pkgs.writeShellScript "export-aws-govus-stage" ''
gimme-aws-creds --profile govus-stage
${pkgs.gnugrep}/bin/grep "^\[403885414333-Corp-Engineer\]" -A1 ${homedir}/.aws/credentials | ${pkgs.coreutils}/bin/tail -n 1 | ${pkgs.gnugrep}/bin/grep -q "region" || ${pkgs.gnused}/bin/sed -i '/^\[403885414333-Corp-Engineer\]$/a region = us-gov-west-1' ${homedir}/.aws/credentials
''}'';
}; };
} }
-6
View File
@@ -1,6 +0,0 @@
# HISTORY
HISTSIZE=10000
SAVEHIST=10000
HISTFILE=~/.zsh_history
# bindkey '^R' zaw-history