From 16f10fa7c5f6195cd0f2fe58cc1045e1b4cc1366 Mon Sep 17 00:00:00 2001 From: sam Date: Fri, 9 Jan 2026 20:04:11 +1100 Subject: [PATCH] Disable avante; fix treesitter config --- README.md | 0 flake.lock | 49 +++++++++++++++++++ flake.nix | 0 home/sam/home.nix | 38 +++++++++----- home/sam/hypr/hyprland.conf | 0 home/sam/nvim/init.lua | 0 home/sam/nvim/lazy-lock.json | 0 home/sam/nvim/lua/current-theme.lua | 0 home/sam/nvim/lua/sam/lazy.lua | 16 +++--- home/sam/nvim/lua/sam/options.lua | 0 home/sam/nvim/lua/sam/plugins/autopairs.lua | 0 .../{avante.lua => avante.lua.disabled} | 0 home/sam/nvim/lua/sam/plugins/cmp.lua | 0 home/sam/nvim/lua/sam/plugins/colorscheme.lua | 0 home/sam/nvim/lua/sam/plugins/comment.lua | 0 home/sam/nvim/lua/sam/plugins/dap.lua | 0 home/sam/nvim/lua/sam/plugins/filetree.lua | 0 home/sam/nvim/lua/sam/plugins/formatter.lua | 0 home/sam/nvim/lua/sam/plugins/gitsigns.lua | 0 home/sam/nvim/lua/sam/plugins/icons.lua | 0 home/sam/nvim/lua/sam/plugins/lint.lua | 0 home/sam/nvim/lua/sam/plugins/lsp.lua | 0 home/sam/nvim/lua/sam/plugins/lualine.lua | 0 home/sam/nvim/lua/sam/plugins/markdown.lua | 0 home/sam/nvim/lua/sam/plugins/mason-tools.lua | 0 .../nvim/lua/sam/plugins/telescope-addons.lua | 0 home/sam/nvim/lua/sam/plugins/telescope.lua | 0 .../nvim/lua/sam/plugins/theme-catppuccin.lua | 0 .../nvim/lua/sam/plugins/theme-dracula.lua | 0 .../nvim/lua/sam/plugins/theme-everforest.lua | 0 .../nvim/lua/sam/plugins/theme-gruvbox.lua | 0 .../nvim/lua/sam/plugins/theme-kanagawa.lua | 0 .../nvim/lua/sam/plugins/theme-onedark.lua | 0 .../nvim/lua/sam/plugins/theme-tokyonight.lua | 0 home/sam/nvim/lua/sam/plugins/treesitter.lua | 29 ++++++----- home/sam/nvim/lua/sam/plugins/vimtex.lua | 0 home/sam/nvim/lua/sam/plugins/which-key.lua | 0 hosts/aspire-laptop/configuration.nix | 31 +++++++++--- 38 files changed, 123 insertions(+), 40 deletions(-) mode change 100644 => 100755 README.md create mode 100755 flake.lock mode change 100644 => 100755 flake.nix mode change 100644 => 100755 home/sam/home.nix mode change 100644 => 100755 home/sam/hypr/hyprland.conf mode change 100644 => 100755 home/sam/nvim/init.lua mode change 100644 => 100755 home/sam/nvim/lazy-lock.json mode change 100644 => 100755 home/sam/nvim/lua/current-theme.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/lazy.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/options.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/plugins/autopairs.lua rename home/sam/nvim/lua/sam/plugins/{avante.lua => avante.lua.disabled} (100%) mode change 100644 => 100755 mode change 100644 => 100755 home/sam/nvim/lua/sam/plugins/cmp.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/plugins/colorscheme.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/plugins/comment.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/plugins/dap.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/plugins/filetree.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/plugins/formatter.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/plugins/gitsigns.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/plugins/icons.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/plugins/lint.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/plugins/lsp.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/plugins/lualine.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/plugins/markdown.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/plugins/mason-tools.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/plugins/telescope-addons.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/plugins/telescope.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/plugins/theme-catppuccin.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/plugins/theme-dracula.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/plugins/theme-everforest.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/plugins/theme-gruvbox.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/plugins/theme-kanagawa.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/plugins/theme-onedark.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/plugins/theme-tokyonight.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/plugins/treesitter.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/plugins/vimtex.lua mode change 100644 => 100755 home/sam/nvim/lua/sam/plugins/which-key.lua mode change 100644 => 100755 hosts/aspire-laptop/configuration.nix diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/flake.lock b/flake.lock new file mode 100755 index 0000000..d3ed0d7 --- /dev/null +++ b/flake.lock @@ -0,0 +1,49 @@ +{ + "nodes": { + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1767619900, + "narHash": "sha256-KpoCBPvwHz3gAQtIUkohE2InRBFK3r0/FM6z5SPWfvM=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "6bd04da47cfb48dfd15eabf08364b78ad894f5b2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-25.11", + "repo": "home-manager", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1767480499, + "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "home-manager": "home-manager", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix old mode 100644 new mode 100755 diff --git a/home/sam/home.nix b/home/sam/home.nix old mode 100644 new mode 100755 index 76277de..d010691 --- a/home/sam/home.nix +++ b/home/sam/home.nix @@ -34,26 +34,40 @@ enableZshIntegration = true; }; + + programs.zellij = { + enable = true; + enableZshIntegration = true; + }; + programs.atuin = { enable = true; enableZshIntegration = true; }; programs.kitty.enable = true; - - programs.git.enable = true; + programs.git = { + enable = true; + userName = "sam"; + userEmail = "samuelrolfe@gmail.com"; + }; programs.gh.enable = true; - # Neovim Option 1: keep your config + lazy.nvim (downloads plugins), - # but Nix provides all the runtime deps (node/python/rg/fd/etc). - programs.neovim = { - enable = true; - viAlias = true; - vimAlias = true; - withNodeJs = true; - withPython3 = true; - }; +programs.neovim = { + enable = true; + viAlias = true; + vimAlias = true; + withNodeJs = true; + withPython3 = true; +}; + + + + + # Link the config, recursive ensures it is readable + xdg.configFile."nvim/init.lua".source = ./nvim/init.lua; + xdg.configFile."nvim/lua".source = ./nvim/lua; home.packages = with pkgs; [ nodejs python3 @@ -67,6 +81,4 @@ # Hyprland minimal config so it is usable immediately xdg.configFile."hypr/hyprland.conf".source = ./../sam/hypr/hyprland.conf; - # Neovim config stored in this repo - xdg.configFile."nvim".source = ./nvim; } diff --git a/home/sam/hypr/hyprland.conf b/home/sam/hypr/hyprland.conf old mode 100644 new mode 100755 diff --git a/home/sam/nvim/init.lua b/home/sam/nvim/init.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lazy-lock.json b/home/sam/nvim/lazy-lock.json old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/current-theme.lua b/home/sam/nvim/lua/current-theme.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/sam/lazy.lua b/home/sam/nvim/lua/sam/lazy.lua old mode 100644 new mode 100755 index 06d8209..738036e --- a/home/sam/nvim/lua/sam/lazy.lua +++ b/home/sam/nvim/lua/sam/lazy.lua @@ -1,17 +1,21 @@ --- ~/.config/nvim/lua/sam/lazy.lua - local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not vim.loop.fs_stat(lazypath) then +if not vim.uv.fs_stat(lazypath) then vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", - "--branch=stable", -- latest stable release + "--branch=stable", lazypath, }) end + vim.opt.rtp:prepend(lazypath) --- Tell lazy to load our plugin specs from the "plugins" directory -require("lazy").setup("sam.plugins", {}) +require("lazy").setup("sam.plugins", { + -- Force plugin installation on new machines: + install = { missing = true }, + + -- Put lockfile somewhere writable: + lockfile = vim.fn.stdpath("data") .. "/lazy-lock.json", +}) diff --git a/home/sam/nvim/lua/sam/options.lua b/home/sam/nvim/lua/sam/options.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/sam/plugins/autopairs.lua b/home/sam/nvim/lua/sam/plugins/autopairs.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/sam/plugins/avante.lua b/home/sam/nvim/lua/sam/plugins/avante.lua.disabled old mode 100644 new mode 100755 similarity index 100% rename from home/sam/nvim/lua/sam/plugins/avante.lua rename to home/sam/nvim/lua/sam/plugins/avante.lua.disabled diff --git a/home/sam/nvim/lua/sam/plugins/cmp.lua b/home/sam/nvim/lua/sam/plugins/cmp.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/sam/plugins/colorscheme.lua b/home/sam/nvim/lua/sam/plugins/colorscheme.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/sam/plugins/comment.lua b/home/sam/nvim/lua/sam/plugins/comment.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/sam/plugins/dap.lua b/home/sam/nvim/lua/sam/plugins/dap.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/sam/plugins/filetree.lua b/home/sam/nvim/lua/sam/plugins/filetree.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/sam/plugins/formatter.lua b/home/sam/nvim/lua/sam/plugins/formatter.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/sam/plugins/gitsigns.lua b/home/sam/nvim/lua/sam/plugins/gitsigns.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/sam/plugins/icons.lua b/home/sam/nvim/lua/sam/plugins/icons.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/sam/plugins/lint.lua b/home/sam/nvim/lua/sam/plugins/lint.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/sam/plugins/lsp.lua b/home/sam/nvim/lua/sam/plugins/lsp.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/sam/plugins/lualine.lua b/home/sam/nvim/lua/sam/plugins/lualine.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/sam/plugins/markdown.lua b/home/sam/nvim/lua/sam/plugins/markdown.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/sam/plugins/mason-tools.lua b/home/sam/nvim/lua/sam/plugins/mason-tools.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/sam/plugins/telescope-addons.lua b/home/sam/nvim/lua/sam/plugins/telescope-addons.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/sam/plugins/telescope.lua b/home/sam/nvim/lua/sam/plugins/telescope.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/sam/plugins/theme-catppuccin.lua b/home/sam/nvim/lua/sam/plugins/theme-catppuccin.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/sam/plugins/theme-dracula.lua b/home/sam/nvim/lua/sam/plugins/theme-dracula.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/sam/plugins/theme-everforest.lua b/home/sam/nvim/lua/sam/plugins/theme-everforest.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/sam/plugins/theme-gruvbox.lua b/home/sam/nvim/lua/sam/plugins/theme-gruvbox.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/sam/plugins/theme-kanagawa.lua b/home/sam/nvim/lua/sam/plugins/theme-kanagawa.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/sam/plugins/theme-onedark.lua b/home/sam/nvim/lua/sam/plugins/theme-onedark.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/sam/plugins/theme-tokyonight.lua b/home/sam/nvim/lua/sam/plugins/theme-tokyonight.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/sam/plugins/treesitter.lua b/home/sam/nvim/lua/sam/plugins/treesitter.lua old mode 100644 new mode 100755 index da46026..1096955 --- a/home/sam/nvim/lua/sam/plugins/treesitter.lua +++ b/home/sam/nvim/lua/sam/plugins/treesitter.lua @@ -1,11 +1,21 @@ --- ~/.config/nvim/lua/sam/plugins/treesitter.lua - return { "nvim-treesitter/nvim-treesitter", - build = ":TSUpdate", -- Installs and updates parsers + build = ":TSUpdate", config = function() - require("nvim-treesitter.configs").setup({ - -- A list of parser names, or "all" + -- treesitter renamed configs -> config in newer versions + local ok, ts = pcall(require, "nvim-treesitter.config") + if not ok then + ok, ts = pcall(require, "nvim-treesitter.configs") + end + if not ok then + vim.notify( + "nvim-treesitter: config module not found", + vim.log.levels.ERROR + ) + return + end + + ts.setup({ ensure_installed = { "c", "cpp", @@ -21,16 +31,9 @@ return { "json", "php", }, - - -- Install parsers synchronously (only applied on startup) sync_install = false, - - -- Automatically install missing parsers when entering buffer auto_install = true, - - highlight = { - enable = true, - }, + highlight = { enable = true }, }) end, } diff --git a/home/sam/nvim/lua/sam/plugins/vimtex.lua b/home/sam/nvim/lua/sam/plugins/vimtex.lua old mode 100644 new mode 100755 diff --git a/home/sam/nvim/lua/sam/plugins/which-key.lua b/home/sam/nvim/lua/sam/plugins/which-key.lua old mode 100644 new mode 100755 diff --git a/hosts/aspire-laptop/configuration.nix b/hosts/aspire-laptop/configuration.nix old mode 100644 new mode 100755 index a920ef1..29b9eb2 --- a/hosts/aspire-laptop/configuration.nix +++ b/hosts/aspire-laptop/configuration.nix @@ -1,10 +1,13 @@ { pkgs, ... }: - +let + tex = pkgs.texlive.combine { + inherit (pkgs.texlive) scheme-small latexmk; + }; +in { imports = [ ./hardware-configuration.nix - ]; - + ]; nixpkgs.config.allowUnfree = true; nix.settings.experimental-features = [ @@ -14,6 +17,8 @@ networking.hostName = "aspire-laptop"; networking.networkmanager.enable = true; +networking.nameservers = [ "1.1.1.1" "8.8.8.8" ]; + time.timeZone = "Australia/Melbourne"; i18n.defaultLocale = "en_AU.UTF-8"; @@ -34,12 +39,23 @@ xdg.portal.extraPortals = with pkgs; [ xdg-desktop-portal-hyprland xdg-desktop-portal-gtk - xdg-desktop-portal-kde + pkgs.kdePackages.xdg-desktop-portal-kde ]; security.polkit.enable = true; programs.dconf.enable = true; + services.openssh = { + enable = true; + openFirewall = true; + + settings = { + PasswordAuthentication = true; + KbdInteractiveAuthentication = false; + PermitRootLogin = "no"; + }; + }; + services.libinput.enable = true; services.pipewire.enable = true; @@ -116,16 +132,15 @@ # Markdown / LaTeX (small) pandoc - texlive.combined.scheme-small - latexmk + tex zathura - zathura-pdf-mupdf + zathuraPkgs.zathura_pdf_mupdf ]; boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; boot.loader.systemd-boot.configurationLimit = 20; - + boot.loader.efi.efiSysMountPoint="/boot/efi"; networking.firewall.enable = true; system.stateVersion = "25.11";