diff --git a/native_configs/alacritty/alacritty.yml b/native_configs/alacritty/alacritty.yml index 4fd1b01..773f376 100755 --- a/native_configs/alacritty/alacritty.yml +++ b/native_configs/alacritty/alacritty.yml @@ -866,7 +866,7 @@ key_bindings: #- { key: Q, mods: Command, action: Quit } #- { key: W, mods: Command, action: Quit } #- { key: N, mods: Command, action: SpawnNewInstance } - #- { key: F, mods: Command|Control, action: ToggleFullscreen } + - { key: Return, mods: Command, action: ToggleFullscreen } #- { key: F, mods: Command, mode: ~Search, action: SearchForward } #- { key: B, mods: Command, mode: ~Search, action: SearchBackward } diff --git a/nix-conf/home-manager/base/alacritty.nix b/nix-conf/home-manager/base/alacritty.nix index 8677649..5f08776 100644 --- a/nix-conf/home-manager/base/alacritty.nix +++ b/nix-conf/home-manager/base/alacritty.nix @@ -19,6 +19,14 @@ in ''; example = "DroidSansMono NF"; }; + font.size = myLib.mkOption { + type = myLib.types.number; + default = actualConfig.font.size; + description = '' + The default font size for Alacritty. This is probably measured in px. + ''; + example = 7.0; + }; enable = myLib.mkOption { type = myLib.types.bool; default = true; @@ -45,6 +53,7 @@ in enable = cfg.enable; settings = myLib.recursiveUpdate actualConfig { font.normal.family = cfg.font.family; + font.size = cfg.font.size; }; }; } diff --git a/nix-conf/home-manager/base/git.nix b/nix-conf/home-manager/base/git.nix index c9eec86..cd57aa7 100644 --- a/nix-conf/home-manager/base/git.nix +++ b/nix-conf/home-manager/base/git.nix @@ -44,6 +44,7 @@ in default = [ ".vscode" # vscode settings ".direnv" # .envrc cached outputs + ".DS_Store" # MacOS users, amrite ]; description = '' .gitignore patterns that are applied in every repository. diff --git a/nix-conf/home-manager/flake.lock b/nix-conf/home-manager/flake.lock index f3543ff..5a63f17 100644 --- a/nix-conf/home-manager/flake.lock +++ b/nix-conf/home-manager/flake.lock @@ -180,7 +180,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-GgIXbuHvwReBHZUyfSKS6DET3CfD6EEKABj6ndpcqHQ=", + "narHash": "sha256-RkO+8E7MahERHw1C5DNObDjq4xeI+FqaWH9+M7Fv2UE=", "path": "./../../out-of-tree/nixGL", "type": "path" }, @@ -270,11 +270,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1673490397, - "narHash": "sha256-VCSmIYJy/ZzTvEGjdfITmTYfybXBgZpMjyjDndbou+8=", + "lastModified": 1673576998, + "narHash": "sha256-I6vYVejEWTao+Ze/F6VFSTFxu6/X2OPT3Eu4AM/zzec=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0833f4d063a2bb75aa31680f703ba594a384ffe6", + "rev": "ca474ccdd5f81ed742328e15dae38bb57a1006e3", "type": "github" }, "original": { diff --git a/nix-conf/home-manager/flake.nix b/nix-conf/home-manager/flake.nix index 6950948..50b196f 100644 --- a/nix-conf/home-manager/flake.nix +++ b/nix-conf/home-manager/flake.nix @@ -62,7 +62,7 @@ base = import ./base; inherit (base) mkModuleArgs; - kde_module = { config, pkgs, ... }: { + nerd_font_module = { config, pkgs, ... }: { fonts.fontconfig.enable = true; home.packages = [ (pkgs.nerdfonts.override { fonts = [ "DroidSansMono" ]; }) @@ -105,7 +105,7 @@ inherit pkgs; modules = base.modules ++ [ ./home.nix - kde_module + nerd_font_module ./base/productive_desktop.nix { # since home.nix forces us to use keepass, and base.keepass.path @@ -129,14 +129,17 @@ }; "htran" = home-manager.lib.homeManagerConfiguration { inherit pkgs; - modules = [ + modules = base.modules ++ [ ./home.nix { base.graphics.enable = false; - base.graphics.useNixGL.defaultPackage = null; - base.keepass.path = "/Users/htran/keepass.kdbx"; # don't want to deal with GL stuffs on mac yet :/ + base.graphics.useNixGL.defaultPackage = null; + # NOTE: this actually does not exist + base.keepass.path = "/Users/htran/keepass.kdbx"; + base.alacritty.font.size = 11.0; } + nerd_font_module ]; extraSpecialArgs = mkModuleArgs { inherit pkgs; diff --git a/scripts/hm-switch.sh b/scripts/hm-switch.sh index e88df6e..2c41ad5 100755 --- a/scripts/hm-switch.sh +++ b/scripts/hm-switch.sh @@ -24,7 +24,7 @@ rm -rf ~/.local/share/nvim/mason # test if we have home-manager, if not, attempt to use nix to put home-manager to # our environment -if [ $(home-manager help >/dev/null 2>&1) ]; then +if ! command -v home-manager ; then nix-shell -p home-manager --run "home-manager switch --flake $HOME_MANAGER_DIR $@" else home-manager switch -b backup --flake "$HOME_MANAGER_DIR" $@