From 9043f51758306dfb856ca3c23359dbcb515a9729 Mon Sep 17 00:00:00 2001 From: winston Date: Sat, 24 Aug 2024 04:15:54 +0200 Subject: [PATCH] feat: bump & macOS reinstall tweaks --- _sources/generated.json | 14 +- _sources/generated.nix | 14 +- flake.lock | 158 +++++++++++++----- home/apps/discord/custom.css | 16 +- home/apps/wezterm/wezterm.lua | 24 +-- home/default.nix | 18 +- .../discord-applemusic-rich-presence.patch | 13 -- 7 files changed, 152 insertions(+), 105 deletions(-) delete mode 100644 pkgs/patches/discord-applemusic-rich-presence.patch diff --git a/_sources/generated.json b/_sources/generated.json index 0744557..4b3fa95 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -1,7 +1,7 @@ { "catppuccin-bat": { "cargoLocks": null, - "date": "2024-04-25", + "date": "2024-08-05", "extract": null, "name": "catppuccin-bat", "passthru": null, @@ -13,11 +13,11 @@ "name": null, "owner": "catppuccin", "repo": "bat", - "rev": "d714cc1d358ea51bfc02550dabab693f70cccea0", - "sha256": "sha256-Q5B4NDrfCIK3UAMs94vdXnR42k4AXCqZz6sRn8bzmf4=", + "rev": "d3feec47b16a8e99eabb34cdfbaa115541d374fc", + "sha256": "sha256-s0CHTihXlBMCKmbBBb8dUhfgOOQu9PBCQ+uviy7o47w=", "type": "github" }, - "version": "d714cc1d358ea51bfc02550dabab693f70cccea0" + "version": "d3feec47b16a8e99eabb34cdfbaa115541d374fc" }, "milspec": { "cargoLocks": null, @@ -68,11 +68,11 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-uqxP7hO4cyZRoA9acOHWMVPmEGQhZcIRGmLar3H+xE8=", + "sha256": "sha256-RIYo5Ilqbfs4kqYKSrztYLAqgvlPXqaEenVnMJvTWDk=", "type": "url", - "url": "https://github.com/koekeishiya/yabai/releases/download/v7.1.1/yabai-v7.1.1.tar.gz" + "url": "https://github.com/koekeishiya/yabai/releases/download/v7.1.2/yabai-v7.1.2.tar.gz" }, - "version": "v7.1.1" + "version": "v7.1.2" }, "zsh-fast-syntax-highlighting": { "cargoLocks": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index c1fbcab..e9ffc89 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -3,15 +3,15 @@ { catppuccin-bat = { pname = "catppuccin-bat"; - version = "d714cc1d358ea51bfc02550dabab693f70cccea0"; + version = "d3feec47b16a8e99eabb34cdfbaa115541d374fc"; src = fetchFromGitHub { owner = "catppuccin"; repo = "bat"; - rev = "d714cc1d358ea51bfc02550dabab693f70cccea0"; + rev = "d3feec47b16a8e99eabb34cdfbaa115541d374fc"; fetchSubmodules = false; - sha256 = "sha256-Q5B4NDrfCIK3UAMs94vdXnR42k4AXCqZz6sRn8bzmf4="; + sha256 = "sha256-s0CHTihXlBMCKmbBBb8dUhfgOOQu9PBCQ+uviy7o47w="; }; - date = "2024-04-25"; + date = "2024-08-05"; }; milspec = { pname = "milspec"; @@ -39,10 +39,10 @@ }; yabai = { pname = "yabai"; - version = "v7.1.1"; + version = "v7.1.2"; src = fetchurl { - url = "https://github.com/koekeishiya/yabai/releases/download/v7.1.1/yabai-v7.1.1.tar.gz"; - sha256 = "sha256-uqxP7hO4cyZRoA9acOHWMVPmEGQhZcIRGmLar3H+xE8="; + url = "https://github.com/koekeishiya/yabai/releases/download/v7.1.2/yabai-v7.1.2.tar.gz"; + sha256 = "sha256-RIYo5Ilqbfs4kqYKSrztYLAqgvlPXqaEenVnMJvTWDk="; }; }; zsh-fast-syntax-highlighting = { diff --git a/flake.lock b/flake.lock index 1a5f76f..86c8879 100644 --- a/flake.lock +++ b/flake.lock @@ -17,11 +17,11 @@ ] }, "locked": { - "lastModified": 1722339003, - "narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=", + "lastModified": 1723293904, + "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", "owner": "ryantm", "repo": "agenix", - "rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7", + "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", "type": "github" }, "original": { @@ -37,11 +37,11 @@ ] }, "locked": { - "lastModified": 1722924007, - "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=", + "lastModified": 1724299755, + "narHash": "sha256-P5zMA17kD9tqiqMuNXwupkM7buM3gMNtoZ1VuJTRDE4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "91010a5613ffd7ee23ee9263213157a1c422b705", + "rev": "a8968d88e5a537b0491f68ce910749cd870bdbef", "type": "github" }, "original": { @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1722752898, - "narHash": "sha256-8BwcY0yYlUxpoqpAoeXKxVG+w97LUBp+pfzUiISOmeY=", + "lastModified": 1723962544, + "narHash": "sha256-nkBo+na4bWtstBRjwNWCapOt/LYMaBKkKddfZGkTskE=", "owner": "nix-community", "repo": "fenix", - "rev": "0caa626457f1f4f8273a89775bf9081b7fc09823", + "rev": "73b4e46c0f6e93b104f5a9c9573bd2ad0e319061", "type": "github" }, "original": { @@ -110,6 +110,28 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nixos-cosmic", + "nix-update", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -156,11 +178,11 @@ ] }, "locked": { - "lastModified": 1722630065, - "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "afc892db74d65042031a093adb6010c4c3378422", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -175,11 +197,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1722927820, - "narHash": "sha256-nX1emBgz6n5nngYt2V8gLs4kpTU7oOmKJNmj7+RS5Mc=", + "lastModified": 1724137405, + "narHash": "sha256-Yh4SyDU0Vb97gynhGOQwIZSFJgDehrDgWUKTWW8TQVM=", "owner": "nekowinston", "repo": "nur", - "rev": "01052ab4a23acffa5b407cd46d8b99af895851f2", + "rev": "8a4500ebe36c668cc60c253d1c2851ac49f78dc6", "type": "github" }, "original": { @@ -195,11 +217,11 @@ ] }, "locked": { - "lastModified": 1722740924, - "narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=", + "lastModified": 1723950649, + "narHash": "sha256-dHMkGjwwCGj0c2MKyCjRXVBXq2Sz3TWbbM23AS7/5Hc=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "97ca0a0fca0391de835f57e44f369a283e37890f", + "rev": "392828aafbed62a6ea6ccab13728df2e67481805", "type": "github" }, "original": { @@ -208,6 +230,29 @@ "type": "github" } }, + "nix-update": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": [ + "nixos-cosmic", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1724271552, + "narHash": "sha256-xn0dC4M3mfItxP+s3/v3Hz/CSKp74VH/gMfufKxl9/4=", + "owner": "Mic92", + "repo": "nix-update", + "rev": "737121eccb67542e8c004c64da833fede2e80c64", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "nix-update", + "type": "github" + } + }, "nix-vscode-extensions": { "inputs": { "flake-compat": [], @@ -219,11 +264,11 @@ ] }, "locked": { - "lastModified": 1722907736, - "narHash": "sha256-drU5kbx9EtTqg7rXc6ni0LZuZQy7l/wVgsQ8PSYl5Qw=", + "lastModified": 1724432994, + "narHash": "sha256-mGzDkfXE6cVrHcQsYOA+16FXfwkef6f5Gjh0YVLCHoY=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "b3c49142939ba6072cb8bdd6109e36d1b70a055a", + "rev": "2c15c14f9d4485b18d7cec54081bdfd76335cfc8", "type": "github" }, "original": { @@ -235,6 +280,7 @@ "nixos-cosmic": { "inputs": { "flake-compat": "flake-compat", + "nix-update": "nix-update", "nixpkgs": [ "nixpkgs" ], @@ -242,11 +288,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1723340593, - "narHash": "sha256-SYrNboypGpiFlE6g3UWdfqJeMihR0dBJPAwTwO6T64A=", + "lastModified": 1724431223, + "narHash": "sha256-m8K3mXCi6VypEMI3eirtChsaXBSJvKsoMwOXpuMqfZ4=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "94a1e5a4888ab0cb5ad0fe602d03d867a320348b", + "rev": "f4ecea2443e7905f01d06b9a00c3219c0c7799ff", "type": "github" }, "original": { @@ -257,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722421184, - "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", + "lastModified": 1723637854, + "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", + "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "type": "github" }, "original": { @@ -273,11 +319,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1722987190, - "narHash": "sha256-68hmex5efCiM2aZlAAEcQgmFI4ZwWt8a80vOeB/5w3A=", + "lastModified": 1724242322, + "narHash": "sha256-HMpK7hNjhEk4z5SFg5UtxEio9OWFocHdaQzCfW1pE7w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "21cc704b5e918c5fbf4f9fff22b4ac2681706d90", + "rev": "224042e9a3039291f22f4f2ded12af95a616cca0", "type": "github" }, "original": { @@ -289,11 +335,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "lastModified": 1724224976, + "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", "type": "github" }, "original": { @@ -305,11 +351,11 @@ }, "nur": { "locked": { - "lastModified": 1722934043, - "narHash": "sha256-x0ENypK+dOo3JDcd0czNORLaEikIcp+iNPhhIG4CZtI=", + "lastModified": 1724445072, + "narHash": "sha256-TgsUi8yQMbCwPgnkCwtp6Zz9m1uUcjnGVFH5MxPo99Q=", "owner": "nix-community", "repo": "nur", - "rev": "8aee730aaaf99ba00e8d84c9383ebb9b6fc67cc4", + "rev": "32938b2196ffbd94c848d0ebab5a027829c3080e", "type": "github" }, "original": { @@ -330,11 +376,11 @@ ] }, "locked": { - "lastModified": 1722857853, - "narHash": "sha256-3Zx53oz/MSIyevuWO/SumxABkrIvojnB7g9cimxkhiE=", + "lastModified": 1724440431, + "narHash": "sha256-9etXEOUtzeMgqg1u0wp+EdwG7RpmrAZ2yX516bMj2aE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "06939f6b7ec4d4f465bf3132a05367cccbbf64da", + "rev": "c8a54057aae480c56e28ef3e14e4960628ac495b", "type": "github" }, "original": { @@ -369,11 +415,11 @@ ] }, "locked": { - "lastModified": 1723256423, - "narHash": "sha256-9iDTrfVM+mbcad31a47oqW8t8tfSA4C/si6F8F2DO/w=", + "lastModified": 1724293269, + "narHash": "sha256-x/XhOAszT/ejditCHUtGOjQcVg2AQhrC/QVew3i7kTI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "615cfd85b4d9c51811a8d875374268fab5bd4089", + "rev": "6dc6d34a3a217457d7044dcce32b6d537480a6a1", "type": "github" }, "original": { @@ -397,6 +443,28 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixos-cosmic", + "nix-update", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719887753, + "narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "vscode-server": { "inputs": { "flake-utils": [ @@ -431,11 +499,11 @@ ] }, "locked": { - "lastModified": 1722253092, - "narHash": "sha256-37vyqHPx57deHhwvi4jwyNQLYkhm/rlVTYKOG1iahsc=", + "lastModified": 1724065442, + "narHash": "sha256-8ZUoyeO7Q70bLuijVYvToBSkApw9kfc5hMykTGxB64I=", "owner": "nix-community", "repo": "nixos-wsl", - "rev": "f373ad59ae5866f0f98216bd5c71526b373450d2", + "rev": "0bec2bfb8a2d4dd16e5b012982ca95e57d50e6a2", "type": "github" }, "original": { diff --git a/home/apps/discord/custom.css b/home/apps/discord/custom.css index 8f59778..b8d7ea2 100644 --- a/home/apps/discord/custom.css +++ b/home/apps/discord/custom.css @@ -1,5 +1,4 @@ -@import url(//dablulite.github.io/css-snippets/ConsistentChatbar/import.css); -@import url('//fonts.googleapis.com/css2?family=IBM+Plex+Mono:ital,wght@0,400;0,500;0,600;0,700;1,400;1,500;1,600;1,700&family=IBM+Plex+Sans:ital,wght@0,400;0,500;0,600;0,700;1,400;1,500;1,600;1,700&family=IBM+Plex+Serif:ital,wght@0,400;0,500;0,600;0,700;1,400;1,500;1,600;1,700&display=swap'); +@import url('//fonts.googleapis.com/css2?family=IBM+Plex+Mono:ital,wght@0,400;0,500;0,600;0,700;1,400;1,500;1,600;1,700&family=IBM+Plex+Sans:ital,wght@0,400;0,500;0,600;0,700;1,400;1,500;1,600;1,700&display=swap'); :root { --font-primary: "IBM Plex Sans", sans-serif; @@ -8,23 +7,20 @@ --font-code: "Berkeley Mono", "IBM Plex Mono", "Symbols Nerd Font", mono; } -div[class*="messageContent__"] { - font-family: "IBM Plex Serif", serif; -} - @media (max-width: 1024px) { nav[aria-label="Servers sidebar"] { display: none; } - .platform-osx div[class^="base_"] > div[class^="content_"] > div[class^="sidebar_"], - .platform-osx div[class^="base_"] > div[class^="content_"] > main[class^="container_"], - .platform-osx div[class^="base_"] > div[class^="content_"] > div[class^="chat_"] { + + .platform-osx div[class^="base_"]>div[class^="content_"]>div[class^="sidebar_"], + .platform-osx div[class^="base_"]>div[class^="content_"]>main[class^="container_"], + .platform-osx div[class^="base_"]>div[class^="content_"]>div[class^="chat_"] { padding-top: 32px !important; } } @media (max-width: 768px) { - div[class^="base_"] > div[class^="content_"] > div[class^="sidebar_"] { + div[class^="base_"]>div[class^="content_"]>div[class^="sidebar_"] { display: none; } } diff --git a/home/apps/wezterm/wezterm.lua b/home/apps/wezterm/wezterm.lua index 9840a1a..2d54d21 100644 --- a/home/apps/wezterm/wezterm.lua +++ b/home/apps/wezterm/wezterm.lua @@ -1,24 +1,25 @@ local wezterm = require("wezterm") local c = wezterm.config_builder() -local utils = require("config.utils") require("config.keys").apply(c) c.font = wezterm.font_with_fallback({ "Berkeley Mono", -- "Cascadia Code", + -- "IBM Plex Mono", + -- "Comic Code Ligatures", "Symbols Nerd Font", }) c.front_end = "WebGpu" c.font_size = 13 --- c.harfbuzz_features = { "calt=1", "ss01=1" } +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"), -} +c.window_frame = { font = wezterm.font("IBM Plex Sans") } --- c.window_background_opacity = 0.85 --- c.macos_window_background_blur = 20 +c.window_background_opacity = 0.95 +c.macos_window_background_blur = 20 + +c.default_prog = { "/etc/profiles/per-user/winston/bin/nu", "-l" } c.window_decorations = "RESIZE|INTEGRATED_BUTTONS" c.window_padding = { left = 0, right = 0, top = 50, bottom = 0 } @@ -27,14 +28,7 @@ c.audible_bell = "Disabled" c.default_cursor_style = "BlinkingBar" c.inactive_pane_hsb = { brightness = 0.90 } --- some annoying bug is causing crashes on sway -if utils.is_darwin() then - require("bar.plugin").apply_to_config(c) -end - -c.use_fancy_tab_bar = false -c.tab_bar_at_bottom = true - +require("bar.plugin").apply_to_config(c) require("milspec.plugin").apply_to_config(c, { sync = true }) -- folke/zen-mode.nvim diff --git a/home/default.nix b/home/default.nix index 5647cb0..c792e5f 100644 --- a/home/default.nix +++ b/home/default.nix @@ -23,7 +23,7 @@ in _1password age age-plugin-yubikey - deno + attic-client fd ffmpeg file @@ -33,6 +33,7 @@ in imagemagick just mdcat + minio-client nix-output-monitor nur.repos.nekowinston.icat nvd @@ -47,19 +48,17 @@ in neovide ] ); - sessionVariables = lib.mkIf isDarwin { - SSH_AUTH_SOCK = "${config.programs.gpg.homedir}/S.gpg-agent.ssh"; - }; + sessionVariables.SSH_AUTH_SOCK = lib.optionalString isDarwin "${config.programs.gpg.homedir}/S.gpg-agent.ssh"; 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" = { enable = isDarwin; - text = "Mobile Documents/"; + text = '' + Mobile Documents/ + ''; }; - - mac-wallpaper = ./wallpapers/dhm_1610.png; }; xdg.configFile = lib.mkIf isDarwin { sketchybar.source = ./apps/sketchybar; }; @@ -67,7 +66,10 @@ in programs = { home-manager.enable = true; man.enable = true; - taskwarrior.enable = true; + taskwarrior = { + enable = true; + package = pkgs.taskwarrior3; + }; }; age.secrets."wakatime.cfg".path = "${config.home.sessionVariables.WAKATIME_HOME}/.wakatime.cfg"; diff --git a/pkgs/patches/discord-applemusic-rich-presence.patch b/pkgs/patches/discord-applemusic-rich-presence.patch deleted file mode 100644 index 13a13e4..0000000 --- a/pkgs/patches/discord-applemusic-rich-presence.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/main.go b/main.go -index a46575c..e9272d5 100644 ---- a/main.go -+++ b/main.go -@@ -21,7 +21,7 @@ const statePlaying = "playing" - - var ( - shortSleep = 5 * time.Second -- longSleep = time.Minute -+ longSleep = shortSleep - songCache = ttlcache.New(time.Minute) - artworkCache = ttlcache.New(time.Minute) - shareURLCache = ttlcache.New(time.Minute)