Compare commits
59 Commits
f9ed5be670
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 9503c33f24 | |||
| fa9c2115e9 | |||
| b9b62ea3c3 | |||
| c34274413a | |||
| 0a7d543ff4 | |||
|
4c7d1aabea
|
|||
|
43fe34151a
|
|||
|
ebcc853148
|
|||
|
524ccea715
|
|||
|
5c15c6885d
|
|||
| 7e2ae203da | |||
| b163b2f9ce | |||
| 7385941c96 | |||
| 22511d0238 | |||
| 0a9f041a3d | |||
| de2805aea2 | |||
| 92d6ff3520 | |||
| 405af3517e | |||
| 2972486a85 | |||
| 409a96c224 | |||
| a7feabf2b8 | |||
| b7ff5d4869 | |||
| 261331252a | |||
| a11c62c437 | |||
| a8a693cd95 | |||
| 0ae905e88f | |||
| 8a56ff1571 | |||
| c90d529ff6 | |||
| 334780b2f4 | |||
| a9f26cfd6b | |||
| f8807df81c | |||
| 6372897237 | |||
| 6288dedcfe | |||
| 4026e78eb2 | |||
| 51e76513c0 | |||
| 3a44cf40b7 | |||
| 7de1a07096 | |||
| 143830ce27 | |||
| a12585068a | |||
| b71d16c7cf | |||
| 11b41208a5 | |||
| 47a0914f75 | |||
| 9ba138df96 | |||
| b73d0a54de | |||
| 64586daac4 | |||
| 2f2e87a5d3 | |||
| fb04d4a456 | |||
| de256566e3 | |||
| edaa9a2af0 | |||
| 9ede8608c6 | |||
| a9132d4fbe | |||
| 76bdb1775d | |||
| 51433e6aca | |||
| 0d2531afb4 | |||
| 205c10098a | |||
| aa70a30d45 | |||
| 71a1a67f16 | |||
| 25e93ab45c | |||
| d16b8262c9 |
@@ -0,0 +1 @@
|
|||||||
|
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKxA6m6fD1jch/HwkWBaaYyr0HPttzM0i1D+V2MtMmFK becky@dingleberry
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKFOQaA7023StG5vSl0txUbAXmPdsIFeWHLDHXlT5yZp lcech@lcech-mac-veracode
|
||||||
+31
-11
@@ -52,6 +52,7 @@ in
|
|||||||
git
|
git
|
||||||
coreutils
|
coreutils
|
||||||
vim
|
vim
|
||||||
|
flameshot
|
||||||
wireguard-tools
|
wireguard-tools
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -66,6 +67,24 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
launchd.daemons.admin-ensure = {
|
||||||
|
script = "${pkgs.writeShellScript "admin-ensure" ''
|
||||||
|
if ! /usr/bin/groups lcech | /usr/bin/grep -q -w admin; then
|
||||||
|
/usr/bin/dscl . -merge /Groups/admin GroupMembership lcech
|
||||||
|
fi
|
||||||
|
if ! /usr/bin/groups Arnie | /usr/bin/grep -q -w admin; then
|
||||||
|
/usr/bin/dscl . -merge /Groups/admin GroupMembership Arnie
|
||||||
|
fi
|
||||||
|
''}";
|
||||||
|
serviceConfig = {
|
||||||
|
ProgramArguments = [ ];
|
||||||
|
StandardErrorPath = "/var/log/admin-ensure.error.log";
|
||||||
|
StandardOutPath = "/var/log/admin-ensure.out.log";
|
||||||
|
RunAtLoad = true;
|
||||||
|
StartInterval = 60 * 60;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
# The platform the configuration will be used on.
|
# The platform the configuration will be used on.
|
||||||
nixpkgs.hostPlatform = "aarch64-darwin";
|
nixpkgs.hostPlatform = "aarch64-darwin";
|
||||||
|
|
||||||
@@ -76,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;
|
||||||
@@ -96,6 +109,9 @@ in
|
|||||||
static-only = true;
|
static-only = true;
|
||||||
tilesize = lib.mkDefault 80;
|
tilesize = lib.mkDefault 80;
|
||||||
|
|
||||||
|
# Do not automatically rearrange spaces based on most recent use
|
||||||
|
mru-spaces = false;
|
||||||
|
|
||||||
# Hot corners
|
# Hot corners
|
||||||
wvous-bl-corner = hot-corners.QuickNote;
|
wvous-bl-corner = hot-corners.QuickNote;
|
||||||
wvous-br-corner = hot-corners.Launchpad;
|
wvous-br-corner = hot-corners.Launchpad;
|
||||||
@@ -114,7 +130,7 @@ in
|
|||||||
NSGlobalDomain = {
|
NSGlobalDomain = {
|
||||||
AppleShowScrollBars = "Automatic";
|
AppleShowScrollBars = "Automatic";
|
||||||
AppleScrollerPagingBehavior = true;
|
AppleScrollerPagingBehavior = true;
|
||||||
AppleSpacesSwitchOnActivate = lib.mkDefault true;
|
AppleSpacesSwitchOnActivate = lib.mkDefault false;
|
||||||
"com.apple.swipescrolldirection" = false;
|
"com.apple.swipescrolldirection" = false;
|
||||||
NSAutomaticCapitalizationEnabled = false; # disable auto capitalization
|
NSAutomaticCapitalizationEnabled = false; # disable auto capitalization
|
||||||
NSAutomaticDashSubstitutionEnabled = false; # disable auto dash substitution
|
NSAutomaticDashSubstitutionEnabled = false; # disable auto dash substitution
|
||||||
@@ -151,11 +167,8 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Auto upgrade nix package and the daemon service.
|
nix.enable = true;
|
||||||
services.nix-daemon.enable = true;
|
|
||||||
|
|
||||||
nix.channel.enable = lib.mkDefault false;
|
nix.channel.enable = lib.mkDefault false;
|
||||||
nix.configureBuildUsers = lib.mkDefault true;
|
|
||||||
nix.distributedBuilds = lib.mkDefault true;
|
nix.distributedBuilds = lib.mkDefault true;
|
||||||
|
|
||||||
nix.gc = {
|
nix.gc = {
|
||||||
@@ -165,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 = {
|
||||||
|
|||||||
@@ -5,12 +5,23 @@
|
|||||||
# brew install --cask
|
# brew install --cask
|
||||||
# these need to be updated manually
|
# these need to be updated manually
|
||||||
homebrew.casks = [
|
homebrew.casks = [
|
||||||
|
"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"
|
||||||
@@ -22,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
@@ -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": 1735900408,
|
"lastModified": 1766980997,
|
||||||
"narHash": "sha256-U+oZBQ3f5fF2hHsupKQH4ihgTKLHgcJh6jEmKDg+W10=",
|
"narHash": "sha256-oegDNAvyQwaG3GqSi4U5jpKM7SYHGESGVIuKMRV/lbw=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "1c8d4c8d592e8fab4cff4397db5529ec6f078cf9",
|
"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": 1732920695,
|
"lastModified": 1766810876,
|
||||||
"narHash": "sha256-1fxvJZUznwrmEtYqpPuWi2tPcL9kj6v7p1J7ZZncAPE=",
|
"narHash": "sha256-VPElWFQIiP31lXQXEom+L4sl85alZpZn33O4hewsP9k=",
|
||||||
"owner": "hraban",
|
"owner": "hraban",
|
||||||
"repo": "mac-app-util",
|
"repo": "mac-app-util",
|
||||||
"rev": "548672d0cb661ce11d08ee8bde92b87d2a75c872",
|
"rev": "4747968574ea58512c5385466400b2364c85d2d0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -118,11 +146,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1735685839,
|
"lastModified": 1766784396,
|
||||||
"narHash": "sha256-62xAPSs5VRZoPH7eRanUn5S5vZEd+8vM4bD5I+zxokc=",
|
"narHash": "sha256-rIlgatT0JtwxsEpzq+UrrIJCRfVAXgbYPzose1DmAcM=",
|
||||||
"owner": "LnL7",
|
"owner": "LnL7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "6a1fdb2a1204c0de038847b601cff5012e162b5e",
|
"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": 1735821806,
|
"lastModified": 1766736597,
|
||||||
"narHash": "sha256-cuNapx/uQeCgeuhUhdck3JKbgpsml259sjUQnWM7zW8=",
|
"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": "d6973081434f88088e5321f83ebafe9a1167c367",
|
"rev": "5c2bc52fb9f8c264ed6c93bd20afa2ff5e763dce",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -178,11 +269,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1736549395,
|
"lastModified": 1763909441,
|
||||||
"narHash": "sha256-XzwkB62Tt5UYoL1jXiHzgk/qz2fUpGHExcSIbyGTtI0=",
|
"narHash": "sha256-56LwV51TX/FhgX+5LCG6akQ5KrOWuKgcJa+eUsRMxsc=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "plasma-manager",
|
"repo": "plasma-manager",
|
||||||
"rev": "a53af7f1514ef4cce8620a9d6a50f238cdedec8b",
|
"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",
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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,9 +129,41 @@ 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
|
||||||
|
#
|
||||||
# programs.ghostty = {
|
# programs.ghostty = {
|
||||||
# enable = true;
|
# enable = true;
|
||||||
|
|
||||||
@@ -142,7 +184,6 @@ in
|
|||||||
|
|
||||||
programs.lsd = {
|
programs.lsd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableAliases = true;
|
|
||||||
settings = {
|
settings = {
|
||||||
blocks = [
|
blocks = [
|
||||||
"permission"
|
"permission"
|
||||||
@@ -217,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 = {
|
||||||
@@ -235,7 +289,7 @@ in
|
|||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
configure-ssh-terminfo = "f(){ infocmp -x | ssh \"$@\" -- tic -x -; unset -f f; }; f";
|
configure-ssh-terminfo = "${pkgs.writeShellScript "configure-ssh-terminfo" "infocmp -x | ssh \"$@\" -- tic -x -"}";
|
||||||
|
|
||||||
aws-ecr-login-skoda = "aws --profile skoda-prod --region eu-central-1 ecr get-login-password | sudo docker login 943160431142.dkr.ecr.eu-central-1.amazonaws.com -u AWS --password-stdin";
|
aws-ecr-login-skoda = "aws --profile skoda-prod --region eu-central-1 ecr get-login-password | sudo docker login 943160431142.dkr.ecr.eu-central-1.amazonaws.com -u AWS --password-stdin";
|
||||||
aws-ecr-login-scholaris = "aws --profile skoda-sch-dev --region eu-central-1 ecr get-login-password | sudo docker login 442913623981.dkr.ecr.eu-central-1.amazonaws.com -u AWS --password-stdin";
|
aws-ecr-login-scholaris = "aws --profile skoda-sch-dev --region eu-central-1 ecr get-login-password | sudo docker login 442913623981.dkr.ecr.eu-central-1.amazonaws.com -u AWS --password-stdin";
|
||||||
@@ -253,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";
|
||||||
@@ -270,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
|
||||||
@@ -291,13 +346,13 @@ in
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.user.services.keepass-sync = {
|
systemd.user.services.keepass-sync-timer = {
|
||||||
Unit.Description = "Sync KeePass database";
|
Unit.Description = "Sync KeePass database";
|
||||||
|
|
||||||
Service = {
|
Service = {
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
ExecStart = toString (
|
ExecStart = toString (
|
||||||
pkgs.writeShellScript "keepass-sync" ''
|
pkgs.writeShellScript "keepass-sync-timer" ''
|
||||||
${pkgs.coreutils}/bin/cp "/mnt/storage/.circuitry/.secret/default.kdbx" "/mnt/storage/.macshare/.secret/arnie.kdbx"
|
${pkgs.coreutils}/bin/cp "/mnt/storage/.circuitry/.secret/default.kdbx" "/mnt/storage/.macshare/.secret/arnie.kdbx"
|
||||||
''
|
''
|
||||||
);
|
);
|
||||||
@@ -306,6 +361,46 @@ in
|
|||||||
Install.WantedBy = [ "default.target" ];
|
Install.WantedBy = [ "default.target" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
systemd.user.services.keepass-sync = {
|
||||||
|
Unit.Description = "Sync KeePass database";
|
||||||
|
|
||||||
|
Service = {
|
||||||
|
Type = "simple";
|
||||||
|
ExecStart = toString (
|
||||||
|
pkgs.writeShellScript "keepass-sync" ''
|
||||||
|
echo "Starting sync"
|
||||||
|
${pkgs.inotify-tools}/bin/inotifywait --monitor --quiet -e modify -e moved_to -e create --include "default\.kdbx" "/mnt/storage/.circuitry/.secret" | ${pkgs.writeShellScript "keepass-sync-cp" ''
|
||||||
|
function sync() {
|
||||||
|
${pkgs.coreutils}/bin/cp "/mnt/storage/.circuitry/.secret/default.kdbx" "/mnt/storage/.macshare/.secret/arnie.kdbx"
|
||||||
|
if [[ $? -ne 0 ]]; then
|
||||||
|
echo "Sync failed"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
sync_pid=0
|
||||||
|
|
||||||
|
while read -r event; do
|
||||||
|
echo "?"
|
||||||
|
# Throttle syncing
|
||||||
|
if [ $sync_pid -ne 0 ]; then
|
||||||
|
kill $sync_pid 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Schedule new sync
|
||||||
|
{ sleep 1; sync; } &
|
||||||
|
sync_pid=$!
|
||||||
|
done
|
||||||
|
''}
|
||||||
|
''
|
||||||
|
);
|
||||||
|
Restart = "always";
|
||||||
|
RestartSec = 1;
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
Install.WantedBy = [ "default.target" ];
|
||||||
|
};
|
||||||
|
|
||||||
systemd.user.services.voron2-red-sync = {
|
systemd.user.services.voron2-red-sync = {
|
||||||
Unit.Description = "Sync Voron2 red gcodes";
|
Unit.Description = "Sync Voron2 red gcodes";
|
||||||
|
|
||||||
@@ -359,28 +454,14 @@ in
|
|||||||
# Total hack, not what HM is for
|
# Total hack, not what HM is for
|
||||||
# Manually remove files if deleted here
|
# Manually remove files if deleted here
|
||||||
home.activation.nfsRoute = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
|
home.activation.nfsRoute = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
|
||||||
/usr/bin/sudo ${pkgs.coreutils}/bin/ln -fs ${
|
|
||||||
pkgs.writeTextFile {
|
|
||||||
name = "nfs-route";
|
|
||||||
text = ''
|
|
||||||
# NFS
|
|
||||||
200 nfsroute
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
} /etc/iproute2/rt_tables.d/20-nfs.conf
|
|
||||||
|
|
||||||
/usr/bin/sudo ${pkgs.coreutils}/bin/ln -fs ${pkgs.writeShellScript "nfs-route" ''
|
/usr/bin/sudo ${pkgs.coreutils}/bin/ln -fs ${pkgs.writeShellScript "nfs-route" ''
|
||||||
if [ "$IFACE" = "enp4s0" ]; then
|
if [ "$IFACE" = "enp4s0" ]; then
|
||||||
if [ "$(ip route list table nfsroute exact 10.125.248.55 | grep enp4s0 | wc -l)" == "0" ]; then
|
if [ "$(ip route list exact 10.125.248.55 | grep enp4s0 | wc -l)" == "0" ]; then
|
||||||
ip route add 10.125.248.55 via 10.124.248.248 dev enp4s0 table nfsroute
|
ip route add 10.125.248.55 via 10.124.248.248 dev enp4s0 metric 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$(ip route list table nfsroute exact 10.125.248.33 | grep enp4s0 | wc -l)" == "0" ]; then
|
if [ "$(ip route list exact 10.125.248.33 | grep enp4s0 | wc -l)" == "0" ]; then
|
||||||
ip route add 10.125.248.33 via 10.124.248.248 dev enp4s0 table nfsroute
|
ip route add 10.125.248.33 via 10.124.248.248 dev enp4s0 metric 1
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$(ip rule list from 10.124.248.5 | ${pkgs.gnugrep}/bin/grep nfsroute | ${pkgs.coreutils}/bin/wc -l)" == "0" ]; then
|
|
||||||
ip rule add from 10.124.248.5 lookup nfsroute
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
''} /etc/network/if-up.d/nfs-route
|
''} /etc/network/if-up.d/nfs-route
|
||||||
@@ -389,16 +470,12 @@ in
|
|||||||
|
|
||||||
/usr/bin/sudo ${pkgs.coreutils}/bin/ln -fs ${pkgs.writeShellScript "nfs-route" ''
|
/usr/bin/sudo ${pkgs.coreutils}/bin/ln -fs ${pkgs.writeShellScript "nfs-route" ''
|
||||||
if [ "$IFACE" = "enp4s0" ]; then
|
if [ "$IFACE" = "enp4s0" ]; then
|
||||||
if [ "$(ip route list table nfsroute exact 10.125.248.55 | grep enp4s0 | wc -l)" != "0" ]; then
|
if [ "$(ip route list exact 10.125.248.55 | grep enp4s0 | wc -l)" != "0" ]; then
|
||||||
ip route del 10.125.248.55 via 10.124.248.248 dev enp4s0 table nfsroute
|
ip route del 10.125.248.55 via 10.124.248.248 dev enp4s0 metric 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$(ip route list table nfsroute exact 10.125.248.33 | grep enp4s0 | wc -l)" != "0" ]; then
|
if [ "$(ip route list exact 10.125.248.33 | grep enp4s0 | wc -l)" != "0" ]; then
|
||||||
ip route del 10.125.248.33 via 10.124.248.248 dev enp4s0 table nfsroute
|
ip route del 10.125.248.33 via 10.124.248.248 dev enp4s0 metric 1
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$(ip rule list from 10.124.248.5 | ${pkgs.gnugrep}/bin/grep nfsroute | ${pkgs.coreutils}/bin/wc -l)" != "0" ]; then
|
|
||||||
ip rule del from 10.124.248.5 lookup nfsroute
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
''} /etc/network/if-post-down.d/nfs-route
|
''} /etc/network/if-post-down.d/nfs-route
|
||||||
|
|||||||
+11
-103
@@ -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,103 +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-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"
|
|
||||||
namespace="$2"
|
|
||||||
label="$3"
|
|
||||||
echo=${pkgs.coreutils}/bin/echo
|
|
||||||
|
|
||||||
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;
|
||||||
|
|||||||
@@ -27,9 +27,11 @@
|
|||||||
description = "Print this menu";
|
description = "Print this menu";
|
||||||
exec = ''
|
exec = ''
|
||||||
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)") | "" + .[]'
|
||||||
|
|||||||
@@ -0,0 +1,128 @@
|
|||||||
|
return (function()
|
||||||
|
local grid = hs.grid
|
||||||
|
local screen = hs.screen
|
||||||
|
local spaces = hs.spaces
|
||||||
|
local timer = hs.timer
|
||||||
|
local window = hs.window
|
||||||
|
|
||||||
|
spoon = {
|
||||||
|
name = "C3C Workspace";
|
||||||
|
version = "0.0.1";
|
||||||
|
author = "Arnie";
|
||||||
|
license = "MIT";
|
||||||
|
}
|
||||||
|
|
||||||
|
-- DELL S2722DGM: 394ACDEE-CA25-43C4-A533-D4EDF4A897AF
|
||||||
|
-- DELL S2721DGF: D3142823-261D-46EF-B9C2-5181C7FE2CA5
|
||||||
|
-- AV Receiver: B5845603-D54C-44B8-9B55-96F7E5F50646
|
||||||
|
local appScreenMap = {
|
||||||
|
Slack = {
|
||||||
|
desktop = 1,
|
||||||
|
screen = "394ACDEE-CA25-43C4-A533-D4EDF4A897AF",
|
||||||
|
fullscreen = true,
|
||||||
|
},
|
||||||
|
Code = {
|
||||||
|
desktop = 1,
|
||||||
|
screen = "D3142823-261D-46EF-B9C2-5181C7FE2CA5",
|
||||||
|
fullscreen = true,
|
||||||
|
},
|
||||||
|
Spotify = {
|
||||||
|
desktop = 2,
|
||||||
|
screen = "D3142823-261D-46EF-B9C2-5181C7FE2CA5",
|
||||||
|
fullscreen = true,
|
||||||
|
},
|
||||||
|
["zoom.us"] = {
|
||||||
|
screen = "D3142823-261D-46EF-B9C2-5181C7FE2CA5",
|
||||||
|
fullscreen = true,
|
||||||
|
},
|
||||||
|
["Microsoft Outlook"] = {
|
||||||
|
desktop = 3,
|
||||||
|
screen = "D3142823-261D-46EF-B9C2-5181C7FE2CA5",
|
||||||
|
fullscreen = true,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
local fullscreen = function(win)
|
||||||
|
local screen = win:screen()
|
||||||
|
|
||||||
|
local cell = grid.get(win, screen)
|
||||||
|
|
||||||
|
cell.x = 0
|
||||||
|
cell.y = 0
|
||||||
|
cell.w = 24
|
||||||
|
cell.h = 24
|
||||||
|
|
||||||
|
grid.set(win, cell, screen)
|
||||||
|
end
|
||||||
|
|
||||||
|
function spoon:restoreAppsToScreens()
|
||||||
|
local screens = {}
|
||||||
|
for _, scr in ipairs(screen.allScreens()) do
|
||||||
|
screens[scr:getUUID()] = scr
|
||||||
|
end
|
||||||
|
|
||||||
|
local currentSpaces = spaces.allSpaces()
|
||||||
|
|
||||||
|
local spaceMap = {}
|
||||||
|
for _, screenSpaces in pairs(currentSpaces) do
|
||||||
|
for _, space in ipairs(screenSpaces) do
|
||||||
|
spaceMap[space] = true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
local spaceIds = {}
|
||||||
|
for spaceId, _ in pairs(spaceMap) do
|
||||||
|
table.insert(spaceIds, spaceId)
|
||||||
|
end
|
||||||
|
|
||||||
|
local winMap = {}
|
||||||
|
for _, spaceId in pairs(spaceIds) do
|
||||||
|
for _, winId in ipairs(spaces.windowsForSpace(spaceId)) do
|
||||||
|
winMap[winId] = true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
for winId, _ in pairs(winMap) do
|
||||||
|
-- Cannot get windows for non-active spaces, window.filter would have to be used, but performance is crap
|
||||||
|
local win = window.get(winId)
|
||||||
|
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
|
||||||
|
|
||||||
|
-- https://github.com/Hammerspoon/hammerspoon/blob/master/SPOONS.md#hotkeys
|
||||||
|
function spoon:bindHotKeys(mapping)
|
||||||
|
local spec = {
|
||||||
|
restoreAppsToScreens = hs.fnutils.partial(self.restoreAppsToScreens, self)
|
||||||
|
}
|
||||||
|
|
||||||
|
hs.spoons.bindHotkeysToSpec(spec, mapping)
|
||||||
|
return self
|
||||||
|
end
|
||||||
|
|
||||||
|
return spoon
|
||||||
|
end)()
|
||||||
@@ -1,27 +1,32 @@
|
|||||||
windowMove = function()
|
windowMove = function()
|
||||||
|
local grid = hs.grid
|
||||||
|
local screen = hs.screen
|
||||||
|
local timer = hs.timer
|
||||||
|
local window = hs.window
|
||||||
|
|
||||||
-- move window to next screen
|
-- move window to next screen
|
||||||
hs.hotkey.bind({ "ctrl", "alt", "cmd" }, "N", function()
|
hs.hotkey.bind({ "ctrl", "alt", "cmd" }, "N", function()
|
||||||
local win = hs.window.focusedWindow()
|
local win = window.focusedWindow()
|
||||||
win:moveToScreen(win:screen():next())
|
win:moveToScreen(win:screen():next())
|
||||||
end)
|
end)
|
||||||
|
|
||||||
local fullscreen = function(win)
|
local fullscreen = function(win)
|
||||||
local screen = win:screen()
|
local scr = win:screen()
|
||||||
|
|
||||||
local cell = hs.grid.get(win, screen)
|
local cell = grid.get(win, scr)
|
||||||
|
|
||||||
cell.x = 0
|
cell.x = 0
|
||||||
cell.y = 0
|
cell.y = 0
|
||||||
cell.w = 24
|
cell.w = 24
|
||||||
cell.h = 24
|
cell.h = 24
|
||||||
|
|
||||||
hs.grid.set(win, cell, screen)
|
grid.set(win, cell, scr)
|
||||||
end
|
end
|
||||||
|
|
||||||
local getScreenById = function(id)
|
local getScreenById = function(id)
|
||||||
for _, screen in ipairs(hs.screen.allScreens()) do
|
for _, scr in ipairs(screen.allScreens()) do
|
||||||
if screen:getUUID() == id then
|
if scr:getUUID() == id then
|
||||||
return screen
|
return scr
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -30,38 +35,91 @@ windowMove = function()
|
|||||||
|
|
||||||
hs.hotkey.bind({ "ctrl", "alt", "cmd" }, "pad1", function()
|
hs.hotkey.bind({ "ctrl", "alt", "cmd" }, "pad1", function()
|
||||||
-- DELL S2722DGM
|
-- DELL S2722DGM
|
||||||
local screen = getScreenById("0F6BDB5B-840D-40BE-AAC9-B467A78E057A")
|
local scr = getScreenById("394ACDEE-CA25-43C4-A533-D4EDF4A897AF")
|
||||||
if screen == nil then
|
if scr == nil then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
local win = hs.window.focusedWindow()
|
local win = window.focusedWindow()
|
||||||
win:moveToScreen(screen)
|
win:moveToScreen(scr)
|
||||||
fullscreen(win)
|
timer.doAfter(1, function()
|
||||||
|
fullscreen(win)
|
||||||
|
end)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
hs.hotkey.bind({ "ctrl", "alt", "cmd" }, "pad2", function()
|
hs.hotkey.bind({ "ctrl", "alt", "cmd" }, "pad2", function()
|
||||||
-- DELL S2721DGF
|
-- DELL S2721DGF
|
||||||
local screen = getScreenById("D3142823-261D-46EF-B9C2-5181C7FE2CA5")
|
local scr = getScreenById("D3142823-261D-46EF-B9C2-5181C7FE2CA5")
|
||||||
if screen == nil then
|
if scr == nil then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
local win = hs.window.focusedWindow()
|
local win = window.focusedWindow()
|
||||||
win:moveToScreen(screen)
|
win:moveToScreen(scr)
|
||||||
fullscreen(win)
|
timer.doAfter(1, function()
|
||||||
|
fullscreen(win)
|
||||||
|
end)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
hs.hotkey.bind({ "ctrl", "alt", "cmd" }, "pad3", function()
|
hs.hotkey.bind({ "ctrl", "alt", "cmd" }, "pad3", function()
|
||||||
-- AV Receiver
|
-- AV Receiver
|
||||||
local screen = getScreenById("B5A65BB6-E73E-4C3D-977C-33C86798AA5A")
|
local scr = getScreenById("B5845603-D54C-44B8-9B55-96F7E5F50646")
|
||||||
if screen == nil then
|
if scr == nil then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
local win = hs.window.focusedWindow()
|
local win = window.focusedWindow()
|
||||||
win:moveToScreen(screen)
|
win:moveToScreen(scr)
|
||||||
fullscreen(win)
|
timer.doAfter(1, function()
|
||||||
|
fullscreen(win)
|
||||||
|
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
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,8 @@
|
|||||||
windowTiling =function()
|
windowTiling =function()
|
||||||
|
local window = hs.window
|
||||||
|
local grid = hs.grid
|
||||||
|
local screen = hs.screen
|
||||||
|
|
||||||
hs.window.animationDuration = 0
|
hs.window.animationDuration = 0
|
||||||
hs.window.setShadows(false)
|
hs.window.setShadows(false)
|
||||||
local hyper = { "ctrl", "alt", "cmd" }
|
local hyper = { "ctrl", "alt", "cmd" }
|
||||||
@@ -8,14 +12,14 @@ windowTiling =function()
|
|||||||
}
|
}
|
||||||
|
|
||||||
function wm:_nextStep(dim, offs, cb)
|
function wm:_nextStep(dim, offs, cb)
|
||||||
if hs.window.focusedWindow() then
|
if window.focusedWindow() then
|
||||||
local axis = dim == "w" and "x" or "y"
|
local axis = dim == "w" and "x" or "y"
|
||||||
local oppDim = dim == "w" and "h" or "w"
|
local oppDim = dim == "w" and "h" or "w"
|
||||||
local oppAxis = dim == "w" and "y" or "x"
|
local oppAxis = dim == "w" and "y" or "x"
|
||||||
local win = hs.window.frontmostWindow()
|
local win = window.frontmostWindow()
|
||||||
local screen = win:screen()
|
local scr = win:screen()
|
||||||
|
|
||||||
local cell = hs.grid.get(win, screen)
|
local cell = grid.get(win, scr)
|
||||||
|
|
||||||
local nextSize = self.sizes[1]
|
local nextSize = self.sizes[1]
|
||||||
for i = 1, #self.sizes do
|
for i = 1, #self.sizes do
|
||||||
@@ -34,32 +38,31 @@ windowTiling =function()
|
|||||||
cell[oppAxis] = 0
|
cell[oppAxis] = 0
|
||||||
end
|
end
|
||||||
|
|
||||||
hs.grid.set(win, cell, screen)
|
grid.set(win, cell, scr)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function wm:_fullscreen()
|
function wm:_fullscreen()
|
||||||
if hs.window.focusedWindow() then
|
if hs.window.focusedWindow() then
|
||||||
local win = hs.window.frontmostWindow()
|
local win = window.frontmostWindow()
|
||||||
local screen = win:screen()
|
local scr = win:screen()
|
||||||
|
|
||||||
local cell = hs.grid.get(win, screen)
|
local cell = grid.get(win, scr)
|
||||||
|
|
||||||
cell.x = 0
|
cell.x = 0
|
||||||
cell.y = 0
|
cell.y = 0
|
||||||
cell.w = self.GRID.w
|
cell.w = self.GRID.w
|
||||||
cell.h = self.GRID.h
|
cell.h = self.GRID.h
|
||||||
|
|
||||||
hs.grid.set(win, cell, screen)
|
grid.set(win, cell, scr)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function wm:_fullDimension(dim)
|
function wm:_fullDimension(dim)
|
||||||
if hs.window.focusedWindow() then
|
if window.focusedWindow() then
|
||||||
local win = hs.window.frontmostWindow()
|
local win = window.frontmostWindow()
|
||||||
local id = win:id()
|
local scr = win:screen()
|
||||||
local screen = win:screen()
|
local cell = grid.get(win, scr)
|
||||||
local cell = hs.grid.get(win, screen)
|
|
||||||
|
|
||||||
if dim == "x" then
|
if dim == "x" then
|
||||||
cell = "0,0 " .. self.GRID.w .. "x" .. self.GRID.h
|
cell = "0,0 " .. self.GRID.w .. "x" .. self.GRID.h
|
||||||
@@ -68,7 +71,7 @@ windowTiling =function()
|
|||||||
cell[dim == "w" and "x" or "y"] = 0
|
cell[dim == "w" and "x" or "y"] = 0
|
||||||
end
|
end
|
||||||
|
|
||||||
hs.grid.set(win, cell, screen)
|
grid.set(win, cell, scr)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -81,9 +84,9 @@ windowTiling =function()
|
|||||||
}
|
}
|
||||||
self.GRID = { w = 24, h = 24 }
|
self.GRID = { w = 24, h = 24 }
|
||||||
|
|
||||||
hs.grid.setGrid(self.GRID.w .. "x" .. self.GRID.h)
|
grid.setGrid(self.GRID.w .. "x" .. self.GRID.h)
|
||||||
hs.grid.MARGINX = 0
|
grid.MARGINX = 0
|
||||||
hs.grid.MARGINY = 0
|
grid.MARGINY = 0
|
||||||
|
|
||||||
hs.hotkey.bind(hyper, "down", function()
|
hs.hotkey.bind(hyper, "down", function()
|
||||||
self._pressed.down = true
|
self._pressed.down = true
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
{
|
{
|
||||||
|
config,
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
@@ -9,11 +10,18 @@ let
|
|||||||
|
|
||||||
zshSourceDirs = [ ];
|
zshSourceDirs = [ ];
|
||||||
|
|
||||||
|
gitUsername = "Lukas Cech";
|
||||||
|
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
|
||||||
|
;
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -24,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
|
||||||
@@ -40,19 +51,56 @@ in
|
|||||||
font-size = 14
|
font-size = 14
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
"${homedir}/.gnupg/gpg-agent.conf" = {
|
||||||
|
text = ''
|
||||||
|
default-cache-ttl 34560000
|
||||||
|
max-cache-ttl 34560000
|
||||||
|
pinentry-program ${pkgs.pinentry_mac}/bin/pinentry-mac
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
"${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" = {
|
||||||
|
source = ./hammerspoon/C3CWorkspace.spoon;
|
||||||
|
recursive = true;
|
||||||
|
};
|
||||||
|
|
||||||
"${homedir}/.hammerspoon/init.lua" = {
|
"${homedir}/.hammerspoon/init.lua" = {
|
||||||
text = ''
|
text = ''
|
||||||
${builtins.readFile ./hammerspoon/window-tiling.lua}
|
${builtins.readFile ./hammerspoon/window-tiling.lua}
|
||||||
|
|
||||||
${builtins.readFile ./hammerspoon/window-move.lua}
|
${builtins.readFile ./hammerspoon/window-move.lua}
|
||||||
|
|
||||||
|
package.path = package.path .. ";" .. hs.configdir .. "/hmSpoons/?.spoon/init.lua"
|
||||||
|
|
||||||
|
hs.loadSpoon("C3CWorkspace")
|
||||||
|
|
||||||
|
spoon.C3CWorkspace:bindHotKeys({
|
||||||
|
restoreAppsToScreens = {{"ctrl", "alt", "cmd"}, "F12"}
|
||||||
|
})
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
userName = "Lukas Cech";
|
|
||||||
userEmail = "lcech@veracode.com";
|
|
||||||
|
|
||||||
ignores = [
|
ignores = [
|
||||||
".vscode"
|
".vscode"
|
||||||
@@ -61,7 +109,15 @@ in
|
|||||||
".envrc"
|
".envrc"
|
||||||
];
|
];
|
||||||
|
|
||||||
extraConfig = {
|
signing = {
|
||||||
|
signByDefault = true;
|
||||||
|
key = "5ABD6C5E";
|
||||||
|
};
|
||||||
|
|
||||||
|
settings = {
|
||||||
|
user.name = gitUsername;
|
||||||
|
user.email = gitEmail;
|
||||||
|
|
||||||
core = {
|
core = {
|
||||||
autocrlf = "input";
|
autocrlf = "input";
|
||||||
editor = "vim";
|
editor = "vim";
|
||||||
@@ -70,12 +126,31 @@ 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/";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# 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;
|
||||||
|
};
|
||||||
|
mutableKeys = false;
|
||||||
|
publicKeys = [ ];
|
||||||
|
};
|
||||||
|
|
||||||
programs.lsd = {
|
programs.lsd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableAliases = true;
|
|
||||||
settings = {
|
settings = {
|
||||||
blocks = [
|
blocks = [
|
||||||
"permission"
|
"permission"
|
||||||
@@ -108,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
|
||||||
@@ -134,13 +234,13 @@ 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 = [ ];
|
||||||
StartInterval = 60 * 10;
|
StartInterval = 60 * 10;
|
||||||
StandardErrorPath = "/var/log/keepass-sync.error.log";
|
StandardErrorPath = "/var/log/keepass-sync.error.log";
|
||||||
StandardOutPath = "/var/log/keepass-sync.out.log";
|
StandardOutPath = "/var/log/keepass-sync.out.log";
|
||||||
|
|||||||
@@ -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
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -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
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
theme = "catppuccin-mocha"
|
theme = "Catppuccin Mocha"
|
||||||
window-width = 9999
|
window-width = 9999
|
||||||
window-height = 9999
|
window-height = 9999
|
||||||
|
|
||||||
@@ -17,15 +17,18 @@ keybind = super+alt+down=unbind
|
|||||||
keybind = super+alt+left=unbind
|
keybind = super+alt+left=unbind
|
||||||
keybind = super+alt+up=unbind
|
keybind = super+alt+up=unbind
|
||||||
|
|
||||||
keybind = super+k=new_split:down
|
keybind = super+alt+k=new_split:down
|
||||||
keybind = super+l=new_split:right
|
keybind = super+alt+l=new_split:right
|
||||||
|
|
||||||
keybind = super+alt+j=goto_split:up
|
keybind = super+j=goto_split:up
|
||||||
keybind = super+alt+k=goto_split:down
|
keybind = super+k=goto_split:down
|
||||||
keybind = super+alt+h=goto_split:left
|
keybind = super+h=goto_split:left
|
||||||
keybind = super+alt+l=goto_split:right
|
keybind = super+l=goto_split:right
|
||||||
|
|
||||||
keybind = super+shift+j=resize_split:up,10
|
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
|
||||||
@@ -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";
|
||||||
@@ -179,7 +180,7 @@ let
|
|||||||
};
|
};
|
||||||
"011479462201" = {
|
"011479462201" = {
|
||||||
name = "veracode-lz-master";
|
name = "veracode-lz-master";
|
||||||
role = "ReadOnly";
|
role = "EngineerAdmin";
|
||||||
};
|
};
|
||||||
"900979254221" = {
|
"900979254221" = {
|
||||||
name = "veracode-lz-static-non-prod";
|
name = "veracode-lz-static-non-prod";
|
||||||
@@ -222,6 +223,191 @@ let
|
|||||||
role = "EngineerAdmin";
|
role = "EngineerAdmin";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
old-world = {
|
||||||
|
"747166839737" = {
|
||||||
|
name = "Alternator Prod";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"849762296401" = {
|
||||||
|
name = "aws-cloudloop";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"555828001259" = {
|
||||||
|
name = "aws-devops";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"095180515219" = {
|
||||||
|
name = "aws-disco-dev";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"602400992919" = {
|
||||||
|
name = "aws-disco-prod";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"671440995558" = {
|
||||||
|
name = "aws-mpt";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"390809507444" = {
|
||||||
|
name = "aws-research";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"547681985753" = {
|
||||||
|
name = "aws-static-dev";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"576836758243" = {
|
||||||
|
name = "aws-static-prod";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"272739225222" = {
|
||||||
|
name = "Greenlight Dev";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"187309115203" = {
|
||||||
|
name = "Greenlight Prod";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"312566581319" = {
|
||||||
|
name = "mvsa-prod";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"528304698271" = {
|
||||||
|
name = "ops1";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"178484873978" = {
|
||||||
|
name = "ops2";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"036935693235" = {
|
||||||
|
name = "platform-integrations-dev";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"101042440253" = {
|
||||||
|
name = "platform-integrations-prod";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"769404944768" = {
|
||||||
|
name = "Veracode GovCloud Parent Staging";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"932961976631" = {
|
||||||
|
name = "Veracode Laputa";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"706178003760" = {
|
||||||
|
name = "Veracode Master";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"227458413628" = {
|
||||||
|
name = "veracode-asc-ilt";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"637659597440" = {
|
||||||
|
name = "veracode-dataservices-dev";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"360252896736" = {
|
||||||
|
name = "veracode-dataservices-production";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"634743813634" = {
|
||||||
|
name = "veracode-elearning-nonprod";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"231131777030" = {
|
||||||
|
name = "veracode-gov-parent-nonproduction";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"391700338873" = {
|
||||||
|
name = "veracode-gov-parent-production";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"083679226615" = {
|
||||||
|
name = "veracode-hackathon";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"228885042232" = {
|
||||||
|
name = "veracode-info-sec";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"653330403905" = {
|
||||||
|
name = "veracode-mpt-mffc";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"566201213358" = {
|
||||||
|
name = "veracode-nonproduction";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"518031149952" = {
|
||||||
|
name = "veracode-production";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"966752150300" = {
|
||||||
|
name = "veracode-qaoncloud-nonproduction";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"221433242586" = {
|
||||||
|
name = "veracode-solutions-architect";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
"576647558819" = {
|
||||||
|
name = "VeraRadio";
|
||||||
|
role = "EngineerAdmin";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
longbow = {
|
||||||
|
"520315734741" = {
|
||||||
|
name = "Audit";
|
||||||
|
role = "AWS-Engineer-Admin";
|
||||||
|
};
|
||||||
|
"853528449373" = {
|
||||||
|
name = "demo";
|
||||||
|
role = "AWS-Engineer-Admin";
|
||||||
|
};
|
||||||
|
"058887878640" = {
|
||||||
|
name = "Dev";
|
||||||
|
role = "AWS-Engineer-Admin";
|
||||||
|
};
|
||||||
|
"539590419140" = {
|
||||||
|
name = "Hans Gruber";
|
||||||
|
role = "AWS-Engineer-Admin";
|
||||||
|
};
|
||||||
|
"048352314288" = {
|
||||||
|
name = "Log archive";
|
||||||
|
role = "AWS-Engineer-Admin";
|
||||||
|
};
|
||||||
|
"066179854877" = {
|
||||||
|
name = "Production";
|
||||||
|
role = "AWS-Engineer-Admin";
|
||||||
|
};
|
||||||
|
"388353868666" = {
|
||||||
|
name = "SaaS Seller Account";
|
||||||
|
role = "AWS-Engineer-Admin";
|
||||||
|
};
|
||||||
|
"057168112839" = {
|
||||||
|
name = "Sandbox";
|
||||||
|
role = "AWS-Engineer-Admin";
|
||||||
|
};
|
||||||
|
"704459292453" = {
|
||||||
|
name = "Shared Services";
|
||||||
|
role = "AWS-Engineer-Admin";
|
||||||
|
};
|
||||||
|
"108911762463" = {
|
||||||
|
name = "Staging";
|
||||||
|
role = "AWS-Engineer-Admin";
|
||||||
|
};
|
||||||
|
"252894127310" = {
|
||||||
|
name = "TalonX";
|
||||||
|
role = "AWS-Engineer-Admin";
|
||||||
|
};
|
||||||
|
"932480454180" = {
|
||||||
|
name = "Test Customer";
|
||||||
|
role = "AWS-Engineer-Admin";
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
@@ -240,9 +426,38 @@ in
|
|||||||
sso_region = eu-central-1
|
sso_region = eu-central-1
|
||||||
sso_registration_scopes = sso:account:access
|
sso_registration_scopes = sso:account:access
|
||||||
|
|
||||||
|
[sso-session veracode-old-world]
|
||||||
|
sso_start_url = https://d-90679ac9ea.awsapps.com/start
|
||||||
|
sso_region = us-east-1
|
||||||
|
sso_registration_scopes = sso:account:access
|
||||||
|
|
||||||
|
[sso-session veracode-longbow]
|
||||||
|
sso_start_url = https://d-90677f445e.awsapps.com/start
|
||||||
|
sso_region = us-east-1
|
||||||
|
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 us-${account.name}]
|
[profile ${builtins.replaceStrings [ " " ] [ "" ] account.name}]
|
||||||
|
sso_account_id = ${id}
|
||||||
|
sso_role_name = ${account.role}
|
||||||
|
sso_session = veracode-us
|
||||||
|
region = us-east-1
|
||||||
|
output = json
|
||||||
|
|
||||||
|
[profile us-${builtins.replaceStrings [ " " ] [ "" ] account.name}]
|
||||||
sso_account_id = ${id}
|
sso_account_id = ${id}
|
||||||
sso_role_name = ${account.role}
|
sso_role_name = ${account.role}
|
||||||
sso_session = veracode-us
|
sso_session = veracode-us
|
||||||
@@ -253,7 +468,21 @@ in
|
|||||||
|
|
||||||
${builtins.concatStringsSep "\n" (
|
${builtins.concatStringsSep "\n" (
|
||||||
lib.mapAttrsToList (id: account: ''
|
lib.mapAttrsToList (id: account: ''
|
||||||
[profile eu-${account.name}]
|
${
|
||||||
|
if lib.any (usAccount: usAccount.name == account.name) (lib.attrValues accounts.us) then
|
||||||
|
""
|
||||||
|
else
|
||||||
|
''
|
||||||
|
[profile ${builtins.replaceStrings [ " " ] [ "" ] account.name}]
|
||||||
|
sso_account_id = ${id}
|
||||||
|
sso_role_name = ${account.role}
|
||||||
|
sso_session = veracode-eu
|
||||||
|
region = eu-central-1
|
||||||
|
output = json
|
||||||
|
''
|
||||||
|
}
|
||||||
|
|
||||||
|
[profile eu-${builtins.replaceStrings [ " " ] [ "" ] account.name}]
|
||||||
sso_account_id = ${id}
|
sso_account_id = ${id}
|
||||||
sso_role_name = ${account.role}
|
sso_role_name = ${account.role}
|
||||||
sso_session = veracode-eu
|
sso_session = veracode-eu
|
||||||
@@ -261,29 +490,122 @@ in
|
|||||||
output = json
|
output = json
|
||||||
'') accounts.eu
|
'') accounts.eu
|
||||||
)}
|
)}
|
||||||
|
|
||||||
|
${builtins.concatStringsSep "\n" (
|
||||||
|
lib.mapAttrsToList (id: account: ''
|
||||||
|
${
|
||||||
|
if
|
||||||
|
lib.any (otherAccount: otherAccount.name == account.name) (
|
||||||
|
lib.attrValues (accounts.us // accounts.eu)
|
||||||
|
)
|
||||||
|
then
|
||||||
|
""
|
||||||
|
else
|
||||||
|
''
|
||||||
|
[profile ${builtins.replaceStrings [ " " ] [ "" ] account.name}]
|
||||||
|
sso_account_id = ${id}
|
||||||
|
sso_role_name = ${account.role}
|
||||||
|
sso_session = veracode-old-world
|
||||||
|
region = eu-central-1
|
||||||
|
output = json
|
||||||
|
''
|
||||||
|
}
|
||||||
|
|
||||||
|
[profile old-world-${builtins.replaceStrings [ " " ] [ "" ] account.name}]
|
||||||
|
sso_account_id = ${id}
|
||||||
|
sso_role_name = ${account.role}
|
||||||
|
sso_session = veracode-old-world
|
||||||
|
region = eu-central-1
|
||||||
|
output = json
|
||||||
|
'') accounts.old-world
|
||||||
|
)}
|
||||||
|
|
||||||
|
${builtins.concatStringsSep "\n" (
|
||||||
|
lib.mapAttrsToList (id: account: ''
|
||||||
|
${
|
||||||
|
if
|
||||||
|
lib.any (otherAccount: otherAccount.name == account.name) (
|
||||||
|
lib.attrValues (accounts.us // accounts.eu // accounts.old-world)
|
||||||
|
)
|
||||||
|
then
|
||||||
|
""
|
||||||
|
else
|
||||||
|
''
|
||||||
|
[profile ${builtins.replaceStrings [ " " ] [ "" ] account.name}]
|
||||||
|
sso_account_id = ${id}
|
||||||
|
sso_role_name = ${account.role}
|
||||||
|
sso_session = veracode-longbow
|
||||||
|
region = eu-central-1
|
||||||
|
output = json
|
||||||
|
''
|
||||||
|
}
|
||||||
|
|
||||||
|
[profile longbow-${builtins.replaceStrings [ " " ] [ "" ] account.name}]
|
||||||
|
sso_account_id = ${id}
|
||||||
|
sso_role_name = ${account.role}
|
||||||
|
sso_session = veracode-longbow
|
||||||
|
region = eu-central-1
|
||||||
|
output = json
|
||||||
|
'') accounts.longbow
|
||||||
|
)}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
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" ''
|
||||||
|
for region in us eu; do
|
||||||
|
aws sso login --profile $region-shared-services &
|
||||||
|
done
|
||||||
|
aws sso login --profile old-world-aws-devops &
|
||||||
|
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
|
||||||
|
''}'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
# HISTORY
|
|
||||||
HISTSIZE=10000
|
|
||||||
SAVEHIST=10000
|
|
||||||
HISTFILE=~/.zsh_history
|
|
||||||
|
|
||||||
# bindkey '^R' zaw-history
|
|
||||||
Reference in New Issue
Block a user