From 4d3e1beaf6632d8f8ac299840a8429b4660fcef2 Mon Sep 17 00:00:00 2001 From: imnyang Date: Sun, 16 Aug 2026 14:38:32 +0900 Subject: [PATCH] wow --- flake.lock | 10 +++++----- flake.nix | 3 +-- hosts/machine/kanade/modules/homebrew/casks.nix | 2 -- hosts/machine/kanade/modules/mac/dock.nix | 3 ++- hosts/machine/kanade/modules/mac/wallpaper.nix | 2 +- hosts/machine/kanade/modules/nix.nix | 4 ++-- modules/home/discord/mac.nix | 5 +---- modules/mizukios/base/nix.nix | 8 ++++---- 8 files changed, 16 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index f31b9a9..d07ced2 100644 --- a/flake.lock +++ b/flake.lock @@ -366,15 +366,15 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1786251505, - "narHash": "sha256-LFU9VIQp9i9woVUyyuHNZbaPiw7sD//lsn4S0awg/Gw=", - "owner": "FlameFlag", + "lastModified": 1786767826, + "narHash": "sha256-4iyzSHy8YJN4GLtSBjLemNDTCZuZW16q3RvllSTjTtg=", + "owner": "4evy", "repo": "nixcord", - "rev": "a2c231759b0853d7b4adcef94860af472c5ce0fb", + "rev": "0d7dc7ca169f7d453216b0bafbad2a43211e8c3c", "type": "github" }, "original": { - "owner": "FlameFlag", + "owner": "4evy", "repo": "nixcord", "type": "github" } diff --git a/flake.nix b/flake.nix index 3981714..051996b 100644 --- a/flake.nix +++ b/flake.nix @@ -34,8 +34,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixcord.url = "github:FlameFlag/nixcord"; - # nixcord.url = "path:/home/imnyang/workspaces/git/imnyang/nixcord"; + nixcord.url = "github:4evy/nixcord"; vscode-nigo = { url = "git+https://git.pari.ng/imnyang/vscode-nigo.git?ref=main"; diff --git a/hosts/machine/kanade/modules/homebrew/casks.nix b/hosts/machine/kanade/modules/homebrew/casks.nix index b744018..d936c74 100644 --- a/hosts/machine/kanade/modules/homebrew/casks.nix +++ b/hosts/machine/kanade/modules/homebrew/casks.nix @@ -5,8 +5,6 @@ "protonvpn" # Communication - "discord" - "discord@canary" "proton-mail" "signal" "zoom" diff --git a/hosts/machine/kanade/modules/mac/dock.nix b/hosts/machine/kanade/modules/mac/dock.nix index 111b501..26924d6 100644 --- a/hosts/machine/kanade/modules/mac/dock.nix +++ b/hosts/machine/kanade/modules/mac/dock.nix @@ -11,7 +11,8 @@ persistent-apps = [ "/System/Applications/Apps.app" - "/Applications/Discord.app" + "/Applications/Firefox Developer Edition.app" + "/Applications/Nix Apps/Discord Canary.app" "/Applications/KakaoTalk.app" "/Applications/Signal.app" "/Applications/Proton Mail.app" diff --git a/hosts/machine/kanade/modules/mac/wallpaper.nix b/hosts/machine/kanade/modules/mac/wallpaper.nix index bb3847f..c39fa0c 100644 --- a/hosts/machine/kanade/modules/mac/wallpaper.nix +++ b/hosts/machine/kanade/modules/mac/wallpaper.nix @@ -4,7 +4,7 @@ ... }: let - wallpaper = "${inputs.self}/assets/wallpaper/wallpaper1.jpg"; + wallpaper = "${inputs.self}/assets/wallpaper/wallpaper5.png"; setWallpaperScript = pkgs.writeShellScriptBin "set-wallpaper-script" '' set -eu diff --git a/hosts/machine/kanade/modules/nix.nix b/hosts/machine/kanade/modules/nix.nix index 4f7e202..0313eb4 100644 --- a/hosts/machine/kanade/modules/nix.nix +++ b/hosts/machine/kanade/modules/nix.nix @@ -14,11 +14,11 @@ "imnyang" ]; substituters = [ - "https://cache.mizuki.guru" + # "https://cache.mizuki.guru" "https://nix.mizuki.my/public" ]; trusted-public-keys = [ - "cache.mizuki.guru-1:EbUC9b0ryD7BJKqfT8fl4GoS2ojLV+hI9fW1al5Whp0=" + # "cache.mizuki.guru-1:EbUC9b0ryD7BJKqfT8fl4GoS2ojLV+hI9fW1al5Whp0=" "public:SnHrtrxbCPcZujbJdgsKFeObTfRKQl5KhrI+LljtZUE=" ]; }; diff --git a/modules/home/discord/mac.nix b/modules/home/discord/mac.nix index b1497a5..34c6fd7 100644 --- a/modules/home/discord/mac.nix +++ b/modules/home/discord/mac.nix @@ -9,13 +9,10 @@ discord = { package = pkgs.discord-canary; - vencord.enable = false; equicord.enable = true; - # krisp.enable = true; + branches = [ "canary" ]; }; - equibop.enable = true; - config.plugins = import ./plugin.nix; }; diff --git a/modules/mizukios/base/nix.nix b/modules/mizukios/base/nix.nix index fe37247..dc7e2d4 100644 --- a/modules/mizukios/base/nix.nix +++ b/modules/mizukios/base/nix.nix @@ -21,14 +21,14 @@ nix.settings = { substituters = [ - "https://cache.mizuki.guru/public" - "https://cache.mizuki.guru/imnyang" + # "https://cache.mizuki.guru/public" + # "https://cache.mizuki.guru/imnyang" "https://nix.mizuki.my/public" "https://vicinae.cachix.org" ]; trusted-public-keys = [ - "public:IgipakDD/clr0XbuaIejPYMT5UkTVGKVTxtWXcsbiAg=" - "imnyang:x8Oex2DLzZUBxS/3VvkVptT3DiugjsCbQ23VjsxMT5c=" + # "public:IgipakDD/clr0XbuaIejPYMT5UkTVGKVTxtWXcsbiAg=" + # "imnyang:x8Oex2DLzZUBxS/3VvkVptT3DiugjsCbQ23VjsxMT5c=" "public:SnHrtrxbCPcZujbJdgsKFeObTfRKQl5KhrI+LljtZUE=" "vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc=" ];