-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor!: refactor nixos and home-manager config!
- これまでschemeとしていたものをschemesとしてより細かく制御できるようにした
- appsについてプリセットを用意
- shellはプリセットに含めていない
- nix-portalとの併用時にホスト環境の.bashrcと干渉する可能性があるため
- WM関係もプリセットに含めていない
- NixOS/non-NixOSに限らずGNOMEやKDE環境との干渉の可能性があるため
BREAKING CHANGE- Loading branch information
1 parent
315a9c0
commit cd87488
Showing
212 changed files
with
990 additions
and
896 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| .direnv | ||
| !env |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| { | ||
| pkgs, | ||
| lib, | ||
| inputs, | ||
| config, | ||
| colorTheme ? "catppuccin-macchiato", | ||
| ... | ||
| }: | ||
| let | ||
| flavor = builtins.replaceStrings [ "catppuccin-" ] [ "" ] colorTheme; | ||
| in | ||
| { | ||
| imports = [ | ||
| ./rofi.nix | ||
| ]; | ||
| catppuccin = { | ||
| inherit flavor; | ||
| pointerCursor.enable = true; | ||
| }; | ||
| programs = { | ||
| alacritty.catppuccin.enable = true; | ||
| bat.catppuccin.enable = true; | ||
| btop.catppuccin.enable = true; | ||
| git.delta.catppuccin.enable = true; | ||
| kitty.catppuccin.enable = true; | ||
| obs-studio.catppuccin.enable = true; | ||
| starship = { | ||
| catppuccin.enable = true; | ||
| settings = { | ||
| palettes."catppuccin_${flavor}" = | ||
| let | ||
| palette = | ||
| (lib.importTOML "${config.catppuccin.sources.starship}/themes/${flavor}.toml") | ||
| .palettes."catppuccin_${flavor}"; | ||
| in | ||
| { | ||
| bg = palette.base; | ||
| terminal_dark = palette.surface0; | ||
| fg = palette.text; | ||
| magenta = palette.maroon; | ||
| cyan = palette.teal; | ||
| }; | ||
| }; | ||
| }; | ||
| yazi.catppuccin.enable = true; | ||
| zathura.catppuccin.enable = true; | ||
| spicetify = | ||
| let | ||
| spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; | ||
| in | ||
| { | ||
| theme = spicePkgs.themes.catppuccin; | ||
| colorScheme = "${flavor}"; | ||
| }; | ||
| }; | ||
| services = { | ||
| dunst.catppuccin.enable = true; | ||
| }; | ||
| i18n.inputMethod.fcitx5.addons = with pkgs; [ fcitx5-catppuccin ]; | ||
| gtk = { | ||
| theme = | ||
| let | ||
| shade = if flavor == "latte" then "Light" else "Dark"; | ||
| in | ||
| { | ||
| name = "Catppuccin-GTK-${shade}"; | ||
| package = pkgs.magnetic-catppuccin-gtk.override { shade = lib.toLower shade; }; | ||
| }; | ||
| iconTheme = { | ||
| name = "Papirus-Dark"; | ||
| package = pkgs.papirus-icon-theme; | ||
| }; | ||
| }; | ||
| xdg.configFile = { | ||
| "wezterm/color-scheme.lua" = { | ||
| inherit (config.programs.wezterm) enable; | ||
| source = ./wezterm/${flavor}.lua; | ||
| }; | ||
| "qtile/my_modules/colorset.py" = { | ||
| inherit (config.xsession.windowManager.qtile) enable; | ||
| source = ./qtile/${flavor}.py; | ||
| }; | ||
| "fcitx5/conf/classicui.conf" = { | ||
| enable = config.i18n.inputMethod.enabled == "fcitx5"; | ||
| text = lib.generators.toINIWithGlobalSection { } { | ||
| globalSection = { | ||
| Theme = "catppuccin-${flavor}-blue"; | ||
| DarkTHeme = "catppuccin-${flavor}-blue"; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
| } |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| { | ||
| lib, | ||
| pkgs, | ||
| inputs, | ||
| config, | ||
| ... | ||
| }: | ||
| { | ||
| imports = [ | ||
| ./alacritty.nix | ||
| ./dunstrc.nix | ||
| ./kitty.nix | ||
| ./rofi.nix | ||
| ./lazygit.nix | ||
| ./zathura.nix | ||
| ]; | ||
| programs = { | ||
| starship.settings = lib.importTOML ./starship/nord.toml; | ||
| yazi.theme = lib.importTOML ./yazi/nord.toml; | ||
| bat.config.theme = "nord"; | ||
| btop.settings.color_theme = "nord"; | ||
| spicetify = | ||
| let | ||
| spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; | ||
| in | ||
| { | ||
| theme = spicePkgs.themes.nord; | ||
| colorScheme = "Nord"; | ||
| }; | ||
| }; | ||
| xdg.configFile = { | ||
| "fcitx5/conf/classicui.conf" = { | ||
| enable = config.i18n.inputMethod.enabled == "fcitx5"; | ||
| text = lib.generators.toINIWithGlobalSection { } { | ||
| globalSection = { | ||
| Theme = "Nord-Dark"; | ||
| DarkTHeme = "Nord-Dark"; | ||
| }; | ||
| }; | ||
| }; | ||
| "bat/Nord.tmTheme" = { | ||
| inherit (config.programs.bat) enable; | ||
| source = ./sublime/Nord.tmTheme; | ||
| }; | ||
| "qtile/my_modules/colorset.py" = { | ||
| inherit (config.xsession.windowManager.qtile) enable; | ||
| source = ./qtile/nord.py; | ||
| }; | ||
| "wezterm/color-scheme.lua" = { | ||
| inherit (config.programs.wezterm) enable; | ||
| source = ./wezterm/nord.lua; | ||
| }; | ||
| "yazi/Nord.tmTheme" = { | ||
| inherit (config.programs.yazi) enable; | ||
| source = ./sublime/Nord.tmTheme; | ||
| }; | ||
| }; | ||
| i18n.inputMethod.fcitx5.addons = with pkgs; [ fcitx5-nord ]; | ||
| gtk = { | ||
| theme = { | ||
| name = "Nordic-darker"; | ||
| package = pkgs.nordic; | ||
| }; | ||
| iconTheme = { | ||
| name = "Nordzy-dark"; | ||
| package = pkgs.nordzy-icon-theme; | ||
| }; | ||
| }; | ||
| home.pointerCursor = { | ||
| name = "Nordzy-cursors"; | ||
| package = pkgs.nordzy-cursor-theme; | ||
| }; | ||
| } |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Oops, something went wrong.