From ba3dc73e0ce18917da7dd3a76a616617ccc1587d Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Fri, 23 Aug 2024 10:13:20 -0400 Subject: [PATCH] Added alacrity to home-manager --- configs/alacritty/alacritty.toml | 24 ------------------------ configs/alacritty/themes | 1 - modules/home/default.nix | 13 ++++++++++--- modules/home/programs.nix | 6 +++--- 4 files changed, 13 insertions(+), 31 deletions(-) delete mode 100644 configs/alacritty/alacritty.toml delete mode 160000 configs/alacritty/themes diff --git a/configs/alacritty/alacritty.toml b/configs/alacritty/alacritty.toml deleted file mode 100644 index 113df87..0000000 --- a/configs/alacritty/alacritty.toml +++ /dev/null @@ -1,24 +0,0 @@ - -live_config_reload = true - -import = [ - "~/.config/alacritty/themes/themes/nord.toml" -] - -[window] -title = "Terminal" -blur = true - -[font] -normal = { family = "Fira Code", style = "Regular" } -bold = { family = "Fira Code", style = "Bold" } -italic = { family = "Fira Code", style = "Italic" } - -[shell] -program = "/home/ari/.nix-profile/bin/zsh" -args = [ - "-l", - "-c", - "tmux attach || tmux" -] - diff --git a/configs/alacritty/themes b/configs/alacritty/themes deleted file mode 160000 index 4091fdd..0000000 --- a/configs/alacritty/themes +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4091fddff8da892d5594e94116927c7445620867 diff --git a/modules/home/default.nix b/modules/home/default.nix index 7fc25cf..6d63e2b 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -14,7 +14,12 @@ in { makeRootUser = { hostName }: { pkgs, ... }: { home = homeModule; - programs = (programsModule { pkgs = pkgs; }) // { + programs = (programsModule { + pkgs = pkgs; + user = { + name = "root"; + }; + }) // { git = (makeCommonGitConfigs { userName = "root"; userEmail = "root@${hostName}"; @@ -32,7 +37,7 @@ in , extraGitConfigs ? [ ] , name , ... - }: { pkgs, ... }: { + }@user: { pkgs, ... }: { fonts = fontsModule; home = homeModule // { username = name; @@ -53,7 +58,9 @@ in ] else [ ]); }; - programs = (programsModule { pkgs = pkgs; }) // { + programs = (programsModule { + inherit pkgs user; + }) // { git = (makeCommonGitConfigs { userName = fullName; userEmail = email; diff --git a/modules/home/programs.nix b/modules/home/programs.nix index 497af90..b1d993b 100644 --- a/modules/home/programs.nix +++ b/modules/home/programs.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, user, ... }: { bat.enable = true; neovim = { @@ -34,7 +34,7 @@ enable = true; settings = { import = [ - "~/.config/alacritty/themes/themes/nord.toml" + "${pkgs.alacritty-theme}/nord.toml" ]; window = { title = "Terminal"; @@ -46,7 +46,7 @@ italic = { family = "Fira Code"; style = "Italic"; }; }; shell = { - # program = pkgs.zsh; + program = "/home/${user.name}/.nix-profile/bin/zsh"; args = [ "-l" "-c"