genebean/dots
1
0
Fork 0
mirror of https://github.com/genebean/dots.git synced 2026-03-27 01:17:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #539 from genebean/mightymac

Browse source 
add btop & Zellij everywhere, but don't automatically use Zellij
This commit is contained in:
Gene Liverman 2025-08-19 12:00:39 -04:00 • committed by GitHub
commit 1b93457256
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 28 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/hosts/common/default.nix
View file

@ -7,6 +7,7 @@
else "libsqlite3.so"; else "libsqlite3.so";
in { in {
home.packages = with pkgs; [ home.packages = with pkgs; [
btop
bundix bundix
cargo cargo
cheat cheat
@ -255,6 +256,10 @@ in {
let g:airline_powerline_fonts = 1 let g:airline_powerline_fonts = 1
''; '';
}; };
zellij = {
enable = true;
enableZshIntegration = false;
};
zsh = { zsh = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;

44
modules/hosts/darwin/home.nix
View file

@ -1,27 +1,29 @@
{ username, ... }: { { username, ... }: {
# dawrwin-specific shell config # dawrwin-specific shell config
programs.zsh = { programs = {
initContent = '' zsh = {
function otpon() { initContent = ''
osascript -e 'tell application "yubiswitch" to KeyOn' function otpon() {
} osascript -e 'tell application "yubiswitch" to KeyOn'
function otpoff() { }
osascript -e 'tell application "yubiswitch" to KeyOff' function otpoff() {
} osascript -e 'tell application "yubiswitch" to KeyOff'
}
# Include Puppet's normal bin folder since it is installed via Homebrew # Include Puppet's normal bin folder since it is installed via Homebrew
export PATH=$PATH:/opt/puppetlabs/bin export PATH=$PATH:/opt/puppetlabs/bin
export PATH=$PATH:/opt/puppetlabs/pdk/bin export PATH=$PATH:/opt/puppetlabs/pdk/bin
export PATH=$PATH:/opt/puppetlabs/puppet/bin export PATH=$PATH:/opt/puppetlabs/puppet/bin
''; '';
oh-my-zsh.plugins = [ "macos" ]; oh-my-zsh.plugins = [ "macos" ];
shellAliases = { shellAliases = {
currentwifi = "networksetup -getairportnetwork en0 |cut -d ':' -f2- | cut -d ' ' -f2-"; currentwifi = "networksetup -getairportnetwork en0 |cut -d ':' -f2- | cut -d ' ' -f2-";
nixdiff = "brew outdated && brew outdated --cask && mas outdated && cd ~/repos/dots && sudo darwin-rebuild build --flake . && nvd diff /run/current-system result"; nixdiff = "brew outdated && brew outdated --cask && mas outdated && cd ~/repos/dots && sudo darwin-rebuild build --flake . && nvd diff /run/current-system result";
nixup = "sudo darwin-rebuild switch --flake ~/repos/dots"; nixup = "sudo darwin-rebuild switch --flake ~/repos/dots";
uwgconnect = "networksetup -setairportnetwork en0 SecureWest"; uwgconnect = "networksetup -setairportnetwork en0 SecureWest";
uwgforget = "networksetup -removepreferredwirelessnetwork en0 SecureWest"; uwgforget = "networksetup -removepreferredwirelessnetwork en0 SecureWest";
ykey = "pkill -9 gpg-agent && source ~/.zshrc; ssh-add -L"; ykey = "pkill -9 gpg-agent && source ~/.zshrc; ssh-add -L";
};
}; };
}; };

4
modules/hosts/darwin/mightymac/home-gene.liverman.nix
View file

@ -7,10 +7,6 @@
goPath = "go"; goPath = "go";
}; };
k9s.enable = true; k9s.enable = true;
zellij = {
enable = true;
enableZshIntegration = true;
};
}; };
sops = { sops = {