Skip to content

Commit

Permalink
Fix to load os specific config in alacritty (#517)
Browse files Browse the repository at this point in the history
* Fix os specific config in alacritty

Do not set option_as_alt in windows, it warns as not enabled
Split files and keep .local at last

* Fix redandunt config

* Do not put needless files in unix again

* Fix crucial miscommit...
  • Loading branch information
kachick authored Mar 24, 2024
1 parent ca1f003 commit c8df936
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 17 deletions.
3 changes: 2 additions & 1 deletion cmd/winit-conf/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,10 @@ func provisioners() []provisioner {
return []provisioner{
newProvisioner([]string{"starship", "starship.toml"}, []string{homePath, ".config", "starship.toml"}),
newProvisioner([]string{"alacritty", "common.toml"}, []string{homePath, ".config", "alacritty", "common.toml"}),
newProvisioner([]string{"alacritty", "windows.toml"}, []string{homePath, ".config", "alacritty", "windows.toml"}),
// TODO: Copy all TOMLs under themes
newProvisioner([]string{"alacritty", "themes", "iceberg-dark.toml"}, []string{homePath, ".config", "alacritty", "themes", "iceberg-dark.toml"}),
newProvisioner([]string{"alacritty", "windows.toml"}, []string{appdataPath, "alacritty", "alacritty.toml"}),
newProvisioner([]string{"alacritty", "alacritty-windows.toml"}, []string{appdataPath, "alacritty", "alacritty.toml"}),
newProvisioner([]string{"windows", "winget", "winget-pkgs-basic.json"}, []string{tmpdirPath, "winget-pkgs-basic.json"}),
newProvisioner([]string{"windows", "winget", "winget-pkgs-entertainment.json"}, []string{tmpdirPath, "winget-pkgs-entertainment.json"}),
newProvisioner([]string{"windows", "winget", "winget-pkgs-storage.json"}, []string{tmpdirPath, "winget-pkgs-storage.json"}),
Expand Down
6 changes: 6 additions & 0 deletions config/alacritty/alacritty-unix.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import = [
"~/.config/alacritty/common.toml",
"~/.config/alacritty/unix.toml",
# No file will be skipped: https://github.com/alacritty/alacritty/pull/4332/files#diff-06572a96a58dc510037d5efa622f9bec8519bc1beab13c9f251e97e657a9d4edR12
"~/.config/alacritty/local.toml",
]
6 changes: 6 additions & 0 deletions config/alacritty/alacritty-windows.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import = [
"~/.config/alacritty/common.toml",
"~/.config/alacritty/windows.toml",
# No file will be skipped: https://github.com/alacritty/alacritty/pull/4332/files#diff-06572a96a58dc510037d5efa622f9bec8519bc1beab13c9f251e97e657a9d4edR12
"~/.config/alacritty/local.toml",
]
3 changes: 0 additions & 3 deletions config/alacritty/common.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ family = "PlemolJP Console NF"
style = "Bold Italic"

[window]
# https://github.com/alacritty/alacritty/issues/93
option_as_alt = "Both"

opacity = 0.85

dimensions.columns = 180
Expand Down
9 changes: 3 additions & 6 deletions config/alacritty/unix.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# https://wiki.archlinux.org/title/Alacritty

import = [
"~/.config/alacritty/common.toml",
# Set experimental config or host specific
# No file will be skipped: https://github.com/alacritty/alacritty/pull/4332/files#diff-06572a96a58dc510037d5efa622f9bec8519bc1beab13c9f251e97e657a9d4edR12
"~/.config/alacritty/local.toml",
]
[window]
# https://github.com/alacritty/alacritty/issues/93
option_as_alt = "Both"
6 changes: 0 additions & 6 deletions config/alacritty/windows.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
import = [
"~/.config/alacritty/common.toml", # Set experimental config or host specific
# No file will be skipped: https://github.com/alacritty/alacritty/pull/4332/files#diff-06572a96a58dc510037d5efa622f9bec8519bc1beab13c9f251e97e657a9d4edR12
"~/.config/alacritty/local.toml",
]

[shell]
program = "pwsh"
args = [
Expand Down
4 changes: 3 additions & 1 deletion home-manager/common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,10 @@

# Do not alias *.nix into `xdg.configFile`, it actually cannot be used because of using many relative dirs
# So you should call `home-manager switch` with `-f ~/repos/dotfiles/USER_NAME.nix`

xdg.configFile."alacritty/alacritty.toml".source = ../config/alacritty/alacritty-unix.toml;
xdg.configFile."alacritty/unix.toml".source = ../config/alacritty/unix.toml;
xdg.configFile."alacritty/common.toml".source = ../config/alacritty/common.toml;
xdg.configFile."alacritty/alacritty.toml".source = ../config/alacritty/unix.toml;
xdg.configFile."alacritty/themes" = {
source = ../config/alacritty/themes;
recursive = true;
Expand Down

0 comments on commit c8df936

Please sign in to comment.