kekl

modules/home/nix/shell.nix

@@ -23,7 +23,7 @@
         cp = "cp -rv";
         mv = "mv -v";
         mkdir = "mkdir -pv";
-        update = "doas nixos-rebuild switch";
+        update = "sudo nixos-rebuild switch --flake /etc/nixos#poggers --impure";
       };
       plugins = [
         {

modules/system/nix/nvim/default.nix

@@ -7,8 +7,8 @@
     ./lsp.nix
     ./terminal.nix
     ./neotree.nix
-    ./opts.nix
     ./cmp.nix
+    ./lualine.nix
   ];
   programs.nvf = {
     enable = true;
@@ -21,9 +21,6 @@
           })
         ];
         autopairs.nvim-autopairs.enable = true;
-        statusline.lualine = {
-          enable = true;
-        };
         telescope.enable = true;
         theme = {
           enable = true;

modules/system/nix/nvim/default.nix~

@@ -1,35 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
-  imports = [
-    ./lsp.nix
-    ./terminal.nix
-    ./neotree.nix
-    ./opts.nix
-    ./cmp.nix
-  ];
-  programs.nvf = {
-    enable = true;
-    settings = {
-      vim = {
-        extraLuaFiles = [
-          (builtins.path {
-            path = ./raw/opts.lua;
-            name = "opts.lua"
-          })
-        ];
-        autopairs.nvim-autopairs.enable = true;
-        statusline.lualine = {
-          enable = true;
-        };
-        telescope.enable = true;
-        theme = {
-          enable = true;
-        };
-      };
-    };
-  };
-}
-

modules/system/nix/nvim/lsp.nix

@@ -33,6 +33,27 @@
           autotagHtml = true;
         };
       };
+      css = {
+        enable = true;
+        treesitter.enable = true;
+        lsp.enable = true;
+      };
+      assembly = {
+        enable = true;
+        lsp.enable = true;
+        treesitter.enable = true;
+      };
+      bash = {
+        enable = true;
+        lsp.enable = true;
+        treesitter.enable = true;
+      };
+      ts = {
+        enable = true;
+        extraDiagnostics.enable = true;
+        treesitter.enable = true;
+        lsp.enable = true;
+      };
       nix = {
         enable = true;
         extraDiagnostics = {

modules/system/nix/nvim/lualine.nix

@@ -0,0 +1,15 @@
+{ pkgs, lib, ... }:
+{
+  programs.nvf.settings.vim = {
+    statusline = {
+      lualine = {
+        enable = true;
+        globalStatus = true;
+        icons.enable = true;
+        ignoreFocus = [
+          "neo-tree"
+        ];
+      };
+    };
+  };
+}

modules/system/nix/nvim/raw/opts.lua

@@ -1,6 +1,7 @@
 vim.opt.shiftwidth = 2
 vim.opt.tabstop = 2 
 vim.opt.cursorline = true
+vim.opt.cursorcolumn = true
 vim.opt.expandtab = true
 vim.opt.autoindent = true
 vim.opt.smartindent = true
@@ -16,10 +17,12 @@ local map = vim.api.nvim_set_keymap
 local opts = { noremap = true, silent = true }
 
 vim.g.mapleader = " "
-map('n', '<c-t>', ":ToggleTerm size=40<CR>", opts)
+map('n', '<c-t>', ":ToggleTerm size=15<CR>", opts)
 map('n', '<c-n>', ":Neotree filesystem reveal toggle<CR>", opts)
 map('v', '<Tab>', '>gv', opts)
 map('v', '<S-Tab>', '<gv', opts)
+map('n', '<leader>ff', 'Telescope find_files<CR>', opts)
+map('n', '<leader>gs', 'Telescope grep_string<CR>', opts)
 
 vim.cmd [[
   set nobackup

modules/system/nix/nvim/raw/opts.lua~

@@ -1,37 +0,0 @@
-vim.opt.shiftwidth = 2
-vim.opt.tabstop = 2 
-vim.opt.cursorline = true
-vim.opt.expandtab = true
-vim.opt.autoindent = true
-vim.opt.smartindent = true
-vim.opt.softtabstop = 4
-vim.opt.relativenumber = true
-
-vim.diagnostic.config({
-  virtual_text = true,
-  virtual_lines = true,
-})
-
-local map = vim.api.nvim_set_keymap
-local opts = { noremap = true, silent = true }
-
-vim.g.mapleader = " "
-map('n', '<c-t>', ":ToggleTerm size=40<CR>", opts)
-map('n', '<c-n>', ":Neotree filesystem reveal toggle<CR>", opts)
-map('v', '<Tab>', '>gv', opts)
-map('v', '<S-Tab>', '<gv', opts)
-
-vim.cmd [[
-  set nobackup
-  cnoreabbrev W! w!
-  cnoreabbrev Q! q!
-  cnoreabbrev Qall! qall!
-  cnoreabbrev Wq wq
-  cnoreabbrev Wa wa
-  cnoreabbrev wQ wq
-  cnoreabbrev WQ wq
-  cnoreabbrev W w
-  cnoreabbrev Q q
-  cnoreabbrev Qall qall 
-]]
-