Merge branch 'main' of https://git.thomasfmly.org/michael/nix-dots

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
@@ -72,6 +72,7 @@
   environment.systemPackages = with pkgs; [
     obs-studio
     kdenlive
+    inkscape
 
     virt-manager
     virtiofsd

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
     ];
   };

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
@@ -55,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

pkgs/nvim/config/languages/latex/default.nix

@@ -0,0 +1,6 @@
+{
+  plugins.vimtex = {
+    enable = true;
+    texlivePackage = null;
+  };
+}

pkgs/nvim/config/languages/treesitter/mdx.nix

@@ -4,13 +4,16 @@
   plugins.treesitter.languageRegister.markdown = ["mdx"];
 
   # Tree Sitter Grammar
-  extraFiles."queries/markdown/injections.scm" = ''
+  extraFiles."queries/markdown/injections.scm" = {
-    ; extends
+    enable = true;
-    ((inline) @injection.content
+    text = ''
-      (#lua-match? @injection.content "^%s*import")
+      ; extends
-      (#set! injection.language "typescript"))
+      ((inline) @injection.content
-    ((inline) @injection.content
+        (#lua-match? @injection.content "^%s*import")
-      (#lua-match? @injection.content "^%s*export")
+        (#set! injection.language "typescript"))
-      (#set! injection.language "typescript"))
+      ((inline) @injection.content
-  '';
+        (#lua-match? @injection.content "^%s*export")
+        (#set! injection.language "typescript"))
+    '';
+  };
 }

pkgs/nvim/config/lsp/lsp.nix

@@ -99,6 +99,8 @@
             };
           };
         };
+
+        dartls.enable = true;
       };
       # keymaps = {
       #   silent = true;

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
+      }
+    }
+  '';
+}

pkgs/nvim/config/utils/markdown-preview.nix

@@ -2,7 +2,7 @@
   plugins.markdown-preview = {
     enable = true;
     settings = {
-      browser = "floorp";
+      browser = "firefox";
       theme = "dark";
     };
   };

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 = {

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
       ];
     };
   };

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
 }