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

chore: update & various tweaks/docs

Browse source
This commit is contained in:
winston 2024-07-13 00:23:39 +02:00
parent 56915de459
commit 7be2b5d971
Signed by: winston
GPG key ID: 3786770EDBC2B481
9 changed files with 93 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
flake.lock
View file

@ -17,11 +17,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715290355, "lastModified": 1720546205,
"narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=", "narHash": "sha256-boCXsjYVxDviyzoEyAk624600f3ZBo/DKtUdvMTpbGY=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "8d37c5bdeade12b6479c85acd133063ab53187a0", "rev": "de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -30,26 +30,6 @@
"type": "github" "type": "github"
} }
}, },
"caarlos0-nur": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1715607835,
"narHash": "sha256-UGjezBy6LbBLALvzG/aaTj7B3WkmWtGqWg9aF7odO7M=",
"owner": "caarlos0",
"repo": "nur",
"rev": "f6bf464e8e0e227f16332a8e420858d727242d57",
"type": "github"
},
"original": {
"owner": "caarlos0",
"repo": "nur",
"type": "github"
}
},
"darwin": { "darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -57,11 +37,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715901937, "lastModified": 1720599442,
"narHash": "sha256-eMyvWP56ZOdraC2IOvZo0/RTDcrrsqJ0oJWDC76JTak=", "narHash": "sha256-jdm+sKVbBXoyrxcHbVaV0htlpq2iFR+eJw3Xe/DPcDo=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "ffc01182f90118119930bdfc528c1ee9a39ecef8", "rev": "cf297a8d248db6a455b60133f6c0029c04ebe50e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -81,11 +61,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715322226, "lastModified": 1720333712,
"narHash": "sha256-ezoe/FwfJpA7sskLoLP2iwfwkYnscEFCP6Vk5kPwh9k=", "narHash": "sha256-qZmpIPUe4mwdBGmKPBJ5KzvXH6GOCXheiusTAgNjAAA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "297c756ba6249d483c1dafe42378560458842173", "rev": "b78c98c53a46e2a2d6479a920f98aa0aeae56281",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -101,11 +81,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715865404, "lastModified": 1719994518,
"narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -160,11 +140,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715930644, "lastModified": 1720734513,
"narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "rev": "90ae324e2c56af10f20549ab72014804a3064c7f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -179,11 +159,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1716015784, "lastModified": 1720818209,
"narHash": "sha256-ZzQt6qWoH0ce0vzqX8WJgzhYxyVCZGeCQlucdPKPIrw=", "narHash": "sha256-SxAahSBl7FWN5SPmzCHx1ZdUON9HczClUhRi2KelqeI=",
"owner": "nekowinston", "owner": "nekowinston",
"repo": "nur", "repo": "nur",
"rev": "b8bdfa5a29452dbb6d3b34901260a0094bb2c086", "rev": "87bbad468521da761d0f7b1edc69805082757389",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -199,11 +179,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715483403, "lastModified": 1720334033,
"narHash": "sha256-WMDuQj7J5jbpXI/X/E6FZRKgBFGcaSTvYyVxPnKE6KU=", "narHash": "sha256-X9pEvvHTVWJphhbUYqXvlLedOndNqGB7rvhSvL2CIgU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "f9027322f48b427da23746aa359a6510dfcd0228", "rev": "685e40e1348007d2cf76747a201bab43d86b38cb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -223,11 +203,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715995317, "lastModified": 1720747977,
"narHash": "sha256-Pt6Lkr3qteSi4nF5x9RPrnOLoH1bZYnxLmhYVJHyZpY=", "narHash": "sha256-pe50Hl0JMGexwlHwiK7XERntEV8NsfPKW5Aj3Ginj3I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "6c49c56d4365278f755a2a05ee8581706afed626", "rev": "b7ca9aa53d668eb38e320084c90eff10b877a8f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -238,11 +218,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1715266358, "lastModified": 1720031269,
"narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f1010e0469db743d14519a1efd37e23f8513d714", "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -254,11 +234,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1715961556, "lastModified": 1720542800,
"narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=", "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64", "rev": "feb2849fdeb70028c70d73b848214b00d324a497",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -286,11 +266,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1716072372, "lastModified": 1720820096,
"narHash": "sha256-Kvi+y8tDwjhhp+0rgF1jCAVKXYSJsWyFHsLMt6+DYiw=", "narHash": "sha256-y1/QV7d8sWM4O5ucMwQBbCPtGiULynOSgPGDomgx4iY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "3b7597fbe7af84fe7c6051f64795249e7c17f775", "rev": "88df334ed35f799f95889181930f366962422f92",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -311,11 +291,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715870890, "lastModified": 1720524665,
"narHash": "sha256-nacSOeXtUEM77Gn0G4bTdEOeFIrkCBXiyyFZtdGwuH0=", "narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "fa606cccd7b0ccebe2880051208e4a0f61bfc8c1", "rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -327,7 +307,6 @@
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"caarlos0-nur": "caarlos0-nur",
"darwin": "darwin", "darwin": "darwin",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
@ -369,11 +348,11 @@
"scenefx": "scenefx" "scenefx": "scenefx"
}, },
"locked": { "locked": {
"lastModified": 1715273144, "lastModified": 1717215848,
"narHash": "sha256-x8z/sjtJPojvaXiOUDvADiSU/QmSo8cqKQ1X4g+5dw4=", "narHash": "sha256-jG/FJjjIGgAqgA6WRzDHZug+X0CXk1ABdp48o36vzXY=",
"owner": "willpower3309", "owner": "willpower3309",
"repo": "swayfx", "repo": "swayfx",
"rev": "3c621dec7d653231f960d377fcb3ceeed55953e2", "rev": "da559b3ea13addecdd7747b99f3ed498f991d031",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -431,11 +410,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1716028628, "lastModified": 1720787015,
"narHash": "sha256-sjgvUXjDXIA48tq+nbQ+e2BfAJyz865mfOtXTj1c8yQ=", "narHash": "sha256-U3IqoGmIzBKEJ0ihRQ10GRRtdoDBI6Oxl6aiGbUA59A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-wsl", "repo": "nixos-wsl",
"rev": "041bad074dbde651c6b9d23dce5ee15b67e98c6c", "rev": "371b5076d718f7f637d3959d0203061f06af1263",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View file

@ -140,10 +140,6 @@
}; };
nur.url = "github:nix-community/nur"; nur.url = "github:nix-community/nur";
caarlos0-nur = {
url = "github:caarlos0/nur";
inputs.nixpkgs.follows = "nixpkgs";
};
nekowinston-nur.url = "github:nekowinston/nur"; nekowinston-nur.url = "github:nekowinston/nur";
agenix = { agenix = {

3
home/apps/mail.nix
View file

@ -3,7 +3,8 @@
age.secrets."aerc-personal.conf".path = "${config.xdg.configHome}/aerc/accounts.conf"; age.secrets."aerc-personal.conf".path = "${config.xdg.configHome}/aerc/accounts.conf";
programs = { programs = {
aerc = { aerc = {
enable = true; # FIXME: https://github.com/NixOS/nixpkgs/issues/326307
enable = false;
extraConfig = { extraConfig = {
general = { general = {
default-save-path = "~/Downloads"; default-save-path = "~/Downloads";

3
home/apps/nu.nix
View file

@ -7,9 +7,6 @@
let let
nu_scripts = "${pkgs.nu_scripts}/share/nu_scripts"; nu_scripts = "${pkgs.nu_scripts}/share/nu_scripts";
# milspec = (pkgs.callPackage ../../_sources/generated.nix { }).milspec;
milspec.src = /Users/winston/Code/neovim/milspec;
shellAliases = lib.concatStringsSep "\n" ( shellAliases = lib.concatStringsSep "\n" (
lib.mapAttrsToList (k: v: "alias ${k} = ${v}") config.home.shellAliases lib.mapAttrsToList (k: v: "alias ${k} = ${v}") config.home.shellAliases
); );

30
home/apps/nu/config.nu
View file

@ -100,7 +100,35 @@ $env.config = {
# emacs, vi # emacs, vi
edit_mode: vi edit_mode: vi
# enables terminal shell integration. Off by default, as some terminals have issues with this. # enables terminal shell integration. Off by default, as some terminals have issues with this.
shell_integration: $in_supported_termprogram, shell_integration: {
# osc2 abbreviates the path if in the home_dir, sets the tab/window title, shows the running command in the tab/window title
osc2: $in_supported_termprogram
# osc7 is a way to communicate the path to the terminal, this is helpful for spawning new tabs in the same directory
osc7: $in_supported_termprogram
# osc8 is also implemented as the deprecated setting ls.show_clickable_links, it shows clickable links in ls output if your terminal supports it. show_clickable_links is deprecated in favor of osc8
osc8: $in_supported_termprogram
# osc9_9 is from ConEmu and is starting to get wider support. It's similar to osc7 in that it communicates the path to the terminal
osc9_9: false
# osc133 is several escapes invented by Final Term which include the supported ones below.
# 133;A - Mark prompt start
# 133;B - Mark prompt end
# 133;C - Mark pre-execution
# 133;D;exit - Mark execution finished with exit code
# This is used to enable terminals to know where the prompt is, the command is, where the command finishes, and where the output of the command is
osc133: $in_supported_termprogram
# osc633 is closely related to osc133 but only exists in visual studio code (vscode) and supports their shell integration features
# 633;A - Mark prompt start
# 633;B - Mark prompt end
# 633;C - Mark pre-execution
# 633;D;exit - Mark execution finished with exit code
# 633;E - NOT IMPLEMENTED - Explicitly set the command line with an optional nonce
# 633;P;Cwd=<path> - Mark the current working directory and communicate it to the terminal
# and also helps with the run recent menu in vscode
osc633: ($env.TERM_PROGRAM? == "vscode")
# reset_application_mode is escape \x1b[?1l and was added to help ssh work better
reset_application_mode: true
}
# true or false to enable or disable right prompt to be rendered on last line of the prompt. # true or false to enable or disable right prompt to be rendered on last line of the prompt.
render_right_prompt_on_last_line: false render_right_prompt_on_last_line: false
# enables keyboard enhancement protocol implemented by kitty console, only if your terminal support this. # enables keyboard enhancement protocol implemented by kitty console, only if your terminal support this.

10
home/apps/vscode.nix
View file

@ -16,6 +16,16 @@ in
{ {
programs.vscode = { programs.vscode = {
enable = config.isGraphical; enable = config.isGraphical;
# pulling from different package sets:
# - pkgs.vscode-extensions:
# pinned releases from inputs.nixpkgs.
#
# - pkgs.vscode-marketplace-release:
# pinned releases from inputs.nix-vscode-extensions
#
# - pkgs.vscode-marketplace:
# rolling/nightly releases from inputs.nix-vscode-extensions
extensions = extensions =
(with pkgs.vscode-extensions; [ (with pkgs.vscode-extensions; [
# patches # patches

10
home/default.nix
View file

@ -38,6 +38,7 @@ in
nvd nvd
ranger ranger
ripgrep ripgrep
sd
watchexec watchexec
] ]
++ lib.optionals (config.isGraphical && isLinux) [ ++ lib.optionals (config.isGraphical && isLinux) [
@ -50,9 +51,16 @@ in
SSH_AUTH_SOCK = "${config.programs.gpg.homedir}/S.gpg-agent.ssh"; SSH_AUTH_SOCK = "${config.programs.gpg.homedir}/S.gpg-agent.ssh";
}; };
stateVersion = "23.05"; stateVersion = "23.05";
# respected by `fd` & `rg`, makes it so that iCloud files are ignored by those utils
# this speeds up the search processes and files aren't downloaded while searching $HOME
file."Library/.ignore".text = lib.optionalString isDarwin ''
Mobile Documents/
'';
mac-wallpaper = ./wallpapers/dhm_1610.png;
}; };
home.mac-wallpaper = ./wallpapers/dhm_1610.png;
xdg.configFile.sketchybar.source = lib.mkIf isDarwin ./apps/sketchybar; xdg.configFile.sketchybar.source = lib.mkIf isDarwin ./apps/sketchybar;
programs = { programs = {

1
home/lib.nix
View file

@ -30,7 +30,6 @@ rec {
modules = modules =
(with inputs; [ (with inputs; [
agenix.homeManagerModules.age agenix.homeManagerModules.age
caarlos0-nur.homeManagerModules.default
nekowinston-nur.homeManagerModules.default nekowinston-nur.homeManagerModules.default
nix-index-database.hmModules.nix-index nix-index-database.hmModules.nix-index
vscode-server.homeModules.default vscode-server.homeModules.default

2
machines/sashimi/brew.nix
View file

@ -23,7 +23,6 @@ in
(skipSha "affinity-photo") (skipSha "affinity-photo")
(skipSha "affinity-publisher") (skipSha "affinity-publisher")
"alfred" "alfred"
"azure-data-studio"
"blender" "blender"
(noQuarantine "easy-move-plus-resize") (noQuarantine "easy-move-plus-resize")
(skipSha "element") (skipSha "element")
@ -37,6 +36,7 @@ in
"macfuse" "macfuse"
"mullvad-browser" "mullvad-browser"
"mullvadvpn" "mullvadvpn"
"orion"
"rustdesk" "rustdesk"
"signal" "signal"
(skipSha "sizzy") (skipSha "sizzy")