feat: Update dependencies, vscode configurations

sudosubin · Dec 15, 2023 · 5c66b81 · 5c66b81
1 parent e7ad9a5
commit 5c66b81
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 77 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/libraries/nixpkgs/programs/cleanshot/default.nix b/libraries/nixpkgs/programs/cleanshot/default.nix
@@ -7,11 +7,11 @@ in
 {
   cleanshot = stdenvNoCC.mkDerivation rec {
     pname = "cleanshot";
-    version = "4.6.1";
+    version = "4.6.2";
 
     src = fetchurl {
       url = "https://updates.getcleanshot.com/v3/CleanShot-X-${version}.dmg";
-      sha256 = "1424mmm58zxav31anl0rfcxbj8q7h3kdg2nwp7g4gi8z4zjg6451";
+      sha256 = "04qf45v7x54729i5zpbq1f60811db6jvy15rax6184zpsdd13fxv";
     };
 
     sourceRoot = "CleanShot X.app";

diff --git a/libraries/nixpkgs/programs/clop/default.nix b/libraries/nixpkgs/programs/clop/default.nix
@@ -7,11 +7,11 @@ in
 {
   clop = stdenvNoCC.mkDerivation rec {
     pname = "clop";
-    version = "2.3.1";
+    version = "2.4.0";
 
     src = fetchurl {
-      url = "https://github.com/FuzzyIdeas/Clop/releases/download/v${version}/Clop-${version}.dmg";
-      sha256 = "0fw6fxyn03ganqjfqyw0bh0v2c99hifmnl25jbqw484zn2lqj53h";
+      url = "https://github.com/FuzzyIdeas/Clop/releases/download/v${version}/Clop.dmg";
+      sha256 = "0lkkpywbl4k2hkardfb3nc575n3axqz30q2llph5z3b53si3jnvg";
     };
 
     sourceRoot = "Clop.app";

diff --git a/libraries/nixpkgs/programs/ijhttp/default.nix b/libraries/nixpkgs/programs/ijhttp/default.nix
@@ -3,11 +3,11 @@ final: { lib, stdenvNoCC, fetchurl, unzip, makeWrapper, jdk, ... }@prev:
 {
   ijhttp = stdenvNoCC.mkDerivation rec {
     pname = "ijhttp";
-    version = "232.9559.62";
+    version = "233.11799.241";
 
     src = fetchurl {
       url = "https://download-cdn.jetbrains.com/resources/intellij/http-client/${version}/intellij-http-client.zip";
-      sha256 = "055j0pls9b5ml8j0csf63wwi001l1a0hbqxds3jdjf86v7d7kg5i";
+      sha256 = "03grnjyfvbcmnhasl2zfygx18yvk25l5waadagg56vdc2zvlfqhm";
     };
 
     nativeBuildInputs = [ unzip makeWrapper ];

diff --git a/libraries/nixpkgs/programs/redisinsight/default.nix b/libraries/nixpkgs/programs/redisinsight/default.nix
@@ -16,7 +16,7 @@ in
 {
   redisinsight = stdenvNoCC.mkDerivation rec {
     pname = "redisinsight";
-    version = "2.36.0";
+    version = "2.38.0";
 
     src = fetchurl {
       inherit (sources.${stdenvNoCC.hostPlatform.system}) url sha256;

diff --git a/modules/shared/programs/alacritty/default.nix b/modules/shared/programs/alacritty/default.nix
@@ -19,6 +19,10 @@ let
 
 in
 {
+  home.sessionVariables = {
+    COLORFGBG = "1;15";
+  };
+
   programs.alacritty = {
     enable = true;
     settings = {

diff --git a/modules/shared/programs/vscode/files/settings.json b/modules/shared/programs/vscode/files/settings.json
@@ -19,7 +19,6 @@
   "workbench.productIconTheme": "material-product-icons",
   "material-icon-theme.activeIconPack": "react",
   "material-icon-theme.hidesExplorerArrows": true,
-  "material-icon-theme.showWelcomeMessage": false,
   "material-icon-theme.files.associations": {
     "*.gotmpl": "template"
   },
@@ -90,14 +89,13 @@
   },
 
   // language (python)
-  "ruff.enableExperimentalFormatter": true,
   "[python]": {
     "editor.rulers": [80, 120],
     "editor.tabSize": 4,
     "editor.formatOnSave": true,
     "files.insertFinalNewline": true,
     "editor.codeActionsOnSave": {
-      "source.organizeImports": true
+      "source.organizeImports": "explicit"
     },
     "editor.defaultFormatter": "charliermarsh.ruff"
   },
@@ -110,62 +108,23 @@
 
   // language (javascript)
   "emmet.excludeLanguages": ["typescriptreact"],
-  "eslint.alwaysShowStatus": true,
   "typescript.disableAutomaticTypeAcquisition": true,
   "typescript.preferences.importModuleSpecifier": "non-relative",
   "[css]": {
     "editor.tabSize": 2,
     "editor.formatOnSave": true,
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
-  "[json]": {
-    "editor.tabSize": 2,
-    "editor.formatOnSave": true,
+  "[javascript][javascriptreact][json][jsonc][typescript][typescriptreact]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true
-    }
-  },
-  "[jsonc]": {
-    "editor.tabSize": 2,
     "editor.formatOnSave": true,
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true
-    }
-  },
-  "[javascript]": {
     "editor.tabSize": 2,
-    "editor.formatOnSave": true,
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
     "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true
-    }
-  },
-  "[javascriptreact]": {
-    "editor.tabSize": 2,
-    "editor.formatOnSave": true,
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true
-    }
-  },
-  "[typescript]": {
-    "editor.tabSize": 2,
-    "editor.formatOnSave": true,
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true
-    }
-  },
-  "[typescriptreact]": {
-    "editor.tabSize": 2,
-    "editor.formatOnSave": true,
-    "editor.defaultFormatter": "esbenp.prettier-vscode",
-    "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": true
+      "source.fixAll.eslint": "explicit"
     }
   },
+
+  // language (terraform)
   "[terraform]": {
     "editor.tabSize": 2,
     "editor.formatOnSave": true