Added a vim config and put everything in my prefered indentation style.

This commit is contained in:
2025-10-12 11:44:48 -05:00
parent 89c9bd4996
commit 9cb89b9aeb
12 changed files with 509 additions and 270 deletions

87
modules/home/vim.nix Executable file
View File

@@ -0,0 +1,87 @@
{ pkgs, lib, nixvim, ... }:
{
imports = [ /*inputs.nixvim.nixosModules.nixvim*/ ];
programs.nixvim = {
enable = true;
defaultEditor = true;
enableMan = true;
globals.mapleader = "`";
viAlias = true;
vimAlias = true;
opts = {
tabstop = 4;
softtabstop = 0;
shiftwidth = 4;
expandtab = false;
autoindent = true;
number = true;
relativenumber = true;
ignorecase = true;
smartcase = true;
};
plugins.lsp = {
enable = true;
servers = {
rust_analyzer = {
enable = true;
installCargo = false;
installRustc = false;
};
nixd = {
enable = true;
# settings.formatting.command = [ "alejandra" ];
};
};
};
plugins.treesitter = {
enable = true;
nixvimInjections = true;
# ensure_installed = "all";
settings = {
highlight = {
enable = true;
disable = [ "org" ];
};
};
grammarPackages = pkgs.vimPlugins.nvim-treesitter.allGrammars;
};
extraPlugins = with pkgs.vimPlugins; [
orgmode
vim-nix
];
extraConfigLua = ''
-- Tree-sitter configuration
require'nvim-treesitter.configs'.setup {
-- If TS highlights are not enabled at all, or disabled via ``disable`` prop, highlighting will fallback to default Vim syntax highlighting
highlight = {
-- enable = true,
-- disable = {'org'}, -- Remove this to use TS highlighter for some of the highlights (Experimental)
additional_vim_regex_highlighting = {'org'}, -- Required since TS highlighter doesn't support all syntax features (conceal)
},
-- ensure_installed = {'org'}, -- Or run :TSUpdate org
}
require('orgmode').setup({
org_agenda_files = {'~/Org/Agenda/agenda.org', '~/Public/Org/Agenda/agenda.org'},
org_default_notes_file = '~/Dropbox/org/refile.org',
})
'';
extraConfigVim = ''
filetype indent off
set noexpandtab
set list
set listchars=tab:\ ,trail:·
autocmd FileType nix setlocal noexpandtab tabstop=4 shiftwidth=4 softtabstop=0
'';
#colorschemes.base16.enable = true;
};
}

View File

@@ -1,8 +1,8 @@
{ config, pkgs, inputs, ... }:
{
imports = [
./ollama.nix
./open-webui.nix
./sillytavern.nix
];
imports = [
./ollama.nix
./open-webui.nix
./sillytavern.nix
];
}

View File

@@ -1,6 +1,6 @@
{ config, pkgs, inputs, ... }:
{
imports = [ ];
imports = [ ];
services.ollama = {
enable = true;
acceleration = "cuda";

View File

@@ -1,8 +1,8 @@
{ config, pkgs, inputs, ... }:
{
imports = [ ];
imports = [ ];
services.open-webui = {
#enable = true;
#enable = true;
enable = false;
host = "0.0.0.0";
openFirewall = true;
@@ -15,4 +15,4 @@
ENABLE_LOGIN_FORM = "True";
};
};
}
}

View File

@@ -1,31 +1,31 @@
{ config, pkgs, inputs, ... }:
{
imports = [ ];
imports = [ ];
services.sillytavern = {
enable = true;
#enable = false;
#enable = false;
port = 9002;
listen = true;
listenAddressIPv4 = "127.0.0.1";
whitelist = true;
#user = "tavern";
#group = "tavern";
#user = "tavern";
#group = "tavern";
};
services.nginx = {
enable = true;
#additionalModules = [ pkgs.nginxModules.pam ];
#additionalModules = [ pkgs.nginxModules.pam ];
virtualHosts."192.168.0.101" = {
locations."/" = {
proxyPass = "http://localhost:9002";
extraConfig = ''
auth_basic "Password Required";
auth_basic_user_file /etc/htpasswd;
auth_basic_user_file /etc/htpasswd;
'';
};
};
};
# Open ports in the firewall.
networking.firewall.allowedTCPPorts = [ 80 ]; #9002
# Open ports in the firewall.
networking.firewall.allowedTCPPorts = [ 80 ]; #9002
}

View File

@@ -1,36 +1,36 @@
{ config, pkgs, inputs, ... }:
{
imports = [ ];
imports = [ ];
# Enable the X11 windowing system.
services.xserver.enable = true;
# Enable the X11 windowing system.
services.xserver.enable = true;
#Disable Suspend
#Disable Suspend
systemd.targets.sleep.enable = false;
systemd.targets.suspend.enable = false;
systemd.targets.hibernate.enable = false;
systemd.targets.hybrid-sleep.enable = false;
# Enable the GNOME Desktop Environment.
services.displayManager.gdm.enable = true;
services.desktopManager.gnome.enable = true;
# Enable the GNOME Desktop Environment.
services.displayManager.gdm.enable = true;
services.desktopManager.gnome.enable = true;
#Packages
environment.systemPackages = with pkgs; [
gnome-tweaks
gnome-extension-manager
gnomeExtensions.pop-shell
gnomeExtensions.arcmenu
gnomeExtensions.dash-to-panel
gnomeExtensions.dash-to-dock
gnomeExtensions.just-perfection
gnomeExtensions.blur-my-shell
];
#Packages
environment.systemPackages = with pkgs; [
gnome-tweaks
gnome-extension-manager
gnomeExtensions.pop-shell
gnomeExtensions.arcmenu
gnomeExtensions.dash-to-panel
gnomeExtensions.dash-to-dock
gnomeExtensions.just-perfection
gnomeExtensions.blur-my-shell
];
environment.gnome.excludePackages = with pkgs; [
epiphany
geary
gnome-tour
geary
gnome-tour
];
}

View File

@@ -1,29 +1,29 @@
{ config, pkgs, inputs, ... }:
{
imports =
[ ];
# Set your time zone.
time.timeZone = "America/Chicago";
imports =
[ ];
# Set your time zone.
time.timeZone = "America/Chicago";
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "en_US.UTF-8";
LC_IDENTIFICATION = "en_US.UTF-8";
LC_MEASUREMENT = "en_US.UTF-8";
LC_MONETARY = "en_US.UTF-8";
LC_NAME = "en_US.UTF-8";
LC_NUMERIC = "en_US.UTF-8";
LC_PAPER = "en_US.UTF-8";
LC_TELEPHONE = "en_US.UTF-8";
LC_TIME = "en_US.UTF-8";
};
i18n.extraLocaleSettings = {
LC_ADDRESS = "en_US.UTF-8";
LC_IDENTIFICATION = "en_US.UTF-8";
LC_MEASUREMENT = "en_US.UTF-8";
LC_MONETARY = "en_US.UTF-8";
LC_NAME = "en_US.UTF-8";
LC_NUMERIC = "en_US.UTF-8";
LC_PAPER = "en_US.UTF-8";
LC_TELEPHONE = "en_US.UTF-8";
LC_TIME = "en_US.UTF-8";
};
# Configure keymap in X11
services.xserver.xkb = {
layout = "us";
variant = "";
};
# Configure keymap in X11
services.xserver.xkb = {
layout = "us";
variant = "";
};
}