summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/fish.nix1
-rw-r--r--configuration.nix11
-rw-r--r--pkgs/vim/conf/rc.vim9
-rw-r--r--pkgs/vim/nvim.nix12
4 files changed, 14 insertions, 19 deletions
diff --git a/conf/fish.nix b/conf/fish.nix
index 55c03f6..c79e654 100644
--- a/conf/fish.nix
+++ b/conf/fish.nix
@@ -16,6 +16,7 @@
set fish_color_cwd green
set fish_color_quote brown
set fish_color_autosuggestion 555
+ set fish_color_redirection white
'';
promptInit = ''
function fish_prompt
diff --git a/configuration.nix b/configuration.nix
index 8cb55a1..b318c58 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -73,7 +73,7 @@
autoLogin = true;
defaultUser = "common";
};
-
+
desktopManager.default = "none";
};
};
@@ -93,7 +93,14 @@
];
shellAliases = {
- "ls" = "ls --color --group-directories-first";
+ "ls" = "ls --color=auto --group-directories-first";
};
+
+ shellInit = ''
+ export LC_NUMERIC=de_DE.UTF8
+ export LC_TIME=de_DE.UTF8
+ export LC_MONETARY=de_DE.UTF8
+ export LC_MEASUREMENT=de_DE.UTF8
+ '';
};
}
diff --git a/pkgs/vim/conf/rc.vim b/pkgs/vim/conf/rc.vim
index 4072bf2..6ad5d7b 100644
--- a/pkgs/vim/conf/rc.vim
+++ b/pkgs/vim/conf/rc.vim
@@ -98,11 +98,10 @@ let g:goyo_width = 90
let g:goyo_margin_top = 1
let g:goyo_margin_bottom = 0
-nnoremap <F5> :UndotreeToggle<CR>
-nnoremap <F6> :GitGutterToggle<CR>
-nnoremap <F7> :set cursorline!<CR>
-nnoremap <F8> :TagbarToggle<CR>
-nnoremap <F12> :Goyo<CR>
+nnoremap <F5> :UndotreeToggle<CR>
+nnoremap <F6> :GitGutterToggle<CR>
+nnoremap <F7> :TagbarToggle<CR>
+nnoremap <F8> :Goyo<CR>
nnoremap <c-b> :CtrlPBuffer<CR>
nnoremap <c-m> :CtrlPMixed<CR>
diff --git a/pkgs/vim/nvim.nix b/pkgs/vim/nvim.nix
deleted file mode 100644
index f9647ce..0000000
--- a/pkgs/vim/nvim.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-
-let
- nvim = pkgs.neovim.override {
- vimAlias = false;
- configure = (import ./custom.nix { pkgs = pkgs; });
- };
-in [
- nvim
- pkgs.ctags
- pkgs.git
-]