dave/nix-config
1
0
Fork 0
mirror of https://github.com/davegallant/nix-config synced 2025-08-06 11:23:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve git aliases

Browse Source
This commit is contained in:
Dave Gallant
2021-12-22 22:40:16 -05:00
parent 46b6d6e212
commit b6f0c406ed
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/linux.nix
View File

@@ -33,7 +33,6 @@
time.timeZone = "America/Toronto"; time.timeZone = "America/Toronto";
services.opensnitch.enable = true; services.opensnitch.enable = true;
services.opensnitch-ui.enable = true;
sound.enable = true; sound.enable = true;

6
home/default.nix
View File

@@ -34,6 +34,8 @@ in
}; };
}; };
services.opensnitch-ui.enable = stdenv.isLinux;
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
programs = { programs = {
@@ -62,9 +64,9 @@ in
l = l =
"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"; p = "push origin";
pf = "push -f"; pf = "push -f";
por = "push origin HEAD:refs/for/$1"; pl = "! git pull origin $(git rev-parse --abbrev-ref HEAD)";
st = "status"; st = "status";
wip = wip =
"for-each-ref --sort='authordate:iso8601' --format=' %(color:green)%(authordate:relative)%09%(color:white)%(refname:short)' refs/heads"; "for-each-ref --sort='authordate:iso8601' --format=' %(color:green)%(authordate:relative)%09%(color:white)%(refname:short)' refs/heads";

8
home/nvim/lua/init.lua
View File

@@ -70,10 +70,6 @@ vim.api.nvim_set_keymap(
{ silent = true, noremap = true } { silent = true, noremap = true }
) )
--Set colorscheme
vim.o.termguicolors = true
vim.cmd([[colorscheme kanagawa]])
-- Use tab as trigger keys -- Use tab as trigger keys
vim.cmd([[imap <tab> <Plug>(completion_smart_tab)]]) vim.cmd([[imap <tab> <Plug>(completion_smart_tab)]])
vim.cmd([[imap <s-tab> <Plug>(completion_smart_s_tab)]]) vim.cmd([[imap <s-tab> <Plug>(completion_smart_s_tab)]])
@@ -304,3 +300,7 @@ vim.g.syntastic_check_on_wq = 0
-- completion-nvim -- completion-nvim
vim.cmd([[autocmd BufEnter * lua require'completion'.on_attach()]]) vim.cmd([[autocmd BufEnter * lua require'completion'.on_attach()]])
--Set colorscheme
vim.o.termguicolors = true
vim.cmd([[colorscheme kanagawa]])