diff --git a/common/linux.nix b/common/linux.nix index b8f4948..51add21 100644 --- a/common/linux.nix +++ b/common/linux.nix @@ -33,7 +33,6 @@ time.timeZone = "America/Toronto"; services.opensnitch.enable = true; - services.opensnitch-ui.enable = true; sound.enable = true; diff --git a/home/default.nix b/home/default.nix index 9f70793..0b3f481 100644 --- a/home/default.nix +++ b/home/default.nix @@ -34,6 +34,8 @@ in }; }; + services.opensnitch-ui.enable = stdenv.isLinux; + fonts.fontconfig.enable = true; programs = { @@ -62,9 +64,9 @@ in l = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"; ms = "merge --squash"; - po = "push origin"; + p = "push origin"; pf = "push -f"; - por = "push origin HEAD:refs/for/$1"; + pl = "! git pull origin $(git rev-parse --abbrev-ref HEAD)"; st = "status"; wip = "for-each-ref --sort='authordate:iso8601' --format=' %(color:green)%(authordate:relative)%09%(color:white)%(refname:short)' refs/heads"; diff --git a/home/nvim/lua/init.lua b/home/nvim/lua/init.lua index 656181f..7afb786 100644 --- a/home/nvim/lua/init.lua +++ b/home/nvim/lua/init.lua @@ -70,10 +70,6 @@ vim.api.nvim_set_keymap( { silent = true, noremap = true } ) ---Set colorscheme -vim.o.termguicolors = true -vim.cmd([[colorscheme kanagawa]]) - -- Use tab as trigger keys vim.cmd([[imap (completion_smart_tab)]]) vim.cmd([[imap (completion_smart_s_tab)]]) @@ -304,3 +300,7 @@ vim.g.syntastic_check_on_wq = 0 -- completion-nvim vim.cmd([[autocmd BufEnter * lua require'completion'.on_attach()]]) + +--Set colorscheme +vim.o.termguicolors = true +vim.cmd([[colorscheme kanagawa]])