pegasust
/
dotfiles
1
0
Fork 0
Code Issues 6 Pull Requests Projects Releases Wiki Activity

onboard htran

pull/6/head
Pegasust 2023-01-14 06:37:40 -08:00
parent 820ac199d8
commit ecfc6bf1fa
6 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
native_configs/alacritty/alacritty.yml
View File

@ -866,7 +866,7 @@ key_bindings:
#- { key: Q, mods: Command, action: Quit } #- { key: Q, mods: Command, action: Quit }
#- { key: W, mods: Command, action: Quit } #- { key: W, mods: Command, action: Quit }
#- { key: N, mods: Command, action: SpawnNewInstance } #- { 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: F, mods: Command, mode: ~Search, action: SearchForward }
#- { key: B, mods: Command, mode: ~Search, action: SearchBackward } #- { key: B, mods: Command, mode: ~Search, action: SearchBackward }

9
nix-conf/home-manager/base/alacritty.nix
View File

@ -19,6 +19,14 @@ in
''; '';
example = "DroidSansMono NF"; 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 { enable = myLib.mkOption {
type = myLib.types.bool; type = myLib.types.bool;
default = true; default = true;
@ -45,6 +53,7 @@ in
enable = cfg.enable; enable = cfg.enable;
settings = myLib.recursiveUpdate actualConfig { settings = myLib.recursiveUpdate actualConfig {
font.normal.family = cfg.font.family; font.normal.family = cfg.font.family;
font.size = cfg.font.size;
}; };
}; };
} }

1
nix-conf/home-manager/base/git.nix
View File

@ -44,6 +44,7 @@ in
default = [ default = [
".vscode" # vscode settings ".vscode" # vscode settings
".direnv" # .envrc cached outputs ".direnv" # .envrc cached outputs
".DS_Store" # MacOS users, amrite
]; ];
description = '' description = ''
.gitignore patterns that are applied in every repository. .gitignore patterns that are applied in every repository.

8
nix-conf/home-manager/flake.lock
View File

@ -180,7 +180,7 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-GgIXbuHvwReBHZUyfSKS6DET3CfD6EEKABj6ndpcqHQ=", "narHash": "sha256-RkO+8E7MahERHw1C5DNObDjq4xeI+FqaWH9+M7Fv2UE=",
"path": "./../../out-of-tree/nixGL", "path": "./../../out-of-tree/nixGL",
"type": "path" "type": "path"
}, },
@ -270,11 +270,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1673490397, "lastModified": 1673576998,
"narHash": "sha256-VCSmIYJy/ZzTvEGjdfITmTYfybXBgZpMjyjDndbou+8=", "narHash": "sha256-I6vYVejEWTao+Ze/F6VFSTFxu6/X2OPT3Eu4AM/zzec=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "0833f4d063a2bb75aa31680f703ba594a384ffe6", "rev": "ca474ccdd5f81ed742328e15dae38bb57a1006e3",
"type": "github" "type": "github"
}, },
"original": { "original": {

13
nix-conf/home-manager/flake.nix
View File

@ -62,7 +62,7 @@
base = import ./base; base = import ./base;
inherit (base) mkModuleArgs; inherit (base) mkModuleArgs;
kde_module = { config, pkgs, ... }: { nerd_font_module = { config, pkgs, ... }: {
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
home.packages = [ home.packages = [
(pkgs.nerdfonts.override { fonts = [ "DroidSansMono" ]; }) (pkgs.nerdfonts.override { fonts = [ "DroidSansMono" ]; })
@ -105,7 +105,7 @@
inherit pkgs; inherit pkgs;
modules = base.modules ++ [ modules = base.modules ++ [
./home.nix ./home.nix
kde_module nerd_font_module
./base/productive_desktop.nix ./base/productive_desktop.nix
{ {
# since home.nix forces us to use keepass, and base.keepass.path # since home.nix forces us to use keepass, and base.keepass.path
@ -129,14 +129,17 @@
}; };
"htran" = home-manager.lib.homeManagerConfiguration { "htran" = home-manager.lib.homeManagerConfiguration {
inherit pkgs; inherit pkgs;
modules = [ modules = base.modules ++ [
./home.nix ./home.nix
{ {
base.graphics.enable = false; 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 :/ # 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 { extraSpecialArgs = mkModuleArgs {
inherit pkgs; inherit pkgs;

2
scripts/hm-switch.sh
View File

@ -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 # test if we have home-manager, if not, attempt to use nix to put home-manager to
# our environment # 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 $@" nix-shell -p home-manager --run "home-manager switch --flake $HOME_MANAGER_DIR $@"
else else
home-manager switch -b backup --flake "$HOME_MANAGER_DIR" $@ home-manager switch -b backup --flake "$HOME_MANAGER_DIR" $@