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 #479 from genebean/zsh-fixing

Browse source 
zsh fixing
This commit is contained in:
Gene Liverman 2025-01-10 15:23:03 -05:00 • committed by GitHub
commit ab3fba0d4b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 54 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

82
flake.lock generated
View file

@ -99,11 +99,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736199437, "lastModified": 1736526728,
"narHash": "sha256-TdU0a/x8048rbbJmkKWzSY1CtsbbGKNkIJcMdr8Zf4Q=", "narHash": "sha256-vb/ldbBHRbfT9U7SoCYmxh+h+PHuFqGjCBO0bPXsze4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "49f8aa791f81ff2402039b3efe0c35b9386c4bcf", "rev": "b1a94497b1c27fe7f81e3e76990959f5051da18b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -261,11 +261,11 @@
"genebean-omp-themes": { "genebean-omp-themes": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1731071013, "lastModified": 1736539337,
"narHash": "sha256-alEp6FoFIroS0rkY06kd/uIH5YF1h6foKn4/dhWF5co=", "narHash": "sha256-TBq4+E6n3t3a85FyP/4sLYFf+644rkMZ+Cn+xAj9f0k=",
"owner": "genebean", "owner": "genebean",
"repo": "my-oh-my-posh-themes", "repo": "my-oh-my-posh-themes",
"rev": "76fe6c603c06c9b7b7d27ea655ffbb5dbb719317", "rev": "89fedccc7177301c0d5660af0f809d01a25ebf4e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -303,11 +303,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735344290, "lastModified": 1736373539,
"narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "613691f285dad87694c2ba1c9e6298d04736292d", "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -324,11 +324,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736085891, "lastModified": 1736370755,
"narHash": "sha256-bTl9fcUo767VaSx4Q5kFhwiDpFQhBKna7lNbGsqCQiA=", "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "ba9b3173b0f642ada42b78fb9dfc37ca82266f6c", "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -339,11 +339,11 @@
}, },
"nix-flatpak": { "nix-flatpak": {
"locked": { "locked": {
"lastModified": 1735913600, "lastModified": 1736334301,
"narHash": "sha256-370z+WLVnD7LrN/SvTCZxPl/XPTshS5NS2dHN4iyK6o=", "narHash": "sha256-370z+WLVnD7LrN/SvTCZxPl/XPTshS5NS2dHN4iyK6o=",
"owner": "gmodena", "owner": "gmodena",
"repo": "nix-flatpak", "repo": "nix-flatpak",
"rev": "78ed84ff81e8d8510926e7165d508bcacef49ff1", "rev": "5f4ec93d432cd5288f6fe20d8842dceb5a065885",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -407,15 +407,14 @@
], ],
"nixpkgs-stable": [ "nixpkgs-stable": [
"nixpkgs" "nixpkgs"
], ]
"rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1736214624, "lastModified": 1736513564,
"narHash": "sha256-Pi70vbASZ1O9cR8RO5d2hBiNjIJBKKLoABl4sxWyOgg=", "narHash": "sha256-eAKwqMdGWambTbuZvAp3YYhAoWjaIFWGvxDAxxyh/Tg=",
"owner": "lilyinstarlight", "owner": "lilyinstarlight",
"repo": "nixos-cosmic", "repo": "nixos-cosmic",
"rev": "0830abeebf3b2d1bae44652ffb2c89cf0d56ddaa", "rev": "0855bf33427209e4f5e3d2d0968a14784525e929",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -426,11 +425,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1736237814, "lastModified": 1736441705,
"narHash": "sha256-uTdscVaKjnRnBIMuu/oWwdiGhYd/JOQ4YZGHeCoroqs=", "narHash": "sha256-OL7leZ6KBhcDF3nEKe4aZVfIm6xQpb1Kb+mxySIP93o=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "ca30f8501ab452ca687a7fdcb2d43e1fb1732317", "rev": "8870dcaff63dfc6647fb10648b827e9d40b0a337",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -561,11 +560,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1736166416, "lastModified": 1736320768,
"narHash": "sha256-U47xeACNBpkSO6IcCm0XvahsVXpJXzjPIQG7TZlOToU=", "narHash": "sha256-nIYdTAiKIGnFNugbomgBJR+Xv5F1ZQU+HfaBqJKroC0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b30f97d8c32d804d2d832ee837d0f1ca0695faa5", "rev": "4bc9c909d9ac828a039f288cf872d16d38185db8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -577,11 +576,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1736061677, "lastModified": 1736200483,
"narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36", "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -674,27 +673,6 @@
"type": "github" "type": "github"
} }
}, },
"rust-overlay": {
"inputs": {
"nixpkgs": [
"nixos-cosmic",
"nixpkgs"
]
},
"locked": {
"lastModified": 1736130662,
"narHash": "sha256-z+WGez9oTR2OsiUWE5ZhIpETqM1ogrv6Xcd24WFi6KQ=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "2f5d4d9cd31cc02c36e51cb2e21c4b25c4f78c52",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"simple-nixos-mailserver": { "simple-nixos-mailserver": {
"inputs": { "inputs": {
"blobs": "blobs", "blobs": "blobs",
@ -729,11 +707,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736203741, "lastModified": 1736515725,
"narHash": "sha256-eSjkBwBdQk+TZWFlLbclF2rAh4JxbGg8az4w/Lfe7f4=", "narHash": "sha256-4P99yL8vGehwzytkpP87eklBePt6aqeEC5JFsIzhfUs=",
"owner": "mic92", "owner": "mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c9c88f08e3ee495e888b8d7c8624a0b2519cb773", "rev": "f214c1b76c347a4e9c8fb68c73d4293a6820d125",
"type": "github" "type": "github"
}, },
"original": { "original": {

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

@ -160,9 +160,9 @@ in {
oh-my-posh = { oh-my-posh = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
#settings = builtins.fromJSON (builtins.unsafeDiscardStringContext (builtins.readFile (inputs.genebean-omp-themes + "/beanbag.omp.json"))); settings = builtins.fromJSON (builtins.unsafeDiscardStringContext (builtins.readFile (inputs.genebean-omp-themes + "/beanbag.omp.json")));
#useTheme = "amro"; #useTheme = "amro";
useTheme = "montys"; #useTheme = "montys";
}; };
ripgrep.enable = true; ripgrep.enable = true;
tmux = { tmux = {
@ -271,7 +271,7 @@ in {
fi fi
export GPG_TTY=$(tty) export GPG_TTY=$(tty)
nv() { function nv() {
# Assumes all configs exist in directories named ~/.config/nvim-* # Assumes all configs exist in directories named ~/.config/nvim-*
local config=$(fd --max-depth 1 --glob 'nvim*' ~/.config | fzf --prompt="Neovim Configs > " --height=~50% --layout=reverse --border --exit-0) local config=$(fd --max-depth 1 --glob 'nvim*' ~/.config | fzf --prompt="Neovim Configs > " --height=~50% --layout=reverse --border --exit-0)
@ -282,32 +282,32 @@ in {
NVIM_APPNAME=$(basename $config) nvim $* NVIM_APPNAME=$(basename $config) nvim $*
} }
svndiffless() { function svndiffless() {
svn diff "$@" |diff-so-fancy |less -R svn diff "$@" |diff-so-fancy |less -R
} }
svndiffless-nows() { function svndiffless-nows() {
svn diff -x -w "$@" |diff-so-fancy |less -R svn diff -x -w "$@" |diff-so-fancy |less -R
} }
# unset oh-my-zsh's gk so that gk can refer to the gitkraken-cli
unalias gk
''; '';
oh-my-zsh = { # # unset oh-my-zsh's gk so that gk can refer to the gitkraken-cli
enable = true; # unalias gk
plugins = [ # '';
"bundler" # oh-my-zsh = {
"gem" # enable = true;
"git" # plugins = [
"github" # "bundler"
"history" # "gem"
"kubectl" # "git"
"pip" # "github"
"terraform" # "history"
"vagrant" # "kubectl"
"vscode" # "pip"
]; # "terraform"
}; # "vagrant"
# "vscode"
# ];
# };
shellAliases = { shellAliases = {
bcrr = "bolt command run --run-as root --sudo-password-prompt"; bcrr = "bolt command run --run-as root --sudo-password-prompt";
bcrrs = "bcrr --stream --no-verbose"; bcrrs = "bcrr --stream --no-verbose";

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

@ -14,7 +14,7 @@
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 && darwin-rebuild build --flake . && nvd diff /run/current-system result"; nixdiff = "brew outdated && brew outdated --cask && mas outdated && cd ~/repos/dots && darwin-rebuild build --flake . && nvd diff /run/current-system result";

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

@ -7,11 +7,6 @@
goPath = "go"; goPath = "go";
}; };
k9s.enable = true; k9s.enable = true;
zsh = {
initExtra = ''
eval $(brew shellenv)
'';
};
}; };
sops = { sops = {