Merge d109900df8 into bb45c9458a

- Move dotnet to Brew
- Move Slack to brew
- Install nss (for ddev certs in Firefox)
- Install orbstack

dmitmel-dotfiles

@@ -1 +1 @@
-Subproject commit 5ce901957503313358dcc9b5a0659588aae811d8
+Subproject commit 00dbd710649422530ae2f14601d99394f9f38753

nix/flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700795494,
+        "lastModified": 1704277720,
-        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
+        "narHash": "sha256-meAKNgmh3goankLGWqqpw73pm9IvXjEENJloF0coskE=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
+        "rev": "0dd382b70c351f528561f71a0a7df82c9d2be9a4",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     "dotfiles": {
       "flake": false,
       "locked": {
-        "lastModified": 1698960542,
+        "lastModified": 1702297498,
-        "narHash": "sha256-prp6oSZ8/WaX4wtZ5eT5CDKDRBAFcMSiJg5S0vSOCmg=",
+        "narHash": "sha256-wBeX8mOuPwXzHmPSTwcafa3ioV1r1biBaM4Pz9TQezw=",
         "ref": "refs/heads/master",
-        "rev": "ed7352b8353dbf36d27be4df6c16326869eb5026",
+        "rev": "be29a97b84dbb54e125dac19df3478464b7f76ca",
-        "revCount": 449,
+        "revCount": 456,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/keanuplayz/dotfiles"
@@ -45,11 +45,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700392168,
+        "lastModified": 1702195668,
-        "narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=",
+        "narHash": "sha256-Lxmjez0nfNBptdqV5GsXKm7Bb7swjGsrxiLxWJu0tL8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e",
+        "rev": "33110fb3c7fe6a94b98b641866a5eddb64b7c23f",
         "type": "github"
       },
       "original": {
@@ -61,11 +61,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1700854570,
+        "lastModified": 1705033721,
-        "narHash": "sha256-GiwMS5sWSgF/CyZYbm+G5EcgG1VOEyvcsP5lE1L97Aw=",
+        "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cbd3f3722ac41a200c1655141e021cf12c3ba4e6",
+        "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea",
         "type": "github"
       },
       "original": {

nix/flake.nix

@@ -20,7 +20,7 @@
   outputs = { self, nixpkgs, home-manager, dotfiles, darwin }: {
     darwinConfigurations."alymac" = darwin.lib.darwinSystem {
       system = "x86_64-darwin";
-      specialArgs = { inherit dotfiles; };
+      specialArgs = { inherit self; inherit dotfiles; };
       modules = [
         home-manager.darwinModules.home-manager
         ./hosts/alymac/default.nix

nix/hosts/alymac/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, dotfiles, ... }:
+{ self, pkgs, lib, dotfiles, ... }:
 
 with lib;
 let
@@ -54,7 +54,6 @@ let
       dhall
       dhall-json
       dhall-lsp-server
-      dotnet-sdk_8
       go
       jdk
       kotlin
@@ -71,7 +70,6 @@ let
 
     programs = [
       rectangle
-      slack
       tailscale
     ];
 
@@ -81,6 +79,7 @@ let
 
     fonts = [
       nerdfonts
+      ibm-plex
     ];
 
     python = with python311Packages; [
@@ -179,7 +178,7 @@ in
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    extraSpecialArgs = { inherit dotfiles; };
+    extraSpecialArgs = { inherit self; inherit dotfiles; };
     users.alyxia = { pkgs, ... }: {
       # Defined further above, generates a list of files to import.
       imports = validFiles ./.;
@@ -211,7 +210,6 @@ in
 
     taps = [
       "drud/ddev"
-      "homebrew/cask"
       "homebrew/cask-versions"
       "int128/kubelogin"
     ];
@@ -222,11 +220,17 @@ in
       "composer"
       "croc"
       "ddev"
+      "deno"
+      "dotnet"
+      "ferium"
       "gradle"
       "kubelogin"
       "mkcert"
+      "nss"
       "pinentry-mac"
       "pkg-config"
+      "poetry"
+      "rustup"
       "sdl2"
 
       # Fyra crap, but from Homebrew because someone doesn't know how to
@@ -259,7 +263,9 @@ in
       "itch"
       "iterm2"
       "lens"
+      "minecraft"
       "obs"
+      "orbstack"
       "phpstorm"
       "plexamp"
       "raycast"
@@ -267,6 +273,7 @@ in
       "rubymine"
       "sequel-ace"
       "shottr"
+      "slack"
       "spotify"
       "steam"
       "texifier"

nix/hosts/alymac/nvim.nix

@@ -1,11 +1,11 @@
-{ pkgs, dotfiles, ... }:
+{ self, pkgs, ... }:
 
 {
   programs.neovim = {
     enable = true;
     package = pkgs.neovim-unwrapped;
 
-    extraConfig = "source ${dotfiles}/nvim/init.vim";
+    extraConfig = ''source ~/.dotfiles/nvim/init.vim"source ${self}/nvim/init.vim'';
 
     coc = {
       enable = true;
@@ -17,13 +17,20 @@
             filetypes = [ "nix" ];
             rootPatterns = [ "flake.nix" ];
             "settings.nil" = {
-              "formatting.command" = ["nixpkgs-fmt"];
+              "formatting.command" = [ "nixpkgs-fmt" ];
             };
           };
           "go.goPlsOptions" = {
             completion = true;
             completeUnimported = true;
           };
+          rescript = {
+            enable = true;
+            command = "rescript-language-server";
+            args = [ "--node-ipc" ];
+            filetypes = [ "rescript" ];
+            rootPatterns = [ "rescript.json" "bsconfig.json" ];
+          };
         };
       };
     };

nix/hosts/alymac/zsh.nix

@@ -1,11 +1,12 @@
-{ dotfiles, ... }:
+{ self, ... }:
 
 {
   programs.zsh = {
     enable = true;
     initExtra = ''
       export GPG_TTY=$(tty)
-      source ${dotfiles}/zsh/zshrc
+      source ~/.dotfiles/zsh/zshrc #source ${self}/zsh/zshrc
+      source "$HOME/.cargo/env"
 
       [[ -d "$HOME/.local/bin" ]] || mkdir "$HOME/.local/bin"
 

nvim/dotfiles/plugins-list.vim

@@ -46,6 +46,7 @@ let s:plug = funcref('dotfiles#plugman#register')
     call s:plug('tpope/vim-projectionist')
     call s:plug('tpope/vim-dispatch')
   " }}}
+  call s:plug('rescript-lang/vim-rescript')
 " }}}
 
 " coc {{{

script-resources/markdown2htmldoc/yarn.lock

@@ -815,7 +815,7 @@ prettier@^2.4.1:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.4.tgz#34dd2595629bfbb79d344ac4a91ff948694463c3"
   integrity sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw==
 
-prismjs@^1.25.0:
+prismjs@^1.29.0:
   version "1.29.0"
   resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.29.0.tgz#f113555a8fa9b57c35e637bba27509dcf802dd12"
   integrity sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==
@@ -1020,9 +1020,9 @@ which@^2.0.1:
     isexe "^2.0.0"
 
 word-wrap@^1.2.3:
-  version "1.2.3"
+  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+  integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==
 
 wrappy@1:
   version "1.0.2"