From 41c6e3753c36dcd657dcc19d4a453aff298767f5 Mon Sep 17 00:00:00 2001 From: winston Date: Tue, 16 Apr 2024 01:16:52 +0200 Subject: [PATCH] feat: stuff --- _sources/generated.json | 14 ++-- _sources/generated.nix | 14 ++-- flake.lock | 112 ++++++++++++++++----------- flake.nix | 5 +- home/apps/git.nix | 5 +- home/apps/vscode.nix | 15 ++++ home/apps/vscode/settings.json | 3 +- home/apps/wezterm/wezterm.lua | 1 - home/default.nix | 2 + home/secrets/gitconfig-freelance.age | Bin 0 -> 666 bytes home/secrets/secrets.nix | 1 + machines/sashimi/brew.nix | 4 - pkgs/overlays.nix | 1 + 13 files changed, 109 insertions(+), 68 deletions(-) create mode 100644 home/secrets/gitconfig-freelance.age diff --git a/_sources/generated.json b/_sources/generated.json index d26d44f..e0222a4 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -39,7 +39,7 @@ }, "catppuccin-zsh-fsh": { "cargoLocks": null, - "date": "2024-03-10", + "date": "2024-03-25", "extract": null, "name": "catppuccin-zsh-fsh", "passthru": null, @@ -49,12 +49,12 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "d2a1ba1d4aa36edfa34ed687bd84ef1e2db481b7", - "sha256": "sha256-DYWpivDyhW9ZZD2tqpQgXFz7u947mKOUvvz+RQnVslU=", + "rev": "8af8701de8a00b10c072b7bef4f7b74558a2cd15", + "sha256": "sha256-O80XzCAw02/bXkMLgf3v71NLjVI4uCaC1i0eAZstA/0=", "type": "git", "url": "https://github.com/catppuccin/zsh-fsh" }, - "version": "d2a1ba1d4aa36edfa34ed687bd84ef1e2db481b7" + "version": "8af8701de8a00b10c072b7bef4f7b74558a2cd15" }, "nekowinston-wezterm-bar": { "cargoLocks": null, @@ -84,11 +84,11 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-b+hp+kAnLqsljjwtg7RyWuKXT6D22FvnqEkPqLUZGKs=", + "sha256": "sha256-WsbW3Y5HqBv7tCp4iDL/9lE0gF5BRoF6WbIxeLcRJDQ=", "type": "url", - "url": "https://github.com/koekeishiya/yabai/releases/download/v7.0.3/yabai-v7.0.3.tar.gz" + "url": "https://github.com/koekeishiya/yabai/releases/download/v7.1.0/yabai-v7.1.0.tar.gz" }, - "version": "v7.0.3" + "version": "v7.1.0" }, "zsh-fast-syntax-highlighting": { "cargoLocks": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index d4d3a23..77fbd2a 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -29,16 +29,16 @@ }; catppuccin-zsh-fsh = { pname = "catppuccin-zsh-fsh"; - version = "d2a1ba1d4aa36edfa34ed687bd84ef1e2db481b7"; + version = "8af8701de8a00b10c072b7bef4f7b74558a2cd15"; src = fetchgit { url = "https://github.com/catppuccin/zsh-fsh"; - rev = "d2a1ba1d4aa36edfa34ed687bd84ef1e2db481b7"; + rev = "8af8701de8a00b10c072b7bef4f7b74558a2cd15"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; - sha256 = "sha256-DYWpivDyhW9ZZD2tqpQgXFz7u947mKOUvvz+RQnVslU="; + sha256 = "sha256-O80XzCAw02/bXkMLgf3v71NLjVI4uCaC1i0eAZstA/0="; }; - date = "2024-03-10"; + date = "2024-03-25"; }; nekowinston-wezterm-bar = { pname = "nekowinston-wezterm-bar"; @@ -55,10 +55,10 @@ }; yabai = { pname = "yabai"; - version = "v7.0.3"; + version = "v7.1.0"; src = fetchurl { - url = "https://github.com/koekeishiya/yabai/releases/download/v7.0.3/yabai-v7.0.3.tar.gz"; - sha256 = "sha256-b+hp+kAnLqsljjwtg7RyWuKXT6D22FvnqEkPqLUZGKs="; + url = "https://github.com/koekeishiya/yabai/releases/download/v7.1.0/yabai-v7.1.0.tar.gz"; + sha256 = "sha256-WsbW3Y5HqBv7tCp4iDL/9lE0gF5BRoF6WbIxeLcRJDQ="; }; }; zsh-fast-syntax-highlighting = { diff --git a/flake.lock b/flake.lock index 19d1400..d77e02e 100644 --- a/flake.lock +++ b/flake.lock @@ -17,11 +17,11 @@ ] }, "locked": { - "lastModified": 1707830867, - "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", + "lastModified": 1712079060, + "narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=", "owner": "ryantm", "repo": "agenix", - "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", + "rev": "1381a759b205dff7a6818733118d02253340fd5e", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1710248394, - "narHash": "sha256-Bj6XxMXWSFDxSGG2MvrPmMb9spc7ckdC/A3SW43dsys=", + "lastModified": 1712625686, + "narHash": "sha256-gQtnKMfEkzocMA9D9tZjbhwYywo+3QpIeKui4sFDEhY=", "owner": "caarlos0", "repo": "nur", - "rev": "440df6b32462d6f6dbb7ee830c7135371b1eb468", + "rev": "a331639906c5b9919f36bccb2cd3194cae7230a6", "type": "github" }, "original": { @@ -50,6 +50,26 @@ "type": "github" } }, + "catppuccin-toolbox": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712774858, + "narHash": "sha256-0en4GPb0ztX2Sf5Zvzj+TIx3ycCHvjGU5KxoD+XZo58=", + "owner": "catppuccin", + "repo": "toolbox", + "rev": "25acb3419de05614fa972f14a0bc452df59c0491", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "toolbox", + "type": "github" + } + }, "catppuccin-vsc": { "inputs": { "nixpkgs": [ @@ -77,11 +97,11 @@ ] }, "locked": { - "lastModified": 1710717205, - "narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=", + "lastModified": 1711763326, + "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3", + "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", "type": "github" }, "original": { @@ -97,11 +117,11 @@ ] }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -133,11 +153,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -174,11 +194,11 @@ ] }, "locked": { - "lastModified": 1710974515, - "narHash": "sha256-jZpdsypecYTOO9l12Vy77otGmh9uz8tGzcguifA30Vs=", + "lastModified": 1712759992, + "narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c2acec99933f9835cc7ad47e35303de92d923a4", + "rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9", "type": "github" }, "original": { @@ -194,11 +214,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1711090992, - "narHash": "sha256-ZNvaIYxLTzyn6IH4sjvyTVrsTqVT/2qWlI7TqZh72X0=", + "lastModified": 1712819001, + "narHash": "sha256-of0junzhgepG+0YdzoMSzuR6/2USwQ55TP/2iuCNE/Q=", "owner": "nekowinston", "repo": "nur", - "rev": "6df03d938e3713c1693540e295b6fe00a4ced2f9", + "rev": "ef6456b6263fc2b0854943a94bb25e00c0c0f430", "type": "github" }, "original": { @@ -234,11 +254,11 @@ ] }, "locked": { - "lastModified": 1710644923, - "narHash": "sha256-0fjbN5GYYDKPyPay0l8gYoH+tFfNqPPwP5sxxBreeA4=", + "lastModified": 1712459390, + "narHash": "sha256-e12bNDottaGoBgd0AdH/bQvk854xunlWAdZwr/oHO1c=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "e25efda85e39fcdc845e371971ac4384989c4295", + "rev": "4676d72d872459e1e3a248d049609f110c570e9a", "type": "github" }, "original": { @@ -258,11 +278,11 @@ ] }, "locked": { - "lastModified": 1711070085, - "narHash": "sha256-qrvSvaIKZGThRwmZMDpcdtbjwXY4dh1AdtkaL7WjhFs=", + "lastModified": 1712908241, + "narHash": "sha256-437eFtdwo79m4oPKqTrfhag79hnliG/HkW3CcAL7pdY=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "c969bafb141eb5736083e832ad218bb14bbdc182", + "rev": "203c54546c1768f3d0341b5d26932e9a7e865709", "type": "github" }, "original": { @@ -273,11 +293,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1712163089, + "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", "type": "github" }, "original": { @@ -289,11 +309,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1710806803, - "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", + "lastModified": 1712791164, + "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", + "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5", "type": "github" }, "original": { @@ -305,11 +325,11 @@ }, "nur": { "locked": { - "lastModified": 1711092983, - "narHash": "sha256-118UpeLFzci+wExtczemejzoq1a8tBL2lThJdEVWBhM=", + "lastModified": 1712935599, + "narHash": "sha256-raHWckCSlGolfqvkqKpJfzyOcSWuIGmuVsOTWMxkssQ=", "owner": "nix-community", "repo": "nur", - "rev": "9f089669076311a9645caa01ab5c103a916bf33e", + "rev": "e5d7288700dab849d2f2261b4a4ef383df1adbb5", "type": "github" }, "original": { @@ -333,11 +353,11 @@ ] }, "locked": { - "lastModified": 1710923068, - "narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=", + "lastModified": 1712897695, + "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "e611897ddfdde3ed3eaac4758635d7177ff78673", + "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", "type": "github" }, "original": { @@ -350,6 +370,7 @@ "inputs": { "agenix": "agenix", "caarlos0-nur": "caarlos0-nur", + "catppuccin-toolbox": "catppuccin-toolbox", "catppuccin-vsc": "catppuccin-vsc", "darwin": "darwin", "flake-parts": "flake-parts", @@ -379,11 +400,11 @@ ] }, "locked": { - "lastModified": 1710036830, - "narHash": "sha256-pnV4gO3N/7/GzyRSKTRlSfS/19KJiPSvYcL4apnSkoQ=", + "lastModified": 1712456031, + "narHash": "sha256-vPM+DLCyiT3eKGdDBIxqsgBrbbB7lL0TR6R7FLhX1v8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d09dac6a63a2ac4b74ac2ecdc19acd8c46c2da2c", + "rev": "0e5eaa43f116d798c289b0bb831320a353efc905", "type": "github" }, "original": { @@ -394,17 +415,16 @@ }, "swayfx": { "inputs": { - "flake-compat": [], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1707986911, - "narHash": "sha256-kRWXQnUkMm5HjlDX9rBq8lowygvbK9+ScAOhiySR3KY=", + "lastModified": 1712764522, + "narHash": "sha256-nLrg/congNWRJ75KtW/Oz35TgaYQ2T5sl4ZsQADn6q4=", "owner": "willpower3309", "repo": "swayfx", - "rev": "2bd366f3372d6f94f6633e62b7f7b06fcf316943", + "rev": "167a4ea0aec93d51e4c606ffdbe3a195d12da6e3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 16d637c..91dff32 100644 --- a/flake.nix +++ b/flake.nix @@ -135,6 +135,10 @@ url = "github:catppuccin/vscode"; inputs.nixpkgs.follows = "nixpkgs"; }; + catppuccin-toolbox = { + url = "github:catppuccin/toolbox"; + inputs.nixpkgs.follows = "nixpkgs"; + }; agenix = { url = "github:ryantm/agenix"; @@ -155,7 +159,6 @@ }; swayfx = { url = "github:willpower3309/swayfx"; - inputs.flake-compat.follows = ""; inputs.nixpkgs.follows = "nixpkgs"; }; vscode-server = { diff --git a/home/apps/git.nix b/home/apps/git.nix index 2db89ca..9d57aa1 100644 --- a/home/apps/git.nix +++ b/home/apps/git.nix @@ -3,12 +3,15 @@ pkgs, ... }: { - age.secrets."gitconfig-work".path = "${config.xdg.configHome}/git/gitconfig-work"; programs.git.includes = [ { condition = "gitdir:~/Code/work/"; path = config.age.secrets."gitconfig-work".path; } + { + condition = "gitdir:~/Code/freelance/"; + path = config.age.secrets."gitconfig-freelance".path; + } ]; # use fsmonitor diff --git a/home/apps/vscode.nix b/home/apps/vscode.nix index 796b820..32e01a2 100644 --- a/home/apps/vscode.nix +++ b/home/apps/vscode.nix @@ -72,6 +72,8 @@ in { ' < package.json | sponge package.json ''; })) + ms-vscode-remote.remote-ssh-edit + ms-vscode.remote-explorer adrianwilczynski.alpine-js-intellisense antfu.icons-carbon arcanis.vscode-zipfs @@ -111,6 +113,19 @@ in { usernamehw.errorlens vscodevim.vim wakatime.vscode-wakatime + ms-vscode.test-adapter-converter + hbenl.vscode-test-explorer + webfreak.code-d + # (webfreak.code-d.overrideAttrs (prev: { + # nativeBuildInputs = prev.nativeBuildInputs ++ [pkgs.jq pkgs.moreutils]; + # postInstall = '' + # cd "$out/$installPrefix" + # jq -e ' + # .contributes.configuration.properties."d.dcdClientPath".default = + # "${pkgs.alejandra}/bin/alejandra" + # ' < package.json | sponge package.json + # ''; + # })) ]); mutableExtensionsDir = true; }; diff --git a/home/apps/vscode/settings.json b/home/apps/vscode/settings.json index 2ac97b5..c5df358 100644 --- a/home/apps/vscode/settings.json +++ b/home/apps/vscode/settings.json @@ -101,11 +101,12 @@ // language-specific settings "d.alwaysShowDubStatusButtons": true, - "d.servedReleaseChannel": "beta", + "d.servedReleaseChannel": "nightly", "d.stdlibPath": "auto", "gopls": { "ui.semanticTokens": true }, + "tailwindCSS.emmetCompletions": true, "[javascript]": { "editor.snippetSuggestions": "top", "editor.defaultFormatter": "esbenp.prettier-vscode" diff --git a/home/apps/wezterm/wezterm.lua b/home/apps/wezterm/wezterm.lua index a636177..de3bca7 100644 --- a/home/apps/wezterm/wezterm.lua +++ b/home/apps/wezterm/wezterm.lua @@ -14,7 +14,6 @@ c.harfbuzz_features = { "calt=1", "ss01=1" } c.command_palette_font_size = c.font_size * 1.1 c.window_frame = { font = wezterm.font("IBM Plex Sans"), - font_size = c.font_size, } c.window_decorations = "RESIZE|INTEGRATED_BUTTONS" diff --git a/home/default.nix b/home/default.nix index c157666..4918714 100644 --- a/home/default.nix +++ b/home/default.nix @@ -13,6 +13,8 @@ in { _1password age age-plugin-yubikey + catppuccin-catwalk + catppuccin-whiskers deno fd ffmpeg diff --git a/home/secrets/gitconfig-freelance.age b/home/secrets/gitconfig-freelance.age new file mode 100644 index 0000000000000000000000000000000000000000..20c0516f82ceade7fbcd464a6fdd7c1ecf71122e GIT binary patch literal 666 zcmZ9_OKZ~r003a810jN_;7P;?qPVO}lQvDmrjRyGnlyc;OCN_}(xz*gHcj*F!VW_O z5kbX+2JM~k9Eyy z*hPTAY0yyJfPrEWFwI9YH4-FEvacv;v)_V$Vl&M6HrwB1$PQ za$J^71|wRb9GdhgTC;OSuUc(r+czBd2r~~-CWDF@PRD32oR%s$TT=a~<06hA<8F#5 zQ)nSXwkWgFPXMxoxUgI2(k;8#=ZczOy11DYF|3sCpix$cb}b0fF})TEZr^ySO{yeF z*C{j`sr1vK<0R=RFI^Oxj3T6?#Nnk_BFX9KIzH zlqTwe;#8fs!7xt44U-P@&Evbr