moved users/willifan to home-manager module

modules/common/default.nix

@@ -1,13 +1,20 @@
 { hostname, ... }:
 {
   imports = [
+    ./nixvim
+
     ./autoupdate.nix
+    ./envvar.nix
     ./garbage-collect.nix
     ./keyd.nix
+    ./locales.nix
     ./mimetype.nix
     ./optimise.nix
+    ./packages.nix
     ./sops.nix
+    ./stylix.nix
     ./syncthing.nix
+    ./users.nix
   ];
 
   networking = {

modules/common/envvar.nix

@@ -0,0 +1,16 @@
+{ ... }:
+{
+  environment.sessionVariables = {
+    NIXOS_OZONE_WL = "1";
+    XDG_CACHE_HOME  = "$HOME/.cache";
+    XDG_CONFIG_HOME = "$HOME/.config";
+    XDG_DATA_HOME   = "$HOME/.local/share";
+    XDG_STATE_HOME  = "$HOME/.local/state";
+
+    # Not officially in the specification
+    #XDG_BIN_HOME    = "$HOME/.local/bin";
+    #PATH = [ 
+    #  "${XDG_BIN_HOME}"
+    #];
+  };
+}

modules/common/keyd.nix

@@ -8,14 +8,14 @@
       settings = {
         main = {
           rightalt = "overload(altgr, rightalt)";
-	  capslock = "overload(control, esc)";
-	};
-	altgr = {
+	        capslock = "overload(control, esc)";
+	      };
+	      altgr = {
           a = ''macro(compose a ")'';
           o = ''macro(compose o ")'';
-	  u = ''macro(compose u ")'';
-	  s = ''macro(compose s s)'';
-	};
+      	  u = ''macro(compose u ")'';
+      	  s = ''macro(compose s s)'';
+	      };
       };
     };
   };

modules/common/locales.nix

@@ -0,0 +1,16 @@
+{ ... }:
+{
+  time.timeZone = "Europe/Berlin";
+  i18n.defaultLocale = "en_US.UTF-8";
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "de_DE.UTF-8";
+    LC_IDENTIFICATION = "de_DE.UTF-8";
+    LC_MEASUREMENT = "de_DE.UTF-8";
+    LC_MONETARY = "de_DE.UTF-8";
+    LC_NAME = "de_DE.UTF-8";
+    LC_NUMERIC = "de_DE.UTF-8";
+    LC_PAPER = "de_DE.UTF-8";
+    LC_TELEPHONE = "de_DE.UTF-8";
+    LC_TIME = "de_DE.UTF-8";
+  };
+}

modules/common/nixvim/TODO.md

@@ -0,0 +1,12 @@
+# Plugins
+add cmp
+try out nvimtree
+add lualine
+add autopairs
+indent blankline??
+todo comments
+undo tree
+bufferline?
+startup?
+KEYBINDS
+

modules/common/nixvim/autopairs.nix

@@ -0,0 +1,9 @@
+{ ... }:
+{
+  programs.nixvim.plugins.nvim-autopairs = {
+    enable = true;
+    settings = {
+      disable_filetype = ["TelescopePrompt" "vim"];
+    };
+  };
+}

modules/common/nixvim/cmp.nix

@@ -0,0 +1,49 @@
+{ ... }:
+{
+
+  programs.nixvim.plugins = {
+    cmp = {
+      enable = true;
+      settings = {
+        autoEnableSources = true;
+        experimental = {ghost_text = false;};
+        performance = {
+          debounce = 60;
+          fetchingTimeout = 200;
+          maxViewEntries = 30;
+        };
+        snippet = {expand = "luasnip";};
+        formatting = {fields = ["kind" "abbr" "menu"];};
+        sources = [
+          {name = "git";}
+          {name = "nvim_lsp";}
+          {name = "emoji";}
+          {
+            name = "buffer"; # text within current buffer
+            option.get_bufnrs.__raw = "vim.api.nvim_list_bufs";
+            keywordLength = 3;
+          }
+          {
+            name = "path"; # file system paths
+            keywordLength = 3;
+          }
+          {
+            name = "luasnip"; # snippets
+            keywordLength = 3;
+          }
+        ];
+
+        window = {
+          completion = {border = "solid";};
+          documentation = {border = "solid";};
+        };
+      };
+    };
+    cmp-nvim-lsp = {enable = true;}; # lsp
+    cmp-buffer = {enable = true;};
+    cmp-path = {enable = true;}; # file system paths
+    cmp_luasnip = {enable = true;}; # snippets
+    cmp-cmdline = {enable = false;}; # autocomplete for cmdline
+  };
+
+}

modules/common/nixvim/default.nix

@@ -0,0 +1,24 @@
+{ ... }:
+{
+
+  programs.nixvim = {
+    enable = true;
+    defaultEditor = true;
+  };
+
+  imports = [
+    ./autopairs.nix
+    ./cmp.nix
+    ./filetype.nix
+    ./gitsigns.nix
+    ./illuminate.nix
+    ./lsp.nix
+    ./navic.nix
+    ./neotree.nix
+    ./settings.nix
+    ./treesitter.nix
+    ./whichkey.nix
+    ./yazi.nix
+  ];
+
+}

modules/common/nixvim/filetype.nix

@@ -0,0 +1,14 @@
+{ ... }:
+{
+
+  programs.nixvim.files = {
+    "ftplugin/nix.lua" = {
+      opts = {
+        expandtab = true;
+        shiftwidth = 2;
+        tabstop = 2;
+      };
+    };
+  };
+
+}

modules/common/nixvim/gitsigns.nix

@@ -0,0 +1,28 @@
+{ ... }:
+{
+  programs.nixvim.plugins.gitsigns = {
+    enable = true;
+    settings = {
+      signs = {
+        add = {
+          text = " ";
+        };
+        change = {
+          text = " ";
+        };
+        delete = {
+          text = " ";
+        };
+        untracked = {
+          text = "";
+        };
+        topdelete = {
+          text = "󱂥 ";
+        };
+        changedelete = {
+          text = "󱂧 ";
+        };
+      };
+    };
+  };
+}

modules/common/nixvim/illuminate.nix

@@ -0,0 +1,18 @@
+{ ... }:
+{
+
+  programs.nixvim.plugins = {
+    illuminate = {
+      enable = true;
+      underCursor = false;
+      filetypesDenylist = [
+        "Outline"
+        "TelescopePrompt"
+        "alpha"
+        "harpoon"
+        "reason"
+      ];
+    };
+  };
+
+}

modules/common/nixvim/lsp.nix

@@ -0,0 +1,80 @@
+{ ... }:
+{
+  programs.nixvim = {
+    plugins = {
+      lsp-lines = {enable = true;};
+      lsp-format = {enable = true;};
+      lsp = {
+        enable = true;
+        inlayHints = true;
+        servers = {
+      	  clangd = {enable = true;};
+          html = {enable = true;};
+          lua_ls = {enable = true;};
+	        nixd = {enable = true;};
+          pyright = {enable = true;};
+          gopls = {enable = true;};
+          jsonls = {enable = true;};
+      	  rust_analyzer = {
+            enable = true;
+            installCargo = true;
+            installRustc = true;
+          };
+          yamlls = {enable = true;};
+        };
+
+        keymaps = {
+          silent = true;
+          lspBuf = {
+            gd = {
+              action = "definition";
+              desc = "Goto Definition";
+            };
+            gr = {
+              action = "references";
+              desc = "Goto References";
+            };
+            gD = {
+              action = "declaration";
+              desc = "Goto Declaration";
+            };
+            gI = {
+              action = "implementation";
+              desc = "Goto Implementation";
+            };
+            gT = {
+              action = "type_definition";
+              desc = "Type Definition";
+            };
+            K = {
+              action = "hover";
+              desc = "Hover";
+            };
+            "<leader>cw" = {
+              action = "workspace_symbol";
+              desc = "Workspace Symbol";
+            };
+            "<leader>cr" = {
+              action = "rename";
+              desc = "Rename";
+            };
+          };
+          diagnostic = {
+            "<leader>cd" = {
+              action = "open_float";
+              desc = "Line Diagnostics";
+            };
+            "[d" = {
+              action = "goto_next";
+              desc = "Next Diagnostic";
+            };
+            "]d" = {
+              action = "goto_prev";
+              desc = "Previous Diagnostic";
+            };
+          };
+        };
+      };
+    };
+  };
+}

modules/common/nixvim/navic.nix

@@ -0,0 +1,42 @@
+{ ... }:
+{
+  programs.nixvim.plugins = {
+    navic = {
+      enable = true;
+      settings = {
+        separator = "  ";
+        highlight = true;
+        lsp = {
+          autoAttach = true;
+        };
+        icons = {
+          Array = "󱃵  ";
+          Boolean = "  ";
+          Class = "  ";
+          Constant = "  ";
+          Constructor = "  ";
+          Enum = " ";
+          EnumMember = " ";
+          Event = " ";
+          Field = "󰽏 ";
+          File = " ";
+          Function = "󰡱 ";
+          Interface = " ";
+          Key = "  ";
+          Method = " ";
+          Module = "󰕳 ";
+          Namespace = " ";
+          Null = "󰟢 ";
+          Number = " ";
+          Object = "  ";
+          Operator = " ";
+          Package = "󰏖 ";
+          String = " ";
+          Struct = " ";
+          TypeParameter = " ";
+          Variable = " ";
+        };
+      };
+    };
+  };
+}

modules/common/nixvim/neotree.nix

@@ -0,0 +1,42 @@
+{ ... }:
+{
+  programs.nixvim = {
+    plugins = {
+      neo-tree = {
+        enable = true;
+        sources = ["filesystem" "buffers" "git_status" "document_symbols"];
+        addBlankLineAtTop = false;
+
+        filesystem = {
+          bindToCwd = false;
+          followCurrentFile = {
+            enabled = true;
+          };
+        };
+
+        defaultComponentConfigs = {
+          indent = {
+            withExpanders = true;
+            expanderCollapsed = "󰅂";
+            expanderExpanded = "󰅀";
+            expanderHighlight = "NeoTreeExpander";
+          };
+
+          gitStatus = {
+            symbols = {
+              added = " ";
+              conflict = "󰩌 ";
+              deleted = "󱂥";
+              ignored = " ";
+              modified = " ";
+              renamed = "󰑕";
+              staged = "󰩍";
+              unstaged = "";
+              untracked = " ";
+            };
+          };
+	};
+      };
+    };
+  };
+}

modules/common/nixvim/settings.nix

@@ -0,0 +1,101 @@
+{ ... }:
+{
+
+  programs.nixvim = {
+    config = {
+      extraConfigLuaPre =
+        # lua
+        ''
+          vim.fn.sign_define("diagnosticsignerror", { text = " ", texthl = "diagnosticerror", linehl = "", numhl = "" })
+          vim.fn.sign_define("diagnosticsignwarn", { text = " ", texthl = "diagnosticwarn", linehl = "", numhl = "" })
+          vim.fn.sign_define("diagnosticsignhint", { text = "󰌵", texthl = "diagnostichint", linehl = "", numhl = "" })
+          vim.fn.sign_define("diagnosticsigninfo", { text = " ", texthl = "diagnosticinfo", linehl = "", numhl = "" })
+        '';
+
+      clipboard = {
+        providers.wl-copy.enable = true;
+      };
+
+      opts = {
+        # Show line numbers
+        number = true;
+
+        # Show relative line numbers
+        relativenumber = true;
+
+        # Use the system clipboard
+        clipboard = "unnamedplus";
+
+        # Number of spaces that represent a <TAB>
+        tabstop = 2;
+        softtabstop = 2;
+
+        # Show tabline always
+        showtabline = 2;
+
+        # Use spaces instead of tabs
+        expandtab = true;
+
+        # Enable smart indentation
+        smartindent = true;
+
+        # Number of spaces to use for each step of (auto)indent
+        shiftwidth = 2;
+
+        # Enable break indent
+        breakindent = true;
+
+        # Highlight the screen line of the cursor
+        cursorline = true;
+
+        # Minimum number of screen lines to keep above and below the cursor
+        scrolloff = 8;
+
+        # Enable mouse support
+        mouse = "a";
+
+        # Set folding method to manual
+        foldmethod = "manual";
+
+        # Disable folding by default
+        foldenable = false;
+
+        # Wrap long lines at a character in 'breakat'
+        linebreak = true;
+
+        # Disable spell checking
+        spell = false;
+
+        # Disable swap file creation
+        swapfile = false;
+
+        # Time in milliseconds to wait for a mapped sequence to complete
+        timeoutlen = 300;
+
+        # Enable 24-bit RGB color in the TUI
+        termguicolors = true;
+
+        # Don't show mode in the command line
+        showmode = false;
+
+        # Open new split below the current window
+        splitbelow = true;
+
+        # Keep the screen when splitting
+        splitkeep = "screen";
+
+        # Open new split to the right of the current window
+        splitright = true;
+
+        # Hide command line unless needed
+        cmdheight = 0;
+
+        # Remove EOB
+        fillchars = {
+          eob = " ";
+        };
+      };
+    };
+  };
+
+}

modules/common/nixvim/treesitter.nix

@@ -0,0 +1,13 @@
+{ ... }:
+{
+  programs.nixvim.plugins = {
+    treesitter = {
+      enable = true;
+      settings = {
+        indent.enable = true;
+        highlight.enable = true;
+      };
+    };
+  };
+
+}

modules/common/nixvim/whichkey.nix

@@ -0,0 +1,10 @@
+{ ... }:
+{  
+  
+  programs.nixvim.plugins = {
+    which-key = {
+      enable = true;
+    };
+  };
+
+}

modules/common/nixvim/yazi.nix

@@ -0,0 +1,10 @@
+{ ... }:
+{
+
+  programs.nixvim.plugins = {
+    yazi = {
+      enable = true;
+    };
+  };
+
+}

modules/common/packages.nix

@@ -0,0 +1,8 @@
+{ pkgs, ...}:
+{
+
+  environment.systemPackages = with pkgs; [
+    tealdeer
+  ];
+
+}

modules/common/stylix.nix

@@ -0,0 +1,33 @@
+{ pkgs, ... }:
+let
+  wallpaper = pkgs.fetchurl {
+    url = "https://files.huwe.mooo.com/Oneshot.png";
+    hash = "sha256-LaIzLCW86sbldE9lk7psbYKaTCjwaPLcoD3il6FalTw=";
+  };
+  plymouth_logo = pkgs.fetchurl {
+    url = "https://files.huwe.mooo.com/outlinenobackground.png";
+    hash = "sha256-HdErySgSwNSPEHyBywLyZCAss4vUhsY8BvCPe5hST6Q=";
+  };
+in
+{
+
+  stylix = {
+    enable = true;
+
+    autoEnable = true;
+
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/pasque.yaml";
+    override = {
+      base0D = "F3196E";
+      base0F = "CFAACF";
+    };
+
+    image = wallpaper;
+
+    polarity = "dark";
+
+    targets.plymouth.logo = plymouth_logo;
+    
+  };
+
+}

modules/common/users.nix

@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+{
+  users.users.willifan = {
+    isNormalUser = true;
+    description = "willifan";
+    extraGroups = [ "networkmanager" "wheel" "syncthing" ];
+    shell = pkgs.bash;
+  };
+
+}