winston/dotfiles
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

feat: stuff

Browse source
This commit is contained in:
winston 2024-04-16 01:16:52 +02:00
parent 6297819298
commit 41c6e3753c
Signed by: winston
GPG key ID: 3786770EDBC2B481
13 changed files with 109 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
_sources/generated.json
View file

@ -39,7 +39,7 @@
}, },
"catppuccin-zsh-fsh": { "catppuccin-zsh-fsh": {
"cargoLocks": null, "cargoLocks": null,
"date": "2024-03-10", "date": "2024-03-25",
"extract": null, "extract": null,
"name": "catppuccin-zsh-fsh", "name": "catppuccin-zsh-fsh",
"passthru": null, "passthru": null,
@ -49,12 +49,12 @@
"fetchSubmodules": false, "fetchSubmodules": false,
"leaveDotGit": false, "leaveDotGit": false,
"name": null, "name": null,
"rev": "d2a1ba1d4aa36edfa34ed687bd84ef1e2db481b7", "rev": "8af8701de8a00b10c072b7bef4f7b74558a2cd15",
"sha256": "sha256-DYWpivDyhW9ZZD2tqpQgXFz7u947mKOUvvz+RQnVslU=", "sha256": "sha256-O80XzCAw02/bXkMLgf3v71NLjVI4uCaC1i0eAZstA/0=",
"type": "git", "type": "git",
"url": "https://github.com/catppuccin/zsh-fsh" "url": "https://github.com/catppuccin/zsh-fsh"
}, },
"version": "d2a1ba1d4aa36edfa34ed687bd84ef1e2db481b7" "version": "8af8701de8a00b10c072b7bef4f7b74558a2cd15"
}, },
"nekowinston-wezterm-bar": { "nekowinston-wezterm-bar": {
"cargoLocks": null, "cargoLocks": null,
@ -84,11 +84,11 @@
"pinned": false, "pinned": false,
"src": { "src": {
"name": null, "name": null,
"sha256": "sha256-b+hp+kAnLqsljjwtg7RyWuKXT6D22FvnqEkPqLUZGKs=", "sha256": "sha256-WsbW3Y5HqBv7tCp4iDL/9lE0gF5BRoF6WbIxeLcRJDQ=",
"type": "url", "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": { "zsh-fast-syntax-highlighting": {
"cargoLocks": null, "cargoLocks": null,

14
_sources/generated.nix
View file

@ -29,16 +29,16 @@
}; };
catppuccin-zsh-fsh = { catppuccin-zsh-fsh = {
pname = "catppuccin-zsh-fsh"; pname = "catppuccin-zsh-fsh";
version = "d2a1ba1d4aa36edfa34ed687bd84ef1e2db481b7"; version = "8af8701de8a00b10c072b7bef4f7b74558a2cd15";
src = fetchgit { src = fetchgit {
url = "https://github.com/catppuccin/zsh-fsh"; url = "https://github.com/catppuccin/zsh-fsh";
rev = "d2a1ba1d4aa36edfa34ed687bd84ef1e2db481b7"; rev = "8af8701de8a00b10c072b7bef4f7b74558a2cd15";
fetchSubmodules = false; fetchSubmodules = false;
deepClone = false; deepClone = false;
leaveDotGit = false; leaveDotGit = false;
sha256 = "sha256-DYWpivDyhW9ZZD2tqpQgXFz7u947mKOUvvz+RQnVslU="; sha256 = "sha256-O80XzCAw02/bXkMLgf3v71NLjVI4uCaC1i0eAZstA/0=";
}; };
date = "2024-03-10"; date = "2024-03-25";
}; };
nekowinston-wezterm-bar = { nekowinston-wezterm-bar = {
pname = "nekowinston-wezterm-bar"; pname = "nekowinston-wezterm-bar";
@ -55,10 +55,10 @@
}; };
yabai = { yabai = {
pname = "yabai"; pname = "yabai";
version = "v7.0.3"; version = "v7.1.0";
src = fetchurl { src = fetchurl {
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";
sha256 = "sha256-b+hp+kAnLqsljjwtg7RyWuKXT6D22FvnqEkPqLUZGKs="; sha256 = "sha256-WsbW3Y5HqBv7tCp4iDL/9lE0gF5BRoF6WbIxeLcRJDQ=";
}; };
}; };
zsh-fast-syntax-highlighting = { zsh-fast-syntax-highlighting = {

112
flake.lock
View file

@ -17,11 +17,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1707830867, "lastModified": 1712079060,
"narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", "narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", "rev": "1381a759b205dff7a6818733118d02253340fd5e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -37,11 +37,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710248394, "lastModified": 1712625686,
"narHash": "sha256-Bj6XxMXWSFDxSGG2MvrPmMb9spc7ckdC/A3SW43dsys=", "narHash": "sha256-gQtnKMfEkzocMA9D9tZjbhwYywo+3QpIeKui4sFDEhY=",
"owner": "caarlos0", "owner": "caarlos0",
"repo": "nur", "repo": "nur",
"rev": "440df6b32462d6f6dbb7ee830c7135371b1eb468", "rev": "a331639906c5b9919f36bccb2cd3194cae7230a6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -50,6 +50,26 @@
"type": "github" "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": { "catppuccin-vsc": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -77,11 +97,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710717205, "lastModified": 1711763326,
"narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=", "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3", "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -97,11 +117,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709336216, "lastModified": 1712014858,
"narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -133,11 +153,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1709126324, "lastModified": 1710146030,
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "d465f4819400de7c8d874d50b982301f28a84605", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -174,11 +194,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710974515, "lastModified": 1712759992,
"narHash": "sha256-jZpdsypecYTOO9l12Vy77otGmh9uz8tGzcguifA30Vs=", "narHash": "sha256-2APpO3ZW4idlgtlb8hB04u/rmIcKA8O7pYqxF66xbNY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1c2acec99933f9835cc7ad47e35303de92d923a4", "rev": "31357486b0ef6f4e161e002b6893eeb4fafc3ca9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -194,11 +214,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1711090992, "lastModified": 1712819001,
"narHash": "sha256-ZNvaIYxLTzyn6IH4sjvyTVrsTqVT/2qWlI7TqZh72X0=", "narHash": "sha256-of0junzhgepG+0YdzoMSzuR6/2USwQ55TP/2iuCNE/Q=",
"owner": "nekowinston", "owner": "nekowinston",
"repo": "nur", "repo": "nur",
"rev": "6df03d938e3713c1693540e295b6fe00a4ced2f9", "rev": "ef6456b6263fc2b0854943a94bb25e00c0c0f430",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -234,11 +254,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710644923, "lastModified": 1712459390,
"narHash": "sha256-0fjbN5GYYDKPyPay0l8gYoH+tFfNqPPwP5sxxBreeA4=", "narHash": "sha256-e12bNDottaGoBgd0AdH/bQvk854xunlWAdZwr/oHO1c=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "e25efda85e39fcdc845e371971ac4384989c4295", "rev": "4676d72d872459e1e3a248d049609f110c570e9a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -258,11 +278,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711070085, "lastModified": 1712908241,
"narHash": "sha256-qrvSvaIKZGThRwmZMDpcdtbjwXY4dh1AdtkaL7WjhFs=", "narHash": "sha256-437eFtdwo79m4oPKqTrfhag79hnliG/HkW3CcAL7pdY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "c969bafb141eb5736083e832ad218bb14bbdc182", "rev": "203c54546c1768f3d0341b5d26932e9a7e865709",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -273,11 +293,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1709703039, "lastModified": 1712163089,
"narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -289,11 +309,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1710806803, "lastModified": 1712791164,
"narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -305,11 +325,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1711092983, "lastModified": 1712935599,
"narHash": "sha256-118UpeLFzci+wExtczemejzoq1a8tBL2lThJdEVWBhM=", "narHash": "sha256-raHWckCSlGolfqvkqKpJfzyOcSWuIGmuVsOTWMxkssQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "9f089669076311a9645caa01ab5c103a916bf33e", "rev": "e5d7288700dab849d2f2261b4a4ef383df1adbb5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -333,11 +353,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710923068, "lastModified": 1712897695,
"narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=", "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "e611897ddfdde3ed3eaac4758635d7177ff78673", "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -350,6 +370,7 @@
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"caarlos0-nur": "caarlos0-nur", "caarlos0-nur": "caarlos0-nur",
"catppuccin-toolbox": "catppuccin-toolbox",
"catppuccin-vsc": "catppuccin-vsc", "catppuccin-vsc": "catppuccin-vsc",
"darwin": "darwin", "darwin": "darwin",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
@ -379,11 +400,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710036830, "lastModified": 1712456031,
"narHash": "sha256-pnV4gO3N/7/GzyRSKTRlSfS/19KJiPSvYcL4apnSkoQ=", "narHash": "sha256-vPM+DLCyiT3eKGdDBIxqsgBrbbB7lL0TR6R7FLhX1v8=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "d09dac6a63a2ac4b74ac2ecdc19acd8c46c2da2c", "rev": "0e5eaa43f116d798c289b0bb831320a353efc905",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -394,17 +415,16 @@
}, },
"swayfx": { "swayfx": {
"inputs": { "inputs": {
"flake-compat": [],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1707986911, "lastModified": 1712764522,
"narHash": "sha256-kRWXQnUkMm5HjlDX9rBq8lowygvbK9+ScAOhiySR3KY=", "narHash": "sha256-nLrg/congNWRJ75KtW/Oz35TgaYQ2T5sl4ZsQADn6q4=",
"owner": "willpower3309", "owner": "willpower3309",
"repo": "swayfx", "repo": "swayfx",
"rev": "2bd366f3372d6f94f6633e62b7f7b06fcf316943", "rev": "167a4ea0aec93d51e4c606ffdbe3a195d12da6e3",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
flake.nix
View file

@ -135,6 +135,10 @@
url = "github:catppuccin/vscode"; url = "github:catppuccin/vscode";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
catppuccin-toolbox = {
url = "github:catppuccin/toolbox";
inputs.nixpkgs.follows = "nixpkgs";
};
agenix = { agenix = {
url = "github:ryantm/agenix"; url = "github:ryantm/agenix";
@ -155,7 +159,6 @@
}; };
swayfx = { swayfx = {
url = "github:willpower3309/swayfx"; url = "github:willpower3309/swayfx";
inputs.flake-compat.follows = "";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
vscode-server = { vscode-server = {

5
home/apps/git.nix
View file

@ -3,12 +3,15 @@
pkgs, pkgs,
... ...
}: { }: {
age.secrets."gitconfig-work".path = "${config.xdg.configHome}/git/gitconfig-work";
programs.git.includes = [ programs.git.includes = [
{ {
condition = "gitdir:~/Code/work/"; condition = "gitdir:~/Code/work/";
path = config.age.secrets."gitconfig-work".path; path = config.age.secrets."gitconfig-work".path;
} }
{
condition = "gitdir:~/Code/freelance/";
path = config.age.secrets."gitconfig-freelance".path;
}
]; ];
# use fsmonitor # use fsmonitor

15
home/apps/vscode.nix
View file

@ -72,6 +72,8 @@ in {
' < package.json | sponge package.json ' < package.json | sponge package.json
''; '';
})) }))
ms-vscode-remote.remote-ssh-edit
ms-vscode.remote-explorer
adrianwilczynski.alpine-js-intellisense adrianwilczynski.alpine-js-intellisense
antfu.icons-carbon antfu.icons-carbon
arcanis.vscode-zipfs arcanis.vscode-zipfs
@ -111,6 +113,19 @@ in {
usernamehw.errorlens usernamehw.errorlens
vscodevim.vim vscodevim.vim
wakatime.vscode-wakatime 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; mutableExtensionsDir = true;
}; };

3
home/apps/vscode/settings.json
View file

@ -101,11 +101,12 @@
// language-specific settings // language-specific settings
"d.alwaysShowDubStatusButtons": true, "d.alwaysShowDubStatusButtons": true,
"d.servedReleaseChannel": "beta", "d.servedReleaseChannel": "nightly",
"d.stdlibPath": "auto", "d.stdlibPath": "auto",
"gopls": { "gopls": {
"ui.semanticTokens": true "ui.semanticTokens": true
}, },
"tailwindCSS.emmetCompletions": true,
"[javascript]": { "[javascript]": {
"editor.snippetSuggestions": "top", "editor.snippetSuggestions": "top",
"editor.defaultFormatter": "esbenp.prettier-vscode" "editor.defaultFormatter": "esbenp.prettier-vscode"

1
home/apps/wezterm/wezterm.lua
View file

@ -14,7 +14,6 @@ c.harfbuzz_features = { "calt=1", "ss01=1" }
c.command_palette_font_size = c.font_size * 1.1 c.command_palette_font_size = c.font_size * 1.1
c.window_frame = { c.window_frame = {
font = wezterm.font("IBM Plex Sans"), font = wezterm.font("IBM Plex Sans"),
font_size = c.font_size,
} }
c.window_decorations = "RESIZE|INTEGRATED_BUTTONS" c.window_decorations = "RESIZE|INTEGRATED_BUTTONS"

2
home/default.nix
View file

@ -13,6 +13,8 @@ in {
_1password _1password
age age
age-plugin-yubikey age-plugin-yubikey
catppuccin-catwalk
catppuccin-whiskers
deno deno
fd fd
ffmpeg ffmpeg

BIN
home/secrets/gitconfig-freelance.age Normal file
View file

Binary file not shown.

1
home/secrets/secrets.nix
View file

@ -9,6 +9,7 @@ let
default = [yubikeys._5ci] ++ (builtins.attrValues homes); default = [yubikeys._5ci] ++ (builtins.attrValues homes);
in { in {
"home/secrets/aerc-personal.conf.age".publicKeys = default; "home/secrets/aerc-personal.conf.age".publicKeys = default;
"home/secrets/gitconfig-freelance.age".publicKeys = default;
"home/secrets/gitconfig-work.age".publicKeys = default; "home/secrets/gitconfig-work.age".publicKeys = default;
"home/secrets/wakatime.cfg.age".publicKeys = default; "home/secrets/wakatime.cfg.age".publicKeys = default;
} }

4
machines/sashimi/brew.nix
View file

@ -21,7 +21,6 @@ in {
(skipSha "affinity-publisher") (skipSha "affinity-publisher")
"alfred" "alfred"
"azure-data-studio" "azure-data-studio"
"bitwarden"
"blender" "blender"
(noQuarantine "easy-move-plus-resize") (noQuarantine "easy-move-plus-resize")
(skipSha "element") (skipSha "element")
@ -33,11 +32,8 @@ in {
"keka" "keka"
"little-snitch" "little-snitch"
"macfuse" "macfuse"
"mattermost"
"mullvad-browser" "mullvad-browser"
"mullvadvpn" "mullvadvpn"
"obs"
"postman"
"rustdesk" "rustdesk"
"signal" "signal"
(skipSha "sizzy") (skipSha "sizzy")

1
pkgs/overlays.nix
View file

@ -1,4 +1,5 @@
{inputs}: [ {inputs}: [
inputs.catppuccin-toolbox.overlays.default
inputs.catppuccin-vsc.overlays.default inputs.catppuccin-vsc.overlays.default
inputs.nix-deno.overlays.default inputs.nix-deno.overlays.default
inputs.nix-vscode-extensions.overlays.default inputs.nix-vscode-extensions.overlays.default