Merge pull request 'updates and cleanup' (#5) from updates-20240323 into main

Reviewed-on: #5

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709988192,
+        "lastModified": 1711133180,
-        "narHash": "sha256-qxwIkl85P0I1/EyTT+NJwzbXdOv86vgZxcv4UKicjK8=",
+        "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b0b0c3d94345050a7f86d1ebc6c56eea4389d030",
+        "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
         "type": "github"
       },
       "original": {
@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709771483,
+        "lastModified": 1710717205,
-        "narHash": "sha256-Hjzu9nCknHLQvhdaRFfCEprH0o15KcaNu1QDr3J88DI=",
+        "narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "550340062c16d7ef8c2cc20a3d2b97bcd3c6b6f6",
+        "rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3",
         "type": "github"
       },
       "original": {
@@ -42,11 +42,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1709703039,
+        "lastModified": 1711001935,
-        "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
+        "narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
+        "rev": "20f77aa09916374aa3141cbc605c955626762c9a",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1710006296,
+        "lastModified": 1711204334,
-        "narHash": "sha256-HuOpxTp/VX9FKjm0tn+omw1z8SsJapFtxuKTDdysJdE=",
+        "narHash": "sha256-Wzdv/we5OmxDHx9qxwO9b6XKRm6IS4jwoVbV65g8LxI=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "414e2ef360397c9e024d09dda6de78455d2e00b2",
+        "rev": "676b81c589e5389344eb5c8f5e3fcf321e1dd87d",
         "type": "github"
       },
       "original": {

home.nix

@@ -8,9 +8,9 @@
 
   nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
     "discord"
-    "idea-ultimate"
     "slack"
     "vscode"
+    "vscode-extension-MS-python-vscode-pylance"
     "zoom"
   ];
 
@@ -25,30 +25,22 @@
       any-nix-shell
       aspell
       #bloop
-      cabal-install
-      cabal2nix
       cachix
-      cargo
       cmake
       coursier
-      #curlFull
+      curlFull
       delta
+      deno
       discord
       fd
       ffmpeg
-      #fishPlugins.bass
       fishPlugins.foreign-env
       fishPlugins.bobthefish
       font-awesome
       gitAndTools.diff-so-fancy
-      ghc
-      ghcid
       gnupg
       go
       graphviz
-      jetbrains.idea-ultimate
-      haskell-language-server
-      hugo
       luajit
       luajitPackages.luarocks
       luajitPackages.luasocket
@@ -73,7 +65,7 @@
       nodePackages.yaml-language-server
       ollama
       openssl
-      oterm
+      # oterm
       pandoc
       patchelf
       pngpaste
@@ -84,8 +76,7 @@
       readline
       ripgrep
       ripgrep-all
-      rnix-lsp
+      rustup
-      rustc
       sbt
       scala-cli
       shellcheck
@@ -93,7 +84,6 @@
       slides
       sqlite
       stylua
-      stack
       tealdeer
       tectonic
       texlab
@@ -137,7 +127,7 @@
 
   programs.eza = {
     enable = true;
-    enableAliases = true;
+    enableFishIntegration = true;
     git = true;
     icons = true;
     extraOptions = [
@@ -244,10 +234,12 @@
       pkgs.vscode-extensions.skyapps.fish-vscode
       pkgs.vscode-extensions.baccata.scaladex-search
       pkgs.vscode-extensions.davidanson.vscode-markdownlint
-      pkgs.vscode-extensions.ms-python.python
+      pkgs.vscode-extensions.ms-python.vscode-pylance
+      # pkgs.vscode-extensions.ms-python.python
       pkgs.vscode-extensions.mechatroner.rainbow-csv
       pkgs.vscode-extensions.mkhl.direnv
       pkgs.vscode-extensions.asvetliakov.vscode-neovim
+      pkgs.vscode-extensions.rust-lang.rust-analyzer
     ];
     userSettings = {
       editor.fontFamily = "SF Mono";
@@ -344,6 +336,7 @@
       nixinfo = "nix-shell -p nix-info --run \"nix-info -m\"";
       nixgc = "nix-collect-garbage -d";
       nixq = "nix-env -qa";
+      nixstorerepair = "nix-store --repair --verify --check-contents";
       nixupgrade = "nix upgrade-nix";
       rmxcodederived = "rm -fr ~/Library/Developer/Xcode/DerivedData";
       v = "nvim";
@@ -358,7 +351,7 @@
   # Neovim Configuration
   xdg.configFile."nvim".source = builtins.fetchGit {
     url = "https://code.softinio.com/softinio/nvim-config";
-    rev = "6f0048ce70cc3c6f0f7a7ad44fe0aafde5006bad";
+    rev = "20abfd7ad7a56d7a73d83f6443bb7fe9a72f6b1a";
   };
 }