diff --git a/flake.lock b/flake.lock index 356fe13..26d8ffe 100644 --- a/flake.lock +++ b/flake.lock @@ -239,11 +239,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -257,11 +257,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -290,25 +290,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { - "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1705309234, @@ -324,9 +306,9 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1710146030, @@ -342,9 +324,9 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_6": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1705309234, @@ -360,21 +342,6 @@ "type": "github" } }, - "flakey-profile": { - "locked": { - "lastModified": 1712898590, - "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", - "owner": "lf-", - "repo": "flakey-profile", - "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", - "type": "github" - }, - "original": { - "owner": "lf-", - "repo": "flakey-profile", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -547,48 +514,13 @@ "url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in" } }, - "lix": { - "flake": false, - "locked": { - "lastModified": 1746827285, - "narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=", - "rev": "47aad376c87e2e65967f17099277428e4b3f8e5a", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz" - } - }, - "lix-module": { - "inputs": { - "flake-utils": "flake-utils", - "flakey-profile": "flakey-profile", - "lix": "lix", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1746838955, - "narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=", - "rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz" - } - }, "mnw": { "locked": { - "lastModified": 1747499976, - "narHash": "sha256-YTiSI4WLbk0CleXeBheYmKZV6iqKyBpyoh1e+vcQzu4=", + "lastModified": 1748278309, + "narHash": "sha256-JCeiMrUhFku44kfKsgiD9Ibzho4MblBD2WmOQYsQyTY=", "owner": "Gerg-L", "repo": "mnw", - "rev": "72433a144c4ac16931e9148f78db4a0e4c147441", + "rev": "486a17ba1279ab2357cae8ff66b309db622f8831", "type": "github" }, "original": { @@ -599,7 +531,7 @@ }, "moonlight": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] @@ -686,7 +618,7 @@ }, "nix-options-search": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "gitignore": "gitignore", "nixpkgs": "nixpkgs" }, @@ -850,20 +782,20 @@ "nvf": { "inputs": { "flake-parts": "flake-parts", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "mnw": "mnw", "nil": "nil", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_5" + "systems": "systems_4" }, "locked": { - "lastModified": 1747525582, - "narHash": "sha256-oEZ6DV4bPcNZIuwW5Kcd+/zT3PMkXse2kX/3jHoomGk=", + "lastModified": 1748318168, + "narHash": "sha256-pUDVxHarStrDYxd2tztz4SjNflzFxuMMEC3SK9WLUK8=", "owner": "notashelf", "repo": "nvf", - "rev": "d3a0e7029ac57eef1120225973247851c5b967b5", + "rev": "74ba4d955976af1422ea1f095968e547db70aa04", "type": "github" }, "original": { @@ -889,7 +821,6 @@ "apple-fonts": "apple-fonts", "darwin": "darwin", "home-manager": "home-manager", - "lix-module": "lix-module", "moonlight": "moonlight", "nh": "nh", "nix-index-database": "nix-index-database", @@ -1066,7 +997,7 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems_6", + "systems": "systems_5", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1207,21 +1138,6 @@ "type": "github" } }, - "systems_9": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -1328,7 +1244,7 @@ "zig": { "inputs": { "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_3" }, "locked": { @@ -1348,7 +1264,7 @@ "zig-overlay": { "inputs": { "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_6", "nixpkgs": [ "zls", "nixpkgs" @@ -1370,7 +1286,7 @@ }, "zls": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "gitignore": "gitignore_3", "langref": "langref", "nixpkgs": "nixpkgs_4", diff --git a/flake.nix b/flake.nix index 7e5975a..2cab174 100644 --- a/flake.nix +++ b/flake.nix @@ -3,10 +3,10 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; - lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # lix-module = { + # url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; @@ -47,7 +47,7 @@ { self, nixpkgs, - lix-module, + # lix-module, nixos-cosmic, darwin, ... @@ -97,7 +97,7 @@ inherit overlays nixpkgs - lix-module + # lix-module inputs mkNeovim ; diff --git a/lib/mkSystem.nix b/lib/mkSystem.nix index ab0ef67..2849527 100644 --- a/lib/mkSystem.nix +++ b/lib/mkSystem.nix @@ -2,7 +2,7 @@ # particular architecture. { nixpkgs, - lix-module, + # lix-module, overlays, inputs, mkNeovim, @@ -89,7 +89,7 @@ systemFunc { # Use lix (alternative nix implementation) # https://lix.systems/add-to-config/#flake-based-configurations - lix-module.nixosModules.default + # lix-module.nixosModules.default # (getInputModule "lix-module" "default") # Modules shared between nix-darwin and NixOS diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix index 355a395..9ae17b0 100644 --- a/modules/neovim/default.nix +++ b/modules/neovim/default.nix @@ -3,7 +3,8 @@ lib, host, ... -}: { +}: +{ # based on default options from upstream: # https://github.com/NotAShelf/nvf/blob/main/configuration.nix # @@ -108,7 +109,7 @@ explorer.replace_netrw = true; dashboard = { sections = [ - {section = "header";} + { section = "header"; } { icon = " "; title = "Keymaps"; @@ -132,12 +133,15 @@ } ]; }; - image.enable = true; + image = { + enable = true; + math.enabled = false; + }; notifier.timeout = 3000; picker = { enable = true; sources = { - explorer = {}; + explorer = { }; }; }; }; diff --git a/users/natalie/laptop/home.nix b/users/natalie/laptop/home.nix index 4c981e9..698a10d 100644 --- a/users/natalie/laptop/home.nix +++ b/users/natalie/laptop/home.nix @@ -15,5 +15,10 @@ sessionPath = [ "$HOME/.emacs.d/bin" ]; + + packages = with pkgs; [ + #PDF viewer for VimTeX + skimpdf + ]; }; } diff --git a/users/natalie/packages.nix b/users/natalie/packages.nix index 7195aa8..c555a66 100644 --- a/users/natalie/packages.nix +++ b/users/natalie/packages.nix @@ -1,6 +1,7 @@ # Packages installed with home-manager -{pkgs, ...}: -with pkgs; [ +{ pkgs, ... }: +with pkgs; +[ #general development just pkg-config @@ -35,7 +36,7 @@ with pkgs; [ nh #terminal stuff - (btop.override {cudaSupport = true;}) + (btop.override { cudaSupport = true; }) tmux zellij lazygit @@ -62,15 +63,9 @@ with pkgs; [ #media spotify - zathura #language servers typst-live - lua-language-server - nil - nixd - texlab - texlivePackages.chktex #formatters/linters stylua @@ -79,14 +74,10 @@ with pkgs; [ #neovim deps # TODO: from clo, maybe u can remove all of these? i don't wanna break tho - lua51Packages.lua - lua51Packages.luarocks-nix - codespell tree-sitter - + zathura #python pyright - basedpyright ruff python312Packages.python python312Packages.pynvim @@ -107,7 +98,6 @@ with pkgs; [ #math texlive.combined.scheme-full - zathura #fun things cowsay diff --git a/users/natalie/user.nix b/users/natalie/user.nix index 9c90a82..3eeea53 100644 --- a/users/natalie/user.nix +++ b/users/natalie/user.nix @@ -3,7 +3,7 @@ rec { name = "Natalie"; # name/identifier email = "nmarks413@gmail.com"; # email (used for certain configurations) dotfilesDir = "~/.dotfiles"; # absolute path of the local repo - theme = "catppuccin-mocha"; # name of theme that stylix will use + theme = null; # name of theme that stylix will use browser = "firefox"; # Default browser; must select one from ./user/app/browser/ term = "ghostty"; # Default terminal command; font = "iosevka"; # Selected font diff --git a/users/natalie/vim.nix b/users/natalie/vim.nix index 563c715..c1427ee 100644 --- a/users/natalie/vim.nix +++ b/users/natalie/vim.nix @@ -39,12 +39,24 @@ tabline = { nvimBufferline.enable = true; }; - + # nvf versions is VERY outdated + # pluginOverrides = { + # hardtime-nvim = pkgs.fetchFromGitHub { + # owner = "m4xshen"; + # repo = "hardtime.nvim"; + # rev = "v1.0.1"; + # hash = "sha256-5tqiSuGvBJcr8l6anEBojXEaaxFS1P5T1ROr46ylVhk="; + # }; + # }; + startPlugins = [ + "nui-nvim" + ]; binds = { hardtime-nvim = { enable = true; setupOpts = { - restriction_mode = "block"; + disable_mouse = false; + restriction_mode = "warn"; }; }; }; diff --git a/users/natalie/vim/languages.nix b/users/natalie/vim/languages.nix index f35d571..077a138 100644 --- a/users/natalie/vim/languages.nix +++ b/users/natalie/vim/languages.nix @@ -110,6 +110,12 @@ in tex = [ "chktex" ]; haskell = [ "hlint" ]; }; + + linters = { + chktex = { + ignore_exitcode = true; + }; + }; }; }; treesitter = { diff --git a/users/natalie/vim/latex.nix b/users/natalie/vim/latex.nix index b38cace..b58c340 100644 --- a/users/natalie/vim/latex.nix +++ b/users/natalie/vim/latex.nix @@ -1,22 +1,29 @@ -{pkgs, ...}: { +{ pkgs, host, ... }: +{ vim = { + lazy.plugins.cmp-vimtex = { + enabled = true; + package = pkgs.vimPlugins.cmp-vimtex; + lazy = false; + + }; lazy.plugins.vimtex = { enabled = true; package = pkgs.vimPlugins.vimtex; - lazy = true; - ft = "tex"; + lazy = false; }; globals = { tex_flavor = "latex"; maplocalleader = "\\"; vimtex_compiler_method = "latexmk"; - vimtex_view_method = "zathura"; + vimtex_view_method = if host.darwin then "skim" else "zathura"; + vimtex_view_automatic = 1; vimtex_compiler_latexmk = { callback = 1; continuous = 1; executable = "latexmk"; - hooks = []; + hooks = [ ]; options = [ "-verbose" "-file-line-error" @@ -37,12 +44,65 @@ ]; }; + autocomplete.blink-cmp = { + sourcePlugins = { + "blink.compat" = { + enable = true; + package = "blink-compat"; + module = "blink.compat.source"; + }; + }; + setupOpts = { + sources = { + default = [ "vimtex" ]; + providers = { + vimtex = { + name = "vimtex"; + module = "blink.compat.source"; + score_offset = 100; + }; + }; + }; + }; + }; + + augroups = [ + { + name = "VimTeX Events"; + } + ]; + autocmds = [ + { + pattern = [ "VimtexEventViewReverse" ]; + event = [ "User" ]; + desc = "Return to nvim after reverse search"; + command = "call b:vimtex.viewer.xdo_focus_vim()"; + group = "VimTeX Events"; + } + { + pattern = [ "VimtexEventQuit" ]; + event = [ "User" ]; + desc = "Close pdf after exiting nvim"; + command = "VimtexClean"; + group = "VimTeX Events"; + } + + { + pattern = [ "VimtexEventInitPost" ]; + event = [ "User" ]; + desc = "Start compiling when opening nvim to a tex file"; + command = "VimtexCompile"; + group = "VimTeX Events"; + } + + ]; + lsp = { servers = { texlab = { enable = true; - cmd = ["${pkgs.texlab}/bin/texlab"]; - filetypes = ["tex"]; + cmd = [ "${pkgs.texlab}/bin/texlab" ]; + filetypes = [ "tex" ]; }; }; };