mirror of
https://github.com/davegallant/nix-config
synced 2025-08-06 07:13:40 +00:00
Add amass and gitfast
This commit is contained in:
@@ -160,6 +160,7 @@ in
|
|||||||
srv
|
srv
|
||||||
|
|
||||||
# security
|
# security
|
||||||
|
amass
|
||||||
yar
|
yar
|
||||||
yubikey-manager
|
yubikey-manager
|
||||||
|
|
||||||
|
@@ -11,13 +11,12 @@
|
|||||||
|
|
||||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||||
|
|
||||||
|
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
|
||||||
|
|
||||||
darwin = {
|
darwin = {
|
||||||
url = "github:lnl7/nix-darwin";
|
url = "github:lnl7/nix-darwin";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
|
|
||||||
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, darwin, home-manager, nixpkgs, nixos-hardware, ... }@inputs: {
|
outputs = { self, darwin, home-manager, nixpkgs, nixos-hardware, ... }@inputs: {
|
||||||
|
@@ -59,6 +59,7 @@ in
|
|||||||
"log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
|
"log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
|
||||||
"ms" = "merge --squash";
|
"ms" = "merge --squash";
|
||||||
"po" = "push origin";
|
"po" = "push origin";
|
||||||
|
"pf" = "push -f";
|
||||||
"por" = "push origin HEAD:refs/for/$1";
|
"por" = "push origin HEAD:refs/for/$1";
|
||||||
"st" = "status";
|
"st" = "status";
|
||||||
"wip" =
|
"wip" =
|
||||||
@@ -110,7 +111,7 @@ in
|
|||||||
localVariables = {
|
localVariables = {
|
||||||
CASE_SENSITIVE = "true";
|
CASE_SENSITIVE = "true";
|
||||||
DISABLE_UNTRACKED_FILES_DIRTY = "true";
|
DISABLE_UNTRACKED_FILES_DIRTY = "true";
|
||||||
RPROMPT = "";
|
RPROMPT = ""; # override because macOS defaults to filepath
|
||||||
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "fg=#838383,underline";
|
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE = "fg=#838383,underline";
|
||||||
ZSH_DISABLE_COMPFIX = "true";
|
ZSH_DISABLE_COMPFIX = "true";
|
||||||
};
|
};
|
||||||
@@ -147,7 +148,11 @@ in
|
|||||||
|
|
||||||
"oh-my-zsh" = {
|
"oh-my-zsh" = {
|
||||||
enable = true;
|
enable = true;
|
||||||
plugins = [ "last-working-dir" "tmux" ];
|
plugins = [
|
||||||
|
"gitfast"
|
||||||
|
"last-working-dir"
|
||||||
|
"tmux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
@@ -39,7 +39,6 @@ vim.opt.switchbuf = 'usetab' -- try to reuse windows/tabs whe
|
|||||||
vim.opt.synmaxcol = 200 -- don't bother syntax highlighting long lines
|
vim.opt.synmaxcol = 200 -- don't bother syntax highlighting long lines
|
||||||
vim.opt.tabstop = 2 -- spaces per tab
|
vim.opt.tabstop = 2 -- spaces per tab
|
||||||
vim.opt.termguicolors = true -- use guifg/guibg instead of ctermfg/ctermbg in terminal
|
vim.opt.termguicolors = true -- use guifg/guibg instead of ctermfg/ctermbg in terminal
|
||||||
vim.opt.textwidth = 80 -- automatically hard wrap at 80 columns
|
|
||||||
|
|
||||||
vim.opt.shell = 'bash' -- shell to use for `!`, `:!`, `system()` etc.
|
vim.opt.shell = 'bash' -- shell to use for `!`, `:!`, `system()` etc.
|
||||||
vim.opt.shiftround = false -- don't always indent by multiple of shiftwidth
|
vim.opt.shiftround = false -- don't always indent by multiple of shiftwidth
|
||||||
|
@@ -3,15 +3,15 @@
|
|||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
|
|
||||||
pname = "vpngate";
|
pname = "vpngate";
|
||||||
version = "v0.1.0";
|
version = "v0.1.1";
|
||||||
|
|
||||||
vendorSha256 = "sha256-HOGPzCMh7nVKfpzKkAyaSDeRyowj9VuizCA7CLFWp78=";
|
vendorSha256 = "sha256-EAtZA7epMWEcDMP3F/9Fh06GUze70cidmaE4b/e3Sic=";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "davegallant";
|
owner = "davegallant";
|
||||||
repo = "vpngate";
|
repo = "vpngate";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-kToXqICQHWgXVLc3fN2bAxHAQWS3Dq3jdpi3CBXkP90=";
|
sha256 = "sha256-+/yICgCbaofLWk7YIzVKjt0rOVycsecLeoppKOEiUoY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
Reference in New Issue
Block a user