diff --git a/sovr/etc/nixos/configuration.nix b/sovr/etc/nixos/configuration.nix index 4f15581..7102720 100644 --- a/sovr/etc/nixos/configuration.nix +++ b/sovr/etc/nixos/configuration.nix @@ -8,6 +8,8 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix + # Include the home-manager configuration + inputs.sovr.nixosModules.default ]; @@ -29,6 +31,15 @@ inputs.sovr.packages."${pkgs.system}".sovr-server ]; + home-manager.useGlobalPkgs = true; + home-manager.users.eliribble = { + home.file.".config/nvim/after/ftplugin/html.vim".source = ./home/eliribble/config/nvim/after/ftplugin/html.vim; + home.file.".config/nvim/after/ftplugin/go.vim".source = ./home/eliribble/config/nvim/after/ftplugin/go.vim; + home.file.".config/tmux/tmux.conf".source = ./home/eliribble/config/tmux/tmux.conf; + home.homeDirectory = "/home/eliribble"; + home.stateVersion = "24.11"; + home.username = "eliribble"; + }; i18n.defaultLocale = "en_US.UTF-8"; networking = { diff --git a/sovr/etc/nixos/home/eliribble/config/nvim/after/ftplugin/go.vim b/sovr/etc/nixos/home/eliribble/config/nvim/after/ftplugin/go.vim new file mode 100644 index 0000000..5ecb247 --- /dev/null +++ b/sovr/etc/nixos/home/eliribble/config/nvim/after/ftplugin/go.vim @@ -0,0 +1,10 @@ +set indentexpr= +set noautoindent +set nocindent +set noexpandtab +set nosmartindent +set nosmarttab +set nu +set shiftwidth=4 +set tabstop=4 +filetype indent off diff --git a/sovr/etc/nixos/home/eliribble/config/nvim/after/ftplugin/html.vim b/sovr/etc/nixos/home/eliribble/config/nvim/after/ftplugin/html.vim new file mode 100644 index 0000000..98d7467 --- /dev/null +++ b/sovr/etc/nixos/home/eliribble/config/nvim/after/ftplugin/html.vim @@ -0,0 +1,9 @@ +set indentexpr= +set noautoindent +set nocindent +set noexpandtab +set nosmartindent +set nosmarttab +set nu +set tabstop=2 +filetype indent off diff --git a/sovr/etc/nixos/home/eliribble/config/tmux/tmux.conf b/sovr/etc/nixos/home/eliribble/config/tmux/tmux.conf new file mode 100644 index 0000000..678d927 --- /dev/null +++ b/sovr/etc/nixos/home/eliribble/config/tmux/tmux.conf @@ -0,0 +1,22 @@ +set-option -g default-command fish + +bind-key h select-pane -L +bind-key j select-pane -D +bind-key k select-pane -U +bind-key l select-pane -R + +# nested tmux, obey me +bind-key a send-prefix + +# Avoid the annoying bit of delay when using the control character +set -g escape-time 0 +set -g renumber-windows on + +# Show a visual bell, even on other windows +set-window-option -g visual-bell both +set-window-option -g bell-action other + +# Set up the window visuals +set -g window-status-style bg=yellow +set -g window-status-current-style bg=red,fg=white +