From b80a9583efa9ac951dae2b2a9548de33c99c67af Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Fri, 6 Sep 2024 14:14:03 -0400 Subject: [PATCH 1/9] fix(nvim/mdx): use updated extraFiles syntax --- pkgs/nvim/config/languages/treesitter/mdx.nix | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/nvim/config/languages/treesitter/mdx.nix b/pkgs/nvim/config/languages/treesitter/mdx.nix index 81c6a9e..4968c6d 100644 --- a/pkgs/nvim/config/languages/treesitter/mdx.nix +++ b/pkgs/nvim/config/languages/treesitter/mdx.nix @@ -4,13 +4,16 @@ plugins.treesitter.languageRegister.markdown = ["mdx"]; # Tree Sitter Grammar - extraFiles."queries/markdown/injections.scm" = '' - ; extends - ((inline) @injection.content - (#lua-match? @injection.content "^%s*import") - (#set! injection.language "typescript")) - ((inline) @injection.content - (#lua-match? @injection.content "^%s*export") - (#set! injection.language "typescript")) - ''; + extraFiles."queries/markdown/injections.scm" = { + enable = true; + text = '' + ; extends + ((inline) @injection.content + (#lua-match? @injection.content "^%s*import") + (#set! injection.language "typescript")) + ((inline) @injection.content + (#lua-match? @injection.content "^%s*export") + (#set! injection.language "typescript")) + ''; + }; } From a2654d7fdd9c811ec59c17fab505e808bb198406 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Fri, 6 Sep 2024 14:14:18 -0400 Subject: [PATCH 2/9] fix(markdown-preview): set default browser to firefox --- pkgs/nvim/config/utils/markdown-preview.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/nvim/config/utils/markdown-preview.nix b/pkgs/nvim/config/utils/markdown-preview.nix index 00df5e6..03a1a38 100644 --- a/pkgs/nvim/config/utils/markdown-preview.nix +++ b/pkgs/nvim/config/utils/markdown-preview.nix @@ -2,7 +2,7 @@ plugins.markdown-preview = { enable = true; settings = { - browser = "floorp"; + browser = "firefox"; theme = "dark"; }; }; From 64a8b8cde220f5e0739e053890e8a6f068b4cb51 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Fri, 6 Sep 2024 14:14:30 -0400 Subject: [PATCH 3/9] feat: add latex language support --- pkgs/nvim/config/default.nix | 1 + pkgs/nvim/config/languages/latex/default.nix | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 pkgs/nvim/config/languages/latex/default.nix diff --git a/pkgs/nvim/config/default.nix b/pkgs/nvim/config/default.nix index 822da56..2308d03 100644 --- a/pkgs/nvim/config/default.nix +++ b/pkgs/nvim/config/default.nix @@ -30,6 +30,7 @@ ./languages/treesitter/treesitter-textobjects.nix ./languages/treesitter/ts-autotag.nix ./languages/treesitter/ts-context-commentstring.nix + ./languages/latex ./lsp/conform.nix ./lsp/fidget.nix diff --git a/pkgs/nvim/config/languages/latex/default.nix b/pkgs/nvim/config/languages/latex/default.nix new file mode 100644 index 0000000..fe024da --- /dev/null +++ b/pkgs/nvim/config/languages/latex/default.nix @@ -0,0 +1,6 @@ +{ + plugins.vimtex = { + enable = true; + texlivePackage = null; + }; +} From 9716079bb9763d34fdc07182c15d22a9d85eef70 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Fri, 6 Sep 2024 14:15:01 -0400 Subject: [PATCH 4/9] refactor(mac): use nvim-custom for nvim --- user/environments/mac/home.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/user/environments/mac/home.nix b/user/environments/mac/home.nix index ce62093..cb09df3 100644 --- a/user/environments/mac/home.nix +++ b/user/environments/mac/home.nix @@ -9,8 +9,6 @@ ../../modules/git.nix ../../modules/fonts.nix ../../modules/latex.nix - ../../modules/nvim.nix - # ../../modules/sketchybar.nix ../../modules/vscode.nix ]; @@ -18,6 +16,7 @@ bitwarden-cli firebird-emu git-credential-oauth + nvim-custom ]; programs.zsh = { From 33e4d5b28b87e6bca98b3296370b8121d7b61013 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Sat, 7 Sep 2024 11:55:56 -0400 Subject: [PATCH 5/9] feat(nvim): add flutter development tools --- pkgs/nvim/config/default.nix | 1 + pkgs/nvim/config/lsp/lsp.nix | 2 ++ pkgs/nvim/config/utils/flutter-tools.nix | 11 +++++++++++ 3 files changed, 14 insertions(+) create mode 100644 pkgs/nvim/config/utils/flutter-tools.nix diff --git a/pkgs/nvim/config/default.nix b/pkgs/nvim/config/default.nix index 2308d03..4adf45a 100644 --- a/pkgs/nvim/config/default.nix +++ b/pkgs/nvim/config/default.nix @@ -56,6 +56,7 @@ # ./utils/better-escape.nix ./utils/flash.nix # better search labels + ./utils/flutter-tools.nix ./utils/hardtime.nix # hints to get better at vim # ./utils/harpoon.nix # better navigation between files & terminals ./utils/illuminate.nix # highlight other uses of current word diff --git a/pkgs/nvim/config/lsp/lsp.nix b/pkgs/nvim/config/lsp/lsp.nix index b89c90f..05b8236 100644 --- a/pkgs/nvim/config/lsp/lsp.nix +++ b/pkgs/nvim/config/lsp/lsp.nix @@ -99,6 +99,8 @@ }; }; }; + + dartls.enable = true; }; # keymaps = { # silent = true; diff --git a/pkgs/nvim/config/utils/flutter-tools.nix b/pkgs/nvim/config/utils/flutter-tools.nix new file mode 100644 index 0000000..12c31e9 --- /dev/null +++ b/pkgs/nvim/config/utils/flutter-tools.nix @@ -0,0 +1,11 @@ +{pkgs, ...}: { + extraPlugins = with pkgs.vimPlugins; [flutter-tools-nvim]; + + extraConfigLua = '' + require("flutter-tools").setup { + debugger = { + enabled = true + } + } + ''; +} From be818373d5ec75b8506e14b403dd19b84e7f8827 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Sat, 7 Sep 2024 11:56:13 -0400 Subject: [PATCH 6/9] fix(ags): move hyprpicker to general dependencies --- nixos/ags/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/ags/home.nix b/nixos/ags/home.nix index dc3f237..c2ffe95 100644 --- a/nixos/ags/home.nix +++ b/nixos/ags/home.nix @@ -28,7 +28,6 @@ in { wl-clipboard wayshot swappy - hyprpicker pavucontrol networkmanager gtk3 @@ -39,6 +38,7 @@ in { brightnessctl fd dart-sass + hyprpicker swww ]; }; From bee3f439db5118b3717aec19b90dcd9d62ef1361 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Sat, 7 Sep 2024 11:56:41 -0400 Subject: [PATCH 7/9] feat(machines/terra): add inkscape --- machines/terra/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/machines/terra/configuration.nix b/machines/terra/configuration.nix index ccbfe75..ad5244f 100644 --- a/machines/terra/configuration.nix +++ b/machines/terra/configuration.nix @@ -72,6 +72,7 @@ environment.systemPackages = with pkgs; [ obs-studio kdenlive + inkscape virt-manager virtiofsd From 15974e98d318895d09d4d47fcb8cf549bc2b04ed Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Sat, 7 Sep 2024 11:56:57 -0400 Subject: [PATCH 8/9] fix(machines/terra): add michael to networkmanager group --- machines/terra/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machines/terra/configuration.nix b/machines/terra/configuration.nix index ad5244f..0f74223 100644 --- a/machines/terra/configuration.nix +++ b/machines/terra/configuration.nix @@ -55,7 +55,7 @@ users.users.michael = { isNormalUser = true; description = "Michael Thomas"; - extraGroups = ["wheel" "docker" "podman" "adbusers" "dialout" "libvirtd"]; + extraGroups = ["wheel" "docker" "podman" "adbusers" "dialout" "libvirtd" "networkmanager"]; shell = pkgs.zsh; openssh.authorizedKeys.keys = [ # Neptune From 224b97e6aac2da98d23b05ab35f3dbcc25923ecd Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Mon, 9 Sep 2024 12:14:04 -0400 Subject: [PATCH 9/9] feat(vscode): add R packages & settings --- user/modules/vscode.nix | 6 ++- user/modules/vscode/settings.json | 79 +------------------------------ 2 files changed, 7 insertions(+), 78 deletions(-) diff --git a/user/modules/vscode.nix b/user/modules/vscode.nix index 0bf6137..640fa9e 100644 --- a/user/modules/vscode.nix +++ b/user/modules/vscode.nix @@ -3,7 +3,7 @@ pkgs, ... }: let - package = pkgs.vscodium; + package = pkgs.unstable.vscodium; vscodePname = package.pname; @@ -78,6 +78,10 @@ in { # Rust rust-lang.rust-analyzer + + # R + reditorsupport.r + quarto.quarto ]; }; }; diff --git a/user/modules/vscode/settings.json b/user/modules/vscode/settings.json index 2be1ef7..4903e86 100644 --- a/user/modules/vscode/settings.json +++ b/user/modules/vscode/settings.json @@ -10,7 +10,6 @@ }, "editor.lineHeight": 20, "editor.suggestSelection": "first", - "vsintellicode.modify.editor.suggestSelection": "automaticallyOverrodeDefaultValue", "files.exclude": { "**/.classpath": true, "**/.project": true, @@ -18,80 +17,6 @@ "**/.factorypath": true }, "explorer.confirmDragAndDrop": false, - "intelephense.stubs": [ - "apache", - "bcmath", - "bz2", - "calendar", - "com_dotnet", - "Core", - "ctype", - "curl", - "date", - "dba", - "dom", - "enchant", - "exif", - "FFI", - "fileinfo", - "filter", - "fpm", - "ftp", - "gd", - "gettext", - "gmp", - "hash", - "iconv", - "imap", - "intl", - "json", - "ldap", - "libxml", - "mbstring", - "meta", - "mysqli", - "oci8", - "odbc", - "openssl", - "pcntl", - "pcre", - "PDO", - "pdo_ibm", - "pdo_mysql", - "pdo_pgsql", - "pdo_sqlite", - "pgsql", - "Phar", - "posix", - "pspell", - "readline", - "Reflection", - "session", - "shmop", - "SimpleXML", - "snmp", - "soap", - "sockets", - "sodium", - "SPL", - "sqlite3", - "standard", - "superglobals", - "sysvmsg", - "sysvsem", - "sysvshm", - "tidy", - "tokenizer", - "xml", - "xmlreader", - "xmlrpc", - "xmlwriter", - "xsl", - "Zend OPcache", - "zip", - "zlib", - "wordpress" - ], "terminal.integrated.fontFamily": "'CaskaydiaCove Nerd Font Mono', 'Cascadia Mono PL'", "terminal.integrated.fontSize": 13, "[javascript]": { @@ -104,7 +29,6 @@ "editor.defaultFormatter": "esbenp.prettier-vscode" }, "svelte.enable-ts-plugin": true, - "svelte.plugin.svelte.note-new-transformation": false, "editor.accessibilitySupport": "off", "editor.smoothScrolling": true, "workbench.list.smoothScrolling": true, @@ -159,5 +83,6 @@ "nix.enableLanguageServer": true, "nix.serverPath": "nil", "cSpell.userWords": ["typecheck"], - "workbench.colorTheme": "Min Dark" + "workbench.colorTheme": "Min Dark", + "r.plot.useHttpgd": true }