diff --git a/flake.lock b/flake.lock index d2745e6..79aefc0 100644 --- a/flake.lock +++ b/flake.lock @@ -1,18 +1,34 @@ { "nodes": { + "amiaBot": { + "flake": false, + "locked": { + "lastModified": 1785125005, + "narHash": "sha256-ukQsV27B7IdZkjLfY20HPIgybBt6zve7jqi3QDDc64o=", + "ref": "refs/heads/main", + "rev": "25bdd14067f9eb9d05e332ee41d88b9d71741aff", + "revCount": 7, + "type": "git", + "url": "ssh://forgejo@mizuki.guru/imnyang/amia" + }, + "original": { + "type": "git", + "url": "ssh://forgejo@mizuki.guru/imnyang/amia" + } + }, "brew-src": { "flake": false, "locked": { - "lastModified": 1783446865, - "narHash": "sha256-nCrPEbQjgnSAOVWTxRXD9Yi6P3oECdtZISYcQCFI9Fs=", + "lastModified": 1784558651, + "narHash": "sha256-woXJ1ATKpSYRWCy46TQJjmm9XzAeZVEZw9xDfVG9NYI=", "owner": "Homebrew", "repo": "brew", - "rev": "655769712a9a9499563d9685a8488f349354492d", + "rev": "b48c7994b5f0eed7bef532efa63cb4e4f763887a", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "6.0.9", + "ref": "6.0.12", "repo": "brew", "type": "github" } @@ -22,11 +38,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 +57,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1784006447, - "narHash": "sha256-7FXTHK4ASkU7zVcbiRycXS2q8MVYeRWjVUFW4vCxeH0=", + "lastModified": 1784981070, + "narHash": "sha256-BB3If4U5avDjQ/Ufnp+GquYqbIZP3LpbbYqs49E6cKQ=", "owner": "ilysenko", "repo": "codex-desktop-linux", - "rev": "8562884fb17c8925e53981f219db812ee248db5e", + "rev": "ef284ae8dc07917c42b2e6b6435e4820280df989", "type": "github" }, "original": { @@ -61,11 +77,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 +177,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 +208,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 +215,11 @@ ] }, "locked": { - "lastModified": 1783963347, - "narHash": "sha256-r376E2XpakiXwModDHIxlvB6qLq4iFVEq730vxOO4JY=", + "lastModified": 1784913159, + "narHash": "sha256-JWq0BfjO4ktpH5USfQNQzdvHpIDT8fSKD5K7LvdMRFs=", "owner": "nix-community", "repo": "home-manager", - "rev": "a45a7c451455a51ae740ec3bce4024b312809c29", + "rev": "079a3b5d1aa6a719920a51316253b7d6dd22738d", "type": "github" }, "original": { @@ -250,7 +248,7 @@ }, "imnyang_2": { "inputs": { - "nixpkgs": "nixpkgs_15" + "nixpkgs": "nixpkgs_14" }, "locked": { "lastModified": 1778582554, @@ -273,11 +271,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 +359,11 @@ "brew-src": "brew-src" }, "locked": { - "lastModified": 1783875858, - "narHash": "sha256-+yYNOkj/bkVQmwKH0hewqwBwAEoh4Gq2BmQPIP1jNrg=", + "lastModified": 1784906761, + "narHash": "sha256-2v0H8+Ert+xbm0oliHblXTPPczuKiibBUBvRax59kxg=", "owner": "zhaofengli", "repo": "nix-homebrew", - "rev": "60641da8324e6a1af716a0340d901ccb131c91ef", + "rev": "60623ec512406261f553d24033c8a0c53fd0b7f2", "type": "github" }, "original": { @@ -382,11 +380,11 @@ "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1783998997, - "narHash": "sha256-jtxXqX+ycVFlY/6fZi4A635CsCiCJcht0/sGvr9oAAQ=", + "lastModified": 1784998108, + "narHash": "sha256-Bcplstv6cEphwzggdZ2LB3sZDimmF/QkaVkW9qk17no=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "5e2ee31f6e3a1020ac821e749aea046b12e17252", + "rev": "cca6d30eb701c1189f046f7d22f24ba85a6e07e3", "type": "github" }, "original": { @@ -401,11 +399,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1783897948, - "narHash": "sha256-wusXpttNJn7SvUMvGLpNuJgcwIIkMwlWNnasPPxpftg=", + "lastModified": 1784642409, + "narHash": "sha256-hcbDqFuySAJawljt5r0sKBCJKYnbtGD0T/ZIozH1Dq0=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "7348d3f38ab1bd6abe156a923fab6f43656b168f", + "rev": "eaeb18da90024448a60eb1ec7132eafa4003404e", "type": "github" }, "original": { @@ -477,11 +475,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 +490,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 +505,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 +534,7 @@ "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1778869304, "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", @@ -568,7 +550,7 @@ "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_14": { "locked": { "lastModified": 1777954456, "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", @@ -666,11 +648,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 +664,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1783224372, - "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", + "lastModified": 1783776592, + "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d407951447dcd00442e97087bf374aad70c04cea", + "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", "type": "github" }, "original": { @@ -698,11 +680,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 +694,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 +717,8 @@ }, "paring": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_11" + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1773918161, @@ -811,6 +774,7 @@ }, "root": { "inputs": { + "amiaBot": "amiaBot", "catppuccin": "catppuccin", "codex-app": "codex-app", "darwin": "darwin", @@ -825,7 +789,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 +808,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 +843,7 @@ }, "soulver-cpp": { "inputs": { - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_13", "nixpkgs-libxml2": "nixpkgs-libxml2" }, "locked": { @@ -899,15 +862,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 +969,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": 1783972265, - "narHash": "sha256-wALYzewjUgVZrxl9FQji4ZzBAT5CGTVlR+cFCD0G11U=", + "lastModified": 1785004009, + "narHash": "sha256-VjnxwcdpTINauc6eq4vSez3zeXpNClEQqKUlAYr2WIU=", "owner": "vicinaehq", "repo": "vicinae", - "rev": "94f9570f096a407d27e18073d1b01dae13c4d064", + "rev": "1644a0b8b251c10a14c5a329916496836748c531", "type": "github" }, "original": { @@ -1047,15 +995,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..3981714 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"; @@ -78,6 +78,12 @@ mizuki-nc.url = "git+https://git.mizuki.guru/imnyang/mizuki.guru.git?rev=70b1c9a2befc933c63f2b3197655b4f1166f9fbb"; muvel.url = "github:imnyang/muvel-nix"; + + # Git source filtering keeps config.toml and state.json out of the Nix store. + amiaBot = { + url = "git+ssh://forgejo@mizuki.guru/imnyang/amia"; + flake = false; + }; }; outputs = @@ -135,6 +141,7 @@ # Server hikari = mkHost ./hosts/server/hikari/default overlays; hako = mkHost ./hosts/server/hikari/hako overlays; + amia = mkHost ./hosts/server/hikari/amia overlays; natsu = mkHost ./hosts/server/natsu overlays; kazusa = mkHost ./hosts/server/kazusa overlays; }; diff --git a/hosts/machine/ena/configuration.nix b/hosts/machine/ena/configuration.nix index 153be1b..5151a2b 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..e07e3bb 100644 --- a/hosts/machine/ena/home/default.nix +++ b/hosts/machine/ena/home/default.nix @@ -1,5 +1,6 @@ { config, + lib, pkgs, inputs, ... @@ -25,7 +26,9 @@ "${inputs.self}/modules/home/devtool/neovim.nix" "${inputs.self}/modules/home/spicetify.nix" "${inputs.self}/modules/home/devtool/ghostty.nix" + "${inputs.self}/modules/home/devtool/btop.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" @@ -35,4 +38,6 @@ ./config/shell.nix ./config/plasma.nix ]; + + programs.btop.settings.color_theme = lib.mkForce "Mizuki Dark"; } diff --git a/hosts/machine/kanade/home/default.nix b/hosts/machine/kanade/home/default.nix index c57cb0d..a1ef452 100644 --- a/hosts/machine/kanade/home/default.nix +++ b/hosts/machine/kanade/home/default.nix @@ -20,6 +20,7 @@ imports = [ "${inputs.self}/modules/home/devtool/neovim.nix" "${inputs.self}/modules/home/devtool/ghostty.nix" + "${inputs.self}/modules/home/devtool/btop.nix" "${inputs.self}/modules/home/devtool/zed.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..11d6a71 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" 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..d631156 100644 --- a/hosts/machine/mafuyu/home/default.nix +++ b/hosts/machine/mafuyu/home/default.nix @@ -35,7 +35,9 @@ imports = [ "${inputs.self}/modules/home/devtool/neovim.nix" "${inputs.self}/modules/home/devtool/ghostty.nix" + "${inputs.self}/modules/home/devtool/btop.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/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..b4ff690 100644 --- a/hosts/machine/mizuki/home/default.nix +++ b/hosts/machine/mizuki/home/default.nix @@ -25,7 +25,9 @@ "${inputs.self}/modules/home/devtool/neovim.nix" "${inputs.self}/modules/home/spicetify.nix" "${inputs.self}/modules/home/devtool/ghostty.nix" + "${inputs.self}/modules/home/devtool/btop.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/machine/mizuki/home/packages.nix b/hosts/machine/mizuki/home/packages.nix index c1ec5a2..9246ca1 100644 --- a/hosts/machine/mizuki/home/packages.nix +++ b/hosts/machine/mizuki/home/packages.nix @@ -15,6 +15,9 @@ with pkgs; davinci-resolve kdePackages.kdenlive + android-tools + android-cli + # waterfox-bin # inputs.waterfox.packages.${pkgs.system}.waterfox ] diff --git a/hosts/server/hikari/amia/configuration.nix b/hosts/server/hikari/amia/configuration.nix new file mode 100644 index 0000000..3c0c976 --- /dev/null +++ b/hosts/server/hikari/amia/configuration.nix @@ -0,0 +1,68 @@ +{ pkgs, inputs, ... }: +let + amiaBot = pkgs.rustPlatform.buildRustPackage { + pname = "amia"; + version = "0.1.0"; + src = inputs.amiaBot; + cargoLock.lockFile = "${inputs.amiaBot}/Cargo.lock"; + }; +in +{ + imports = [ + ./hardware-configuration.nix + "${inputs.self}/modules/mizukios/base" + "${inputs.self}/modules/mizukios/features/system/boot.nix" + "${inputs.self}/modules/mizukios/features/remote/ssh.nix" + ]; + + services.qemuGuest.enable = true; + + users.users.imnyang.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOHP3Z+AYrRh9f8TYyqChKfeyNm3lOe0F75AwRHTTaxD imnyang@kazusa" + ]; + + environment.systemPackages = with pkgs; [ + eza + neovim + nil + nixd + bind + dig + ]; + + programs.git.config = { + safe.directory = "*"; + }; + + nix.settings.require-sigs = false; + + networking.firewall.enable = false; + + systemd.services.amia = { + description = "Discord Profile Widget Bot"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + unitConfig.ConditionPathExists = "/home/imnyang/amia/config.toml"; + path = [ + pkgs.bind.dnsutils + ]; + + serviceConfig = { + Type = "simple"; + User = "imnyang"; + WorkingDirectory = "/home/imnyang/amia"; + UMask = "0077"; + ExecStart = "${amiaBot}/bin/amia"; + Restart = "on-failure"; + RestartSec = "5s"; + NoNewPrivileges = true; + PrivateTmp = true; + ProtectSystem = "strict"; + ProtectHome = false; + }; + }; + + networking.hostName = "amia"; + system.stateVersion = "26.05"; +} diff --git a/hosts/server/hikari/amia/default.nix b/hosts/server/hikari/amia/default.nix new file mode 100644 index 0000000..29f53e9 --- /dev/null +++ b/hosts/server/hikari/amia/default.nix @@ -0,0 +1,25 @@ +{ + inputs, + overlays, +}: +let + inherit (inputs) nixpkgs home-manager; +in +nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + ./configuration.nix + ./hardware-configuration.nix + home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.extraSpecialArgs = { inherit inputs; }; + home-manager.users.imnyang = import ./home.nix; + } + ]; + specialArgs = { + inherit inputs; + inherit overlays; + }; +} diff --git a/hosts/server/hikari/amia/hardware-configuration.nix b/hosts/server/hikari/amia/hardware-configuration.nix new file mode 100644 index 0000000..0cd3c4e --- /dev/null +++ b/hosts/server/hikari/amia/hardware-configuration.nix @@ -0,0 +1,30 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/profiles/qemu-guest.nix") + ]; + + boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/a31f97e6-5de2-470d-8718-a1eadd7827a8"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/5B6A-1CAB"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = [ ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; +} diff --git a/hosts/server/hikari/amia/home.nix b/hosts/server/hikari/amia/home.nix new file mode 100644 index 0000000..bcf93b9 --- /dev/null +++ b/hosts/server/hikari/amia/home.nix @@ -0,0 +1,66 @@ +{ + pkgs, + inputs, + ... +}: +let + nr = import "${inputs.self}/modules/mizukios/features/packages/nr.nix" { inherit pkgs; }; + nrr = import "${inputs.self}/modules/mizukios/features/packages/nrr.nix" { inherit pkgs; }; +in +{ + home.stateVersion = "26.05"; + home.username = "imnyang"; + home.homeDirectory = "/home/imnyang"; + + home.packages = [ + nr + nrr + ]; + + home.sessionVariables = { + EDITOR = "nano"; + VISUAL = "nano"; + }; + + programs.fish = { + enable = true; + + shellAliases = { + ".." = "cd .."; + "..." = "cd ../.."; + + ls = "eza"; + ll = "eza -l"; + la = "eza -a"; + lla = "eza -la"; + + rebuild = "sudo nixos-rebuild switch --flake .#hako"; + update = "nix flake update"; + clean = "sudo nix-collect-garbage -d"; + }; + + interactiveShellInit = '' + set -g fish_greeting "" + set -g fish_color_command blue + set -g fish_color_error red + set -g fish_color_param cyan + ''; + + functions = { + fish_prompt = '' + set_color purple + echo -n (whoami) + set_color normal + echo -n "@" + set_color green + echo -n (hostname) + set_color normal + echo -n ":" + set_color blue + echo -n (prompt_pwd) + set_color normal + echo -n " > " + ''; + }; + }; +} 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..4b03280 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,14 @@ networking.firewall.allowedTCPPorts = [ 22 # default ssh port - 3022 # alternative ssh port - 80 443 12345 + + 57017 + 35353 ]; - - services.openssh = { - ports = [ - 22 - 3022 - ]; - }; - - networking.hostName = "natsu"; system.stateVersion = "26.05"; } diff --git a/hosts/server/natsu/default.nix b/hosts/server/natsu/default.nix index 90ba444..aeee863 100644 --- a/hosts/server/natsu/default.nix +++ b/hosts/server/natsu/default.nix @@ -12,7 +12,9 @@ nixpkgs.lib.nixosSystem { # ./services/attic.nix ./services/caddy.nix ./services/forgejo-runner.nix + ./services/limbo.nix ./services/stream.nix + ./services/velocity.nix # ./services/harmonia.nix ./configuration.nix ./hardware-configuration.nix diff --git a/hosts/server/natsu/services/caddy.nix b/hosts/server/natsu/services/caddy.nix index 8accb79..eee1072 100644 --- a/hosts/server/natsu/services/caddy.nix +++ b/hosts/server/natsu/services/caddy.nix @@ -228,7 +228,7 @@ in "github.com/RussellLuo/caddy-ext/ratelimit@v0.3.0" "github.com/neodyme-labs/user_agent_parse@v0.0.1" ]; - hash = "sha256-YqOyHxPIKreCSkXfJUWTEFi+xOlIIiDqy3bYt7/A6Rg="; + hash = "sha256-z9/LF2gws+H0pKL6F62QfklD0W8DKWCccnXLOOs3+jY="; }; }; } diff --git a/hosts/server/natsu/services/limbo.nix b/hosts/server/natsu/services/limbo.nix new file mode 100644 index 0000000..404c5dc --- /dev/null +++ b/hosts/server/natsu/services/limbo.nix @@ -0,0 +1,20 @@ +{ ... }: + +{ + systemd.services.limbo = { + description = "Minecraft Limbo Server"; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "simple"; + User = "imnyang"; + Group = "users"; + WorkingDirectory = "/home/imnyang/minecraft/limbo"; + ExecStart = "/home/imnyang/minecraft/limbo/pico_limbo --config /home/imnyang/minecraft/limbo/server.toml"; + Restart = "always"; + RestartSec = 5; + }; + }; +} diff --git a/hosts/server/natsu/services/velocity.nix b/hosts/server/natsu/services/velocity.nix new file mode 100644 index 0000000..5f9ea06 --- /dev/null +++ b/hosts/server/natsu/services/velocity.nix @@ -0,0 +1,28 @@ +{ pkgs, ... }: + +{ + systemd.services.velocity = { + description = "Minecraft Velocity Proxy"; + after = [ + "network-online.target" + ]; + wants = [ "network-online.target" ]; + # requires = [ "limbo.service" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "simple"; + User = "imnyang"; + Group = "users"; + WorkingDirectory = "/home/imnyang/minecraft/proxy"; + ExecStart = "${pkgs.corretto25}/bin/java -jar /home/imnyang/minecraft/proxy/velocity.jar"; + Restart = "always"; + RestartSec = 5; + SuccessExitStatus = [ 0 143 ]; + }; + }; + + networking.firewall.allowedTCPPorts = [ + 25565 + ]; +} diff --git a/modules/home/devtool/btop.nix b/modules/home/devtool/btop.nix new file mode 100644 index 0000000..22ce5da --- /dev/null +++ b/modules/home/devtool/btop.nix @@ -0,0 +1,104 @@ +{ + programs.btop = { + enable = true; + + settings = { + color_theme = "Mizuki Light"; + theme_background = true; + }; + + themes = { + "Mizuki Light" = '' + # Kawa / Mizuki light palette + theme[main_bg]="#fcf8f9" + theme[main_fg]="#191017" + theme[title]="#816570" + theme[hi_fg]="#1e66f5" + theme[selected_bg]="#f4ecee" + theme[selected_fg]="#191017" + theme[inactive_fg]="#a38f96" + theme[graph_text]="#816570" + theme[meter_bg]="#f2e6ea" + theme[proc_misc]="#ea76cb" + theme[cpu_box]="#1e66f5" + theme[mem_box]="#40a02b" + theme[net_box]="#d20f39" + theme[proc_box]="#179299" + theme[div_line]="#e6d5db" + theme[temp_start]="#40a02b" + theme[temp_mid]="#df8e1d" + theme[temp_end]="#d20f39" + theme[cpu_start]="#40a02b" + theme[cpu_mid]="#df8e1d" + theme[cpu_end]="#d20f39" + theme[free_start]="#40a02b" + theme[free_mid]="#df8e1d" + theme[free_end]="#d20f39" + theme[cached_start]="#179299" + theme[cached_mid]="#1e66f5" + theme[cached_end]="#ea76cb" + theme[available_start]="#179299" + theme[available_mid]="#1e66f5" + theme[available_end]="#ea76cb" + theme[used_start]="#40a02b" + theme[used_mid]="#df8e1d" + theme[used_end]="#d20f39" + theme[download_start]="#179299" + theme[download_mid]="#1e66f5" + theme[download_end]="#ea76cb" + theme[upload_start]="#1e66f5" + theme[upload_mid]="#ea76cb" + theme[upload_end]="#d20f39" + theme[process_start]="#40a02b" + theme[process_mid]="#179299" + theme[process_end]="#1e66f5" + ''; + + "Mizuki Dark" = '' + # Kawa Dark / Mizuki dark palette + theme[main_bg]="#191017" + theme[main_fg]="#fafafa" + theme[title]="#f5c2e7" + theme[hi_fg]="#89b4fa" + theme[selected_bg]="#2c1f2d" + theme[selected_fg]="#fafafa" + theme[inactive_fg]="#a9a9b1" + theme[graph_text]="#bac2de" + theme[meter_bg]="#2c1f2d" + theme[proc_misc]="#f5c2e7" + theme[cpu_box]="#89b4fa" + theme[mem_box]="#a6e3a1" + theme[net_box]="#f38ba8" + theme[proc_box]="#94e2d5" + theme[div_line]="#4a354c" + theme[temp_start]="#a6e3a1" + theme[temp_mid]="#f9e2af" + theme[temp_end]="#f38ba8" + theme[cpu_start]="#a6e3a1" + theme[cpu_mid]="#f9e2af" + theme[cpu_end]="#f38ba8" + theme[free_start]="#a6e3a1" + theme[free_mid]="#f9e2af" + theme[free_end]="#f38ba8" + theme[cached_start]="#94e2d5" + theme[cached_mid]="#89b4fa" + theme[cached_end]="#f5c2e7" + theme[available_start]="#94e2d5" + theme[available_mid]="#89b4fa" + theme[available_end]="#f5c2e7" + theme[used_start]="#a6e3a1" + theme[used_mid]="#f9e2af" + theme[used_end]="#f38ba8" + theme[download_start]="#94e2d5" + theme[download_mid]="#89b4fa" + theme[download_end]="#f5c2e7" + theme[upload_start]="#89b4fa" + theme[upload_mid]="#f5c2e7" + theme[upload_end]="#f38ba8" + theme[process_start]="#a6e3a1" + theme[process_mid]="#94e2d5" + theme[process_end]="#89b4fa" + ''; + }; + }; +} diff --git a/modules/home/devtool/vscode.nix b/modules/home/devtool/vscode.nix index 1b26c6b..2097f8a 100644 --- a/modules/home/devtool/vscode.nix +++ b/modules/home/devtool/vscode.nix @@ -21,8 +21,10 @@ in programs.vscode = { enable = true; mutableExtensionsDir = true; - userSettings = { - "extensions.autoUpdate" = true; + profiles.default = { + userSettings = { + "extensions.autoUpdate" = true; + }; }; package = (pkgs.vscode.override { isInsiders = true; }).overrideAttrs (oldAttrs: { version = "latest"; diff --git a/modules/home/firefox-devedition.nix b/modules/home/firefox-devedition.nix new file mode 100644 index 0000000..2bf305e --- /dev/null +++ b/modules/home/firefox-devedition.nix @@ -0,0 +1,32 @@ +{ pkgs, ... }: +{ + programs.firefox = { + enable = true; + package = pkgs.firefox-devedition; + + policies = { + DisableAppUpdate = true; + + ExtensionSettings = { + "figma-windows-ua-spoofer@imnyang.local" = { + installation_mode = "force_installed"; + install_url = "https://git.mizuki.guru/imnyang/thisiswindowsfigma/releases/download/v1.0.0/d168a70cb6a24fe4a478-1.0.0.xpi"; + }; + + "thisiswindowschromiumnetflix@imnya.ng" = { + installation_mode = "force_installed"; + install_url = "https://git.mizuki.guru/imnyang/thisiswindowschromiumnetflix/releases/download/v2026.07.27/b30e361a21474a79be8d-2026.7.27.xpi"; + }; + }; + }; + }; + + 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" ]; + }; +} diff --git a/modules/home/packages.nix b/modules/home/packages.nix index 3b6161e..069f847 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -51,7 +51,7 @@ with pkgs; gnome-disk-utility - antigravity + antigravity-ide postman burpsuite @@ -98,8 +98,6 @@ with pkgs; code-cursor - microsoft-edge - galaxy-buds-client # another diff --git a/modules/home/ssh.nix b/modules/home/ssh.nix index 1175cdc..d683c2e 100644 --- a/modules/home/ssh.nix +++ b/modules/home/ssh.nix @@ -1,24 +1,23 @@ { ... }: { programs.ssh = { enable = true; - matchBlocks = { + enableDefaultConfig = false; + settings = { "*" = { - forwardAgent = false; - identityAgent = "~/.1password/agent.sock"; - setEnv = { + ForwardAgent = false; + IdentityAgent = "~/.1password/agent.sock"; + SetEnv = { TERM = "xterm-256color"; }; - extraOptions = { - ServerAliveInterval = "0"; - ServerAliveCountMax = "3"; - Compression = "no"; - AddKeysToAgent = "no"; - HashKnownHosts = "no"; - UserKnownHostsFile = "~/.ssh/known_hosts"; - ControlMaster = "no"; - ControlPath = "~/.ssh/master-%r@%n:%p"; - ControlPersist = "no"; - }; + ServerAliveInterval = 0; + ServerAliveCountMax = 3; + Compression = false; + AddKeysToAgent = "no"; + HashKnownHosts = false; + UserKnownHostsFile = "~/.ssh/known_hosts"; + ControlMaster = "no"; + ControlPath = "~/.ssh/master-%r@%n:%p"; + ControlPersist = "no"; }; }; }; 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 diff --git a/modules/mizukios/features/packages/nrr.nix b/modules/mizukios/features/packages/nrr.nix index 7c4d5c7..7627043 100644 --- a/modules/mizukios/features/packages/nrr.nix +++ b/modules/mizukios/features/packages/nrr.nix @@ -19,6 +19,7 @@ pkgs.writeShellApplication { declare -A HOST_MAP HOST_MAP["hikari"]="10.11.8.100" + HOST_MAP["amia"]="10.11.8.104" HOST_MAP["hako"]="10.11.8.102" HOST_MAP["kazusa"]="82.21.82.30" HOST_MAP["natsu"]="natsu.icn.mizuki.guru"