Merge branch 'main' of ssh://mizuki.guru/imnyang/nix-flakes
# Conflicts: # flake.lock # hosts/machine/mafuyu/home/packages.nix # modules/home/packages.nix
This commit is contained in:
commit
eb439fe825
30 changed files with 531 additions and 201 deletions
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
"1password"
|
||||
"cloudflare-warp"
|
||||
"protonvpn"
|
||||
"microsoft-edge@canary"
|
||||
|
||||
# Communication
|
||||
"discord"
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
|
||||
persistent-apps = [
|
||||
"/System/Applications/Apps.app"
|
||||
"/Applications/Microsoft Edge Canary.app"
|
||||
"/Applications/Discord.app"
|
||||
"/Applications/KakaoTalk.app"
|
||||
"/Applications/Signal.app"
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -15,6 +15,9 @@ with pkgs;
|
|||
davinci-resolve
|
||||
kdePackages.kdenlive
|
||||
|
||||
android-tools
|
||||
android-cli
|
||||
|
||||
# waterfox-bin
|
||||
# inputs.waterfox.packages.${pkgs.system}.waterfox
|
||||
]
|
||||
|
|
|
|||
Loading…
Reference in a new issue