diff --git a/flake.lock b/flake.lock index 58dde1b..92084c9 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1781226006, - "narHash": "sha256-w4ZTuOnhYiDxjaynrMTASzp802QblBWmo3wpB8wVN4Y=", + "lastModified": 1784558651, + "narHash": "sha256-woXJ1ATKpSYRWCy46TQJjmm9XzAeZVEZw9xDfVG9NYI=", "owner": "Homebrew", "repo": "brew", - "rev": "109191be4988470b51a60a5ef1998520aa24c01b", + "rev": "b48c7994b5f0eed7bef532efa63cb4e4f763887a", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "6.0.1", + "ref": "6.0.12", "repo": "brew", "type": "github" } @@ -22,11 +22,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1783674541, - "narHash": "sha256-vmUhEF/jBCZJeK0dInOls+HOAR0yiiQusN1+FZKaJss=", + "lastModified": 1784366307, + "narHash": "sha256-VKatYOZwLQ+MuNkWH6/gZYxrNeSK1Mqb7mC0H1WSu+M=", "owner": "catppuccin", "repo": "nix", - "rev": "96799f24cf1366fe88e1293c3d27521a8f2129cf", + "rev": "673f730d0fc8db3468c51575f1d3d777cc55e51f", "type": "github" }, "original": { @@ -41,11 +41,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1783838629, - "narHash": "sha256-Va46EySvmN/ya+wEgvfLffzHIW19HEiaKJ/zBujm1pQ=", + "lastModified": 1784918709, + "narHash": "sha256-UWCaJUKkAOUH7+TvC//uhJItpEDmPFJ5dOoptyAFJxM=", "owner": "ilysenko", "repo": "codex-desktop-linux", - "rev": "a6af5ef8511d908ff8e9c5bc3f706027132ef74b", + "rev": "66c780a6939b1f35aa3d90c5ad07ff2b35f1f644", "type": "github" }, "original": { @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1783395956, - "narHash": "sha256-AAbexQvDoK+6GFJdhY6kqjA+6ECKRkidgWxkn4gMwAA=", + "lastModified": 1784500460, + "narHash": "sha256-UvORnAxTRHax7RG74W8Z2t4GvIkX6AjJ5kk0QlwZomo=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "d5bd9cd77aea4c0a8f49e7fd85545671a208ed15", + "rev": "57a3171f94705599a2499248ca5758d5eb47c0e0", "type": "github" }, "original": { @@ -161,11 +161,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -192,24 +192,6 @@ "type": "github" } }, - "flake-utils_4": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -217,11 +199,11 @@ ] }, "locked": { - "lastModified": 1783823409, - "narHash": "sha256-OI4IkRjRXa1e7hYmCGJDPDq5H/kPwhsyoS80cNUF9fI=", + "lastModified": 1784913159, + "narHash": "sha256-JWq0BfjO4ktpH5USfQNQzdvHpIDT8fSKD5K7LvdMRFs=", "owner": "nix-community", "repo": "home-manager", - "rev": "7566825d4652a1b885bd4ce65bd9e8def432fec9", + "rev": "079a3b5d1aa6a719920a51316253b7d6dd22738d", "type": "github" }, "original": { @@ -250,7 +232,7 @@ }, "imnyang_2": { "inputs": { - "nixpkgs": "nixpkgs_15" + "nixpkgs": "nixpkgs_14" }, "locked": { "lastModified": 1778582554, @@ -273,11 +255,11 @@ }, "locked": { "dir": "packages/nix", - "lastModified": 1783532163, - "narHash": "sha256-n+YQKnVt0H1B2z6N1PmaadeVorRHi956q48/g2y8Hnc=", + "lastModified": 1784860807, + "narHash": "sha256-nznQFS9H8er9bTwxKG4LSa2D0lGsxIPUqDuWa1rbJkA=", "owner": "SteamClientHomebrew", "repo": "Millennium", - "rev": "3623ed0ed9f6065ce666cb0276ff0b903fee2355", + "rev": "266e41ea8924c41e51145ae986a9bdf68f9415d9", "type": "github" }, "original": { @@ -361,11 +343,11 @@ "brew-src": "brew-src" }, "locked": { - "lastModified": 1781389246, - "narHash": "sha256-ORqLAo/hoJdsZC7UPAuEHev6S0+XIqKEC7vjo5prz1k=", + "lastModified": 1784906761, + "narHash": "sha256-2v0H8+Ert+xbm0oliHblXTPPczuKiibBUBvRax59kxg=", "owner": "zhaofengli", "repo": "nix-homebrew", - "rev": "de7953a08ed4bb9245be043e468561c17b89130d", + "rev": "60623ec512406261f553d24033c8a0c53fd0b7f2", "type": "github" }, "original": { @@ -382,11 +364,11 @@ "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1783764089, - "narHash": "sha256-AzoohteEEymQ+m3fAXlQJ+mkFLQ9XjPRqSlgqJ7TLGY=", + "lastModified": 1784923257, + "narHash": "sha256-rxilKSeFG750HjJYCxkrLlVLXXSFWb85qcodvdI48j4=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "f3c556542c423b5e790a94d0337a80cede816620", + "rev": "8673218cf5f13399afee9e01ebcb0648f0714316", "type": "github" }, "original": { @@ -401,11 +383,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1783336371, - "narHash": "sha256-ZisTtweyb7JUwPP54HAXE9TypT8m89dIxDI36Ak0hAs=", + "lastModified": 1784642409, + "narHash": "sha256-hcbDqFuySAJawljt5r0sKBCJKYnbtGD0T/ZIozH1Dq0=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "a9620cfa43f0c1c30a46c31ae3c6e58cdb124a14", + "rev": "eaeb18da90024448a60eb1ec7132eafa4003404e", "type": "github" }, "original": { @@ -477,11 +459,11 @@ }, "nixpkgs-nixcord": { "locked": { - "lastModified": 1782999065, - "narHash": "sha256-5Dgj5+pIQYZKrXUGaLCk7CKfN3MmpwIhO94++WVxvng=", + "lastModified": 1784432872, + "narHash": "sha256-n3gKTBIV4ZA5VQpUakffBe3KGu4+mhPoA34rrqS0GkA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "80d591ed473cfc46329932c2aadac9b435342c7c", + "rev": "fd1462031fdee08f65fd0b4c6b64e22239a77870", "type": "github" }, "original": { @@ -492,22 +474,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1772963539, "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", @@ -523,20 +489,20 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { - "lastModified": 1783776592, - "narHash": "sha256-+GVwKnbbSmf4cWMJyRzvw8H5yFknmkLoPD5v6snqPzo=", - "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", + "lastModified": 1784356753, + "narHash": "sha256-zupdTm41be2fY8cexroEOGjopl3F2Gqs3gk7ieqaM3s=", + "rev": "61b7c44c4073f0b827768aff0049561b5110ea5a", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1032869.e7a3ca8092b6/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1036777.61b7c44c4073/nixexprs.tar.xz" }, "original": { "type": "tarball", "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1772542754, "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=", @@ -552,7 +518,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1778869304, "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", @@ -568,7 +534,7 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_14": { "locked": { "lastModified": 1777954456, "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", @@ -666,11 +632,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1782999065, - "narHash": "sha256-5Dgj5+pIQYZKrXUGaLCk7CKfN3MmpwIhO94++WVxvng=", + "lastModified": 1784432872, + "narHash": "sha256-n3gKTBIV4ZA5VQpUakffBe3KGu4+mhPoA34rrqS0GkA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "80d591ed473cfc46329932c2aadac9b435342c7c", + "rev": "fd1462031fdee08f65fd0b4c6b64e22239a77870", "type": "github" }, "original": { @@ -682,11 +648,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1780243769, - "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", + "lastModified": 1783776592, + "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", + "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", "type": "github" }, "original": { @@ -698,11 +664,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1783776592, - "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=", + "lastModified": 1784796856, + "narHash": "sha256-wWFrV5/Qbm+lyt5x20E/bSbfJiGKMo4RCxZV8cl/WZI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", + "rev": "e2587caef70cea85dd97d7daab492899902dbf5d", "type": "github" }, "original": { @@ -712,28 +678,9 @@ "type": "github" } }, - "notion-calendar-electron": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_10" - }, - "locked": { - "lastModified": 1764778294, - "narHash": "sha256-kYex7JjucpAMxOvLL9GbXxqgHcB4qhOMSE2VlNw7udI=", - "owner": "czlabinger", - "repo": "notion-calendar-electron", - "rev": "7e01efb90361048b27220abb9b9e703ab705d05d", - "type": "github" - }, - "original": { - "owner": "czlabinger", - "repo": "notion-calendar-electron", - "type": "github" - } - }, "notion-desktop": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] @@ -754,8 +701,8 @@ }, "paring": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_11" + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1773918161, @@ -825,7 +772,6 @@ "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs_9", "nixpkgs-2511": "nixpkgs-2511", - "notion-calendar-electron": "notion-calendar-electron", "notion-desktop": "notion-desktop", "paring": "paring", "plasma-manager": "plasma-manager", @@ -845,11 +791,11 @@ ] }, "locked": { - "lastModified": 1781317333, - "narHash": "sha256-qnjeFFELEyOO0vkubMB96WCuFzkvftTZ/LE/VctU+SE=", + "lastModified": 1784874492, + "narHash": "sha256-E4kC+rya1KfPpDGWtq+E3Ka4HoJGVIo5f9ZsHzYivUs=", "owner": "rustfs", "repo": "rustfs-flake", - "rev": "1d3ef7296a7b22b4b9849d0766f53a0300bce893", + "rev": "7dedccc7160410a325f922ed8591d90152a261b7", "type": "github" }, "original": { @@ -880,7 +826,7 @@ }, "soulver-cpp": { "inputs": { - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_13", "nixpkgs-libxml2": "nixpkgs-libxml2" }, "locked": { @@ -899,15 +845,15 @@ }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_12", - "systems": "systems_5" + "nixpkgs": "nixpkgs_11", + "systems": "systems_4" }, "locked": { - "lastModified": 1783838433, - "narHash": "sha256-Zb8+v76qSPYDlUea1y30YzgdEoDjA97vRmeqfPAqwZs=", + "lastModified": 1784481035, + "narHash": "sha256-nC0QN+GPTnA5i+WBx8S2rG8+VFh+EeBnEe5mU3hlAcQ=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "c6ab7371e40abd405313af9bddafd5f37cc94f83", + "rev": "a6baa7464f9b21a106dcfabb0bdcfe96fb434409", "type": "github" }, "original": { @@ -1006,33 +952,18 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "vicinae": { "inputs": { - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_12", "soulver-cpp": "soulver-cpp", - "systems": "systems_6" + "systems": "systems_5" }, "locked": { - "lastModified": 1783794047, - "narHash": "sha256-TOV9S62H66hItUcsjaGcmjknCqZJ/gN7EPRmwS7jh9w=", + "lastModified": 1784925088, + "narHash": "sha256-YKL4+O7T9nr+V+Mo14XX3+/nfwT8dEzoXk+9Zqpl/7g=", "owner": "vicinaehq", "repo": "vicinae", - "rev": "e7e34695371737b371d6488c7f680b436d82093e", + "rev": "63c5af41338dc278505d7a0007673246a195ac1a", "type": "github" }, "original": { @@ -1047,15 +978,15 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_7", + "systems": "systems_6", "vicinae": "vicinae_2" }, "locked": { - "lastModified": 1783009133, - "narHash": "sha256-Non+frT3WG0TN60zCq63m8+d7yNmCCMaI363kZaDmPM=", + "lastModified": 1784504910, + "narHash": "sha256-fzPBEJZiRvc/FNMdpbdcfaZzF01U4IQenHW9IQFzhos=", "owner": "vicinaehq", "repo": "extensions", - "rev": "afb84fe4b5253777ff82db8e19e6cc0c9b7f811f", + "rev": "ca74eede9a778a9373c8f5fd221b0a5026dcd1ef", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1dfc4e6..123cb4c 100644 --- a/flake.nix +++ b/flake.nix @@ -47,7 +47,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - notion-calendar-electron.url = "github:czlabinger/notion-calendar-electron"; + # notion-calendar-electron.url = "github:czlabinger/notion-calendar-electron"; millennium.url = "github:SteamClientHomebrew/Millennium?dir=packages/nix"; diff --git a/hosts/machine/ena/configuration.nix b/hosts/machine/ena/configuration.nix index 97ba92a..c7aa3e4 100644 --- a/hosts/machine/ena/configuration.nix +++ b/hosts/machine/ena/configuration.nix @@ -25,6 +25,7 @@ "${inputs.self}/modules/mizukios/features/system/graphics.nix" "${inputs.self}/modules/mizukios/features/steam.nix" "${inputs.self}/modules/mizukios/features/remote/ssh.nix" + "${inputs.self}/modules/mizukios/features/_1password.nix" ]; catppuccin.flavor = lib.mkForce "mocha"; diff --git a/hosts/machine/ena/home/default.nix b/hosts/machine/ena/home/default.nix index d4e8116..b411b77 100644 --- a/hosts/machine/ena/home/default.nix +++ b/hosts/machine/ena/home/default.nix @@ -26,6 +26,7 @@ "${inputs.self}/modules/home/spicetify.nix" "${inputs.self}/modules/home/devtool/ghostty.nix" "${inputs.self}/modules/home/devtool/zed.nix" + "${inputs.self}/modules/home/firefox-devedition.nix" "${inputs.self}/modules/home/discord/linux.nix" "${inputs.self}/modules/home/devtool/vscode.nix" "${inputs.self}/modules/home/devtool/ciscopackettracer.nix" diff --git a/hosts/machine/kanade/home/default.nix b/hosts/machine/kanade/home/default.nix index c57cb0d..33360d7 100644 --- a/hosts/machine/kanade/home/default.nix +++ b/hosts/machine/kanade/home/default.nix @@ -21,6 +21,7 @@ "${inputs.self}/modules/home/devtool/neovim.nix" "${inputs.self}/modules/home/devtool/ghostty.nix" "${inputs.self}/modules/home/devtool/zed.nix" + "${inputs.self}/modules/home/firefox-devedition.nix" ./config/git.nix ./config/shell.nix ]; diff --git a/hosts/machine/kanade/modules/homebrew/casks.nix b/hosts/machine/kanade/modules/homebrew/casks.nix index e52106c..08ad7f2 100644 --- a/hosts/machine/kanade/modules/homebrew/casks.nix +++ b/hosts/machine/kanade/modules/homebrew/casks.nix @@ -3,7 +3,6 @@ "1password" "cloudflare-warp" "protonvpn" - "microsoft-edge@canary" # Communication "discord" @@ -12,6 +11,9 @@ "signal" "zoom" + # Browsers + "firefox@developer-edition" + # Productivity and design "camo-studio" "proton-drive" diff --git a/hosts/machine/kanade/modules/mac/dock.nix b/hosts/machine/kanade/modules/mac/dock.nix index c52c081..111b501 100644 --- a/hosts/machine/kanade/modules/mac/dock.nix +++ b/hosts/machine/kanade/modules/mac/dock.nix @@ -11,7 +11,6 @@ persistent-apps = [ "/System/Applications/Apps.app" - "/Applications/Microsoft Edge Canary.app" "/Applications/Discord.app" "/Applications/KakaoTalk.app" "/Applications/Signal.app" diff --git a/hosts/machine/mafuyu/configuration.nix b/hosts/machine/mafuyu/configuration.nix index b4fe2be..f1d8a67 100644 --- a/hosts/machine/mafuyu/configuration.nix +++ b/hosts/machine/mafuyu/configuration.nix @@ -13,6 +13,7 @@ "${inputs.self}/modules/mizukios/features/remote/ssh.nix" "${inputs.self}/modules/mizukios/features/steam.nix" "${inputs.self}/modules/mizukios/features/remote/sunshine.nix" + "${inputs.self}/modules/mizukios/features/_1password.nix" ]; networking = { diff --git a/hosts/machine/mafuyu/home/default.nix b/hosts/machine/mafuyu/home/default.nix index adc822c..170e7e7 100644 --- a/hosts/machine/mafuyu/home/default.nix +++ b/hosts/machine/mafuyu/home/default.nix @@ -36,6 +36,7 @@ "${inputs.self}/modules/home/devtool/neovim.nix" "${inputs.self}/modules/home/devtool/ghostty.nix" "${inputs.self}/modules/home/devtool/zed.nix" + "${inputs.self}/modules/home/firefox-devedition.nix" "${inputs.self}/modules/home/discord/linux.nix" ./config/shell.nix ./config/plasma.nix diff --git a/hosts/machine/mafuyu/home/packages.nix b/hosts/machine/mafuyu/home/packages.nix index 3891ec6..3831639 100644 --- a/hosts/machine/mafuyu/home/packages.nix +++ b/hosts/machine/mafuyu/home/packages.nix @@ -4,5 +4,4 @@ with pkgs; pjsk-cursor.n25.ani codex inputs.codex-app.packages.${stdenv.buildPlatform.system}.codex-desktop - microsoft-edge ] diff --git a/hosts/machine/mizuki/configuration.nix b/hosts/machine/mizuki/configuration.nix index 292164d..8c93bcd 100644 --- a/hosts/machine/mizuki/configuration.nix +++ b/hosts/machine/mizuki/configuration.nix @@ -19,6 +19,7 @@ "${inputs.self}/modules/mizukios/features/steam.nix" "${inputs.self}/modules/mizukios/features/remote/sunshine.nix" "${inputs.self}/modules/mizukios/features/waydroid.nix" + "${inputs.self}/modules/mizukios/features/_1password.nix" ]; networking = { diff --git a/hosts/machine/mizuki/home/default.nix b/hosts/machine/mizuki/home/default.nix index fe57254..0b86dbd 100644 --- a/hosts/machine/mizuki/home/default.nix +++ b/hosts/machine/mizuki/home/default.nix @@ -26,6 +26,7 @@ "${inputs.self}/modules/home/spicetify.nix" "${inputs.self}/modules/home/devtool/ghostty.nix" "${inputs.self}/modules/home/devtool/zed.nix" + "${inputs.self}/modules/home/firefox-devedition.nix" "${inputs.self}/modules/home/vicinae.nix" "${inputs.self}/modules/home/fastfetch.nix" ./config/shell.nix diff --git a/hosts/server/kazusa/configuration.nix b/hosts/server/kazusa/configuration.nix index 8eac76c..855cc5c 100644 --- a/hosts/server/kazusa/configuration.nix +++ b/hosts/server/kazusa/configuration.nix @@ -14,7 +14,6 @@ ./services/caddy.nix ]; - # Override shared boot.nix for Legacy BIOS boot.loader.grub.enableCryptodisk = lib.mkForce false; services.netbird.enable = true; diff --git a/hosts/server/natsu/configuration.nix b/hosts/server/natsu/configuration.nix index d30a171..46b08db 100644 --- a/hosts/server/natsu/configuration.nix +++ b/hosts/server/natsu/configuration.nix @@ -13,22 +13,17 @@ ipv6 = true; }; - # 2. 크론 설정 services.cron = { enable = true; - systemCronJobs = [ - "1 0 * * * imnyang * * * * * printf '\n%s : ' '$(date)' >> /home/imnyang/codelounge.log && /home/imnyang/codelounge.sh >> /home/imnyang/codelounge.log" - ]; }; services.netbird.enable = true; - # 3. 사용자 SSH 키 등록 users.users.imnyang.openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOHP3Z+AYrRh9f8TYyqChKfeyNm3lOe0F75AwRHTTaxD imnyang@kazusa" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIrpjEYOBx7LTGb7QsPrmPBboqyTUNm/e+4+yqWruljv imnyang@natsu" - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDNH9+KCZmlrkRsscGsDHLQJNUXW1km0aIr4gAnG8jpbI+LCgtdILd/aDOzNVM2MVJSRnn+USnf++QAFQxPNwkuG+PhJ+ZOwQnJpr27LFYDvtWh/c0IsBapmzPLkacmAc8D+CpBCLiK51OrlGtuV0etjfAj08BfTSGq2U9O7ksZohl/JHkRyIEZxRUnGqSA1oAkayByMUor9p2e1kSUCjO+S1u8CNphU+XBx+Fll49Y+rGjFYm3vEdznoDpz/Ho5lgndoOasGQqNGA+LWsp5Ap3e8xMsRIQy53HSwhY0kaWmaQYdovGBF5Eq7bgu5gdDXgq261gcArqteBCCgnrh8Fp jongyeol@furry" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOFmyMQERIYmVzuKRohPpJlIgA0d/WCL3hVPfiNxqN5A crackthrough@heart" + # "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDNH9+KCZmlrkRsscGsDHLQJNUXW1km0aIr4gAnG8jpbI+LCgtdILd/aDOzNVM2MVJSRnn+USnf++QAFQxPNwkuG+PhJ+ZOwQnJpr27LFYDvtWh/c0IsBapmzPLkacmAc8D+CpBCLiK51OrlGtuV0etjfAj08BfTSGq2U9O7ksZohl/JHkRyIEZxRUnGqSA1oAkayByMUor9p2e1kSUCjO+S1u8CNphU+XBx+Fll49Y+rGjFYm3vEdznoDpz/Ho5lgndoOasGQqNGA+LWsp5Ap3e8xMsRIQy53HSwhY0kaWmaQYdovGBF5Eq7bgu5gdDXgq261gcArqteBCCgnrh8Fp jongyeol@furry" + # "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOFmyMQERIYmVzuKRohPpJlIgA0d/WCL3hVPfiNxqN5A crackthrough@heart" ]; environment.systemPackages = with pkgs; [ @@ -76,22 +71,12 @@ networking.firewall.allowedTCPPorts = [ 22 # default ssh port - 3022 # alternative ssh port - 80 443 12345 + 35353 ]; - - services.openssh = { - ports = [ - 22 - 3022 - ]; - }; - - networking.hostName = "natsu"; system.stateVersion = "26.05"; } diff --git a/modules/home/firefox-devedition.nix b/modules/home/firefox-devedition.nix new file mode 100644 index 0000000..8ed8f1d --- /dev/null +++ b/modules/home/firefox-devedition.nix @@ -0,0 +1,258 @@ +{ pkgs, lib, ... }: + +let + inherit (pkgs.stdenv.hostPlatform) isDarwin isLinux; + + extensionUrl = "https://git.mizuki.guru/imnyang/thisiswindowsfigma/releases/download/v1.0.0/d168a70cb6a24fe4a478-1.0.0.xpi"; + extensionId = "figma-windows-ua-spoofer@imnyang.local"; + + profileName = "imnyang"; + darwinProfilePath = "Profiles/${profileName}"; + + firefoxSettings = { + "toolkit.legacyUserProfileCustomizations.stylesheets" = true; + "browser.uidensity" = 0; + "browser.theme.dark-private-windows" = false; + }; + + userChrome = '' + :root { + --mizuki-bg: #fcf8f9; + --mizuki-fg: #191017; + --mizuki-muted: #707d8a; + --mizuki-border: #f2e6ea; + --mizuki-surface: #fdf7f9; + --mizuki-hover: #8165700f; + --mizuki-active: #8165701a; + --mizuki-selection: #ecb7d5; + } + + @media (prefers-color-scheme: dark) { + :root { + --mizuki-bg: #191017; + --mizuki-fg: #fafafa; + --mizuki-muted: #a9a9b1; + --mizuki-border: #2c1f2d; + --mizuki-surface: #191017; + --mizuki-hover: #2c1f2d80; + --mizuki-active: #2c1f2d; + --mizuki-selection: #604562; + } + } + + #navigator-toolbox, + #TabsToolbar, + #nav-bar, + #PersonalToolbar, + #sidebar-box, + #sidebar-header { + background-color: var(--mizuki-bg) !important; + color: var(--mizuki-fg) !important; + } + + #navigator-toolbox { + border-bottom: 1px solid var(--mizuki-border) !important; + } + + #urlbar-background, + #searchbar { + background-color: var(--mizuki-surface) !important; + border-color: var(--mizuki-border) !important; + color: var(--mizuki-fg) !important; + } + + #urlbar[focused] > #urlbar-background, + #searchbar:focus-within { + border-color: var(--mizuki-selection) !important; + box-shadow: 0 0 0 1px var(--mizuki-selection) !important; + } + + .tab-background { + border-radius: 10px 10px 0 0 !important; + } + + .tab-background[selected] { + background-color: var(--mizuki-active) !important; + } + + .tabbrowser-tab:not([selected]):hover .tab-background, + toolbarbutton:hover, + #urlbar:hover > #urlbar-background { + background-color: var(--mizuki-hover) !important; + } + + toolbarbutton[open], + toolbarbutton[checked], + toolbarbutton:active { + background-color: var(--mizuki-active) !important; + } + + #TabsToolbar .tabbrowser-tab, + #urlbar-input, + #identity-icon-label, + toolbarbutton { + color: var(--mizuki-fg) !important; + } + + .tabbrowser-tab:not([selected]) .tab-label, + #sidebar-title { + color: var(--mizuki-muted) !important; + } + ''; + + userContent = '' + @-moz-document url("about:home"), url("about:newtab"), url("about:privatebrowsing") { + body, + .outer-wrapper, + .activity-stream { + background: #fcf8f9 !important; + color: #191017 !important; + } + + @media (prefers-color-scheme: dark) { + body, + .outer-wrapper, + .activity-stream { + background: #191017 !important; + color: #fafafa !important; + } + } + } + ''; + + userJs = lib.concatStringsSep "\n" ( + lib.mapAttrsToList (name: value: ''user_pref(${builtins.toJSON name}, ${builtins.toJSON value});'') firefoxSettings + ) + "\n"; +in +lib.mkMerge [ + (lib.mkIf isLinux { + programs.firefox = { + enable = true; + package = pkgs.firefox-devedition; + + policies = { + DisableAppUpdate = true; + ExtensionSettings = { + ${extensionId} = { + installation_mode = "force_installed"; + install_url = extensionUrl; + }; + }; + }; + + profiles.${profileName} = { + id = 0; + name = profileName; + path = "${profileName}.default"; + isDefault = true; + + settings = firefoxSettings; + inherit userChrome userContent; + }; + }; + + xdg.mimeApps.defaultApplications = { + "text/html" = [ "firefox-devedition.desktop" ]; + "x-scheme-handler/http" = [ "firefox-devedition.desktop" ]; + "x-scheme-handler/https" = [ "firefox-devedition.desktop" ]; + "x-scheme-handler/about" = [ "firefox-devedition.desktop" ]; + "x-scheme-handler/unknown" = [ "firefox-devedition.desktop" ]; + }; + }) + + (lib.mkIf isDarwin { + home.activation.configureFirefoxDeveloperEdition = lib.hm.dag.entryAfter [ "writeBoundary" ] '' + firefox_dir="$HOME/Library/Application Support/Firefox" + profiles_ini="$firefox_dir/profiles.ini" + + mkdir -p "$firefox_dir/Profiles" + + profile_info="" + if [ -f "$profiles_ini" ]; then + profile_info=$( + awk ' + function flush() { + if (in_profile && path != "") { + if (is_default == "1") { + print is_relative "|" path + found = 1 + exit + } + if (first == "") { + first = is_relative "|" path + } + } + } + BEGIN { in_profile = 0; is_relative = "1" } + /^\\[Profile[0-9]+\\]$/ { flush(); in_profile = 1; path = ""; is_default = "0"; is_relative = "1"; next } + /^\\[/ { flush(); in_profile = 0; next } + in_profile && /^Path=/ { path = substr($0, 6); next } + in_profile && /^Default=1$/ { is_default = "1"; next } + in_profile && /^IsRelative=/ { is_relative = substr($0, 12); next } + END { + if (!found) { + flush() + } + if (!found && first != "") { + print first + } + } + ' "$profiles_ini" + ) + fi + + if [ -n "$profile_info" ]; then + is_relative="''${profile_info%%|*}" + profile_path="''${profile_info#*|}" + if [ "$is_relative" = "1" ]; then + profile_dir="$firefox_dir/$profile_path" + else + profile_dir="$profile_path" + fi + else + profile_dir="$firefox_dir/${darwinProfilePath}" + cat > "$profiles_ini" <<'EOF' +[Profile0] +Name=${profileName} +IsRelative=1 +Path=${darwinProfilePath} +Default=1 + +[General] +StartWithLastProfile=1 +Version=2 +EOF + fi + + mkdir -p "$profile_dir/chrome" + cp ${pkgs.writeText "firefox-devedition-user.js" userJs} "$profile_dir/user.js" + cp ${pkgs.writeText "firefox-devedition-userChrome.css" userChrome} "$profile_dir/chrome/userChrome.css" + cp ${pkgs.writeText "firefox-devedition-userContent.css" userContent} "$profile_dir/chrome/userContent.css" + ''; + + home.file = { + "Library/Preferences/org.mozilla.firefoxdeveloperedition.plist".text = '' + + + + + EnterprisePoliciesEnabled + + DisableAppUpdate + + ExtensionSettings + + ${extensionId} + + installation_mode + force_installed + install_url + ${extensionUrl} + + + + + ''; + }; + }) +] diff --git a/modules/home/packages.nix b/modules/home/packages.nix index fd4562b..1916e6d 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -86,7 +86,7 @@ with pkgs; )) inputs.notion-desktop.packages.${stdenv.hostPlatform.system}.default - inputs.notion-calendar-electron.packages.${stdenv.hostPlatform.system}.default + # inputs.notion-calendar-electron.packages.${stdenv.hostPlatform.system}.default inputs.codex-app.packages.${stdenv.buildPlatform.system}.codex-desktop proton-vpn @@ -98,8 +98,6 @@ with pkgs; code-cursor - microsoft-edge - galaxy-buds-client # another diff --git a/modules/mizukios/features/_1password.nix b/modules/mizukios/features/_1password.nix new file mode 100644 index 0000000..ce347ce --- /dev/null +++ b/modules/mizukios/features/_1password.nix @@ -0,0 +1,17 @@ +{ config, pkgs, ... }: +{ + programs._1password.enable = true; + programs._1password-gui = { + enable = true; + polkitPolicyOwners = [ "imnyang" ]; + }; + + environment.etc = { + "1password/custom_allowed_browsers" = { + text = '' + firefox-devedition + ''; + mode = "0755"; + }; + }; +} diff --git a/modules/mizukios/features/packages.nix b/modules/mizukios/features/packages.nix index e399d8b..ced0178 100644 --- a/modules/mizukios/features/packages.nix +++ b/modules/mizukios/features/packages.nix @@ -8,23 +8,6 @@ let nrr = import ./packages/nrr.nix { inherit pkgs; }; in { - programs._1password.enable = true; - programs._1password-gui = { - enable = true; - polkitPolicyOwners = [ "imnyang" ]; - }; - - environment.etc = { - "1password/custom_allowed_browsers" = { - text = '' - microsoft-edge - firefox-devedition - ''; - mode = "0755"; - }; - }; - - # 시스템 전역 패키지 (데스크탑/개발용) environment.systemPackages = with pkgs; [ nr nrr