nix
/
System
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Factor out alacritty config 

Also use a different font size on mac
This commit is contained in:
Nathan McCarty 2022-10-15 04:37:14 -04:00
parent c8cfb01258
commit cdb768a506
6 changed files with 73 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
home-manager/common/programs/emacs.nix
View File

@ -38,7 +38,7 @@
programs.emacs = {
enable = true;
package = config.nathan.programs.emacs.package;
extraPackages = epkgs: [ pkgs.mu pkgs.vterm ];
extraPackages = epkgs: [ pkgs.mu epkgs.vterm ];
};
}))
(lib.mkIf (config.nathan.programs.emacs.enable && pkgs.stdenv.isLinux) {

57
home-manager/common/programs/terminal.nix Normal file
View File

@ -0,0 +1,57 @@
{ config, lib, pkgs, inputs, ... }:
let nathan = config.nathan;
in with lib; {
config = mkIf nathan.programs.alacritty {
home.packages = with pkgs;
[
# Terminal
alacritty
];
#########################
## Alacritty
#########################
programs.alacritty = {
enable = true;
settings = {
env = {
TERM = "xterm-256color";
ALACRITTY = "1";
};
font = {
normal.family = "FiraCode Nerd Font";
bold.family = "FiraCode Nerd Font";
italic.family = "FiraCode Nerd Font";
bold_italic.family = "FiraCode Nerd Font";
# Bigger on darwin
size = if pkgs.stdenv.isLinux then 9.0 else 11.0;
};
colors = {
primary = {
background = "0x103c48";
foreground = "0xadbcbc";
};
normal = {
black = "0x184956";
red = "0xfa5750";
green = "0x75b938";
yellow = "0xdbb32d";
blue = "0x4695f7";
magenta = "0xf275be";
cyan = "0x41c7b9";
white = "0x72898f";
};
bright = {
black = "0x2d5b69";
red = "0xff665c";
green = "0x84c747";
yellow = "0xebc13d";
blue = "0x58a3ff";
magenta = "0xff84cd";
cyan = "0x53d6c7";
white = "0xcad8d9";
};
};
};
};
};
}

10
home-manager/darwin/default.nix
View File

@ -12,10 +12,18 @@ with nLib; {
../common/programs/core.nix
../common/programs/devel.nix
../common/programs/emacs.nix
../common/programs/terminal.nix
./programs/core.nix
];
options = { };
options = {
nathan = {
programs = {
# Alacrity, on by default on mac
alacritty = mkDefaultOption "alacritty" config.nathan.config.isDesktop;
};
};
};
config = {
# Link applications in spotlight/launchpad

8
home-manager/linux/default.nix
View File

@ -9,10 +9,11 @@ in with lib;
with nLib; {
imports = [
../options.nix
./programs/sway.nix
../common/programs/core.nix
./programs/communications.nix
../common/programs/devel.nix
../common/programs/terminal.nix
./programs/sway.nix
./programs/communications.nix
./programs/devel.nix
./programs/emacs.nix
./programs/image-editing.nix
@ -54,6 +55,9 @@ with nLib; {
swaywm = {
enable = mkDefaultOption "swaywm" config.nathan.config.isDesktop;
};
# Alacritty, follows sway
alacritty =
mkDefaultOption "alacritty" config.nathan.config.programs.swaywm;
# Communications applications
communications = {
# Enable by default if we are on a linux desktop

45
home-manager/linux/programs/sway.nix
View File

@ -530,51 +530,6 @@ in with lib; {
Install = { WantedBy = [ "graphical-session-pre.target" ]; };
};
#########################
## Alacritty
#########################
programs.alacritty = {
enable = true;
settings = {
env = {
TERM = "xterm-256color";
ALACRITTY = "1";
};
font = {
normal.family = "FiraCode Nerd Font";
bold.family = "FiraCode Nerd Font";
italic.family = "FiraCode Nerd Font";
bold_italic.family = "FiraCode Nerd Font";
size = 9.0;
};
colors = {
primary = {
background = "0x103c48";
foreground = "0xadbcbc";
};
normal = {
black = "0x184956";
red = "0xfa5750";
green = "0x75b938";
yellow = "0xdbb32d";
blue = "0x4695f7";
magenta = "0xf275be";
cyan = "0x41c7b9";
white = "0x72898f";
};
bright = {
black = "0x2d5b69";
red = "0xff665c";
green = "0x84c747";
yellow = "0xebc13d";
blue = "0x58a3ff";
magenta = "0xff84cd";
cyan = "0x53d6c7";
white = "0xcad8d9";
};
};
};
};
#########################
## EasyEffects
#########################
services.easyeffects.enable = true;

5
modules/darwin/default.nix
View File

@ -18,10 +18,6 @@ in {
fonts = mkDefaultOption "fonts" config.nathan.config.isDesktop;
};
programs = {
util = {
# Core macos utilities like iterm2 and what not
core = mkDefaultOption "core" true;
};
# Firefox, enabled by default on linux desktop
firefox = mkDefaultOption "Firefox" config.nathan.config.isDesktop;
syncthing =
@ -71,7 +67,6 @@ in {
cleanup = "zap";
};
casks = lib.mkMerge [
(lib.mkIf config.nathan.programs.util.core [{ name = "iterm2"; }])
(lib.mkIf config.nathan.programs.firefox [{ name = "firefox"; }])
(lib.mkIf config.nathan.programs.communications.enable [
{ name = "discord"; }