lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

ops/nixos: alacritty -> kitty

Browse source
This commit is contained in:
Luke Granger-Brown 2021-11-28 12:51:40 +00:00
parent 172f12b04d
commit a1ee1e396c
5 changed files with 20 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nix/pkgs/default.nix
View file

@ -50,5 +50,12 @@
}; };
gimp-plugin-vtf = pkgs.callPackage ./gimp-plugin-vtf {}; gimp-plugin-vtf = pkgs.callPackage ./gimp-plugin-vtf {};
kitty-themes = pkgs.fetchFromGitHub {
owner = "kovidgoyal";
repo = "kitty-themes";
rev = "702dbae791c9c0812c8fc4a7ee85c99dadc0dc3d";
sha256 = "18miswrdy3j2y59alqcw44pc2iv3kmsx7qmvak81z5bkmj2hjrss";
};
} // (import ./heptapod-runner.nix args) } // (import ./heptapod-runner.nix args)
// (import ./lightspeed args) // (import ./lightspeed args)

2
ops/nixos/lib/home-manager/common.nix
View file

@ -124,7 +124,7 @@ in
exec "${home-manager}/bin/home-manager" -f "${config.home.homeDirectory}/depot/home-manager-ext.nix" -A "${configName}" "$@" exec "${home-manager}/bin/home-manager" -f "${config.home.homeDirectory}/depot/home-manager-ext.nix" -A "${configName}" "$@"
'') '')
rxvt_unicode.terminfo tmux rsync libarchive tcpdump restic rxvt_unicode.terminfo tmux rsync libarchive tcpdump restic
alacritty.terminfo alacritty.terminfo kitty.terminfo
iftop htop jq iftop htop jq
depot.nix.pkgs.mercurial depot.nix.pkgs.mercurial
] ++ lib.optionals isLinux [ ] ++ lib.optionals isLinux [

4
ops/nixos/lib/home-manager/graphical-client-wayland.nix
View file

@ -31,7 +31,7 @@
in lib.mkOptionDefault { in lib.mkOptionDefault {
"${modifier}+l" = "exec ${pkgs.swaylock}/bin/swaylock"; "${modifier}+l" = "exec ${pkgs.swaylock}/bin/swaylock";
"${modifier}+p" = "exec ${depot.nix.pkgs.flameshot}/bin/flameshot gui"; "${modifier}+p" = "exec ${depot.nix.pkgs.flameshot}/bin/flameshot gui";
"${modifier}+Return" = "exec ${pkgs.alacritty}/bin/alacritty"; "${modifier}+Return" = "exec ${pkgs.kitty}/bin/kitty";
}; };
startup = [ startup = [
{ command = "${pkgs._1password-gui}/bin/1password --silent"; } { command = "${pkgs._1password-gui}/bin/1password --silent"; }
@ -47,6 +47,4 @@
}; };
}; };
}; };
my.alacritty.fontSize = 12;
} }

2
ops/nixos/lib/home-manager/graphical-client-x11.nix
View file

@ -11,7 +11,7 @@
in lib.mkOptionDefault { in lib.mkOptionDefault {
"${modifier}+l" = "exec loginctl lock-session"; "${modifier}+l" = "exec loginctl lock-session";
"${modifier}+p" = "exec ${depot.nix.pkgs.flameshot}/bin/flameshot gui"; "${modifier}+p" = "exec ${depot.nix.pkgs.flameshot}/bin/flameshot gui";
"${modifier}+Return" = "exec ${pkgs.alacritty}/bin/alacritty"; "${modifier}+Return" = "exec ${pkgs.kitty}/bin/kitty";
}; };
startup = [ startup = [
{ command = "xss-lock --transfer-sleep-lock -- i3lock --nofork"; notification = false; } { command = "xss-lock --transfer-sleep-lock -- i3lock --nofork"; notification = false; }

56
ops/nixos/lib/home-manager/graphical-client.nix
View file

@ -2,13 +2,6 @@
{ {
imports = [ ./client.nix ]; imports = [ ./client.nix ];
options.my.alacritty = with lib; {
fontSize = mkOption {
default = 6;
type = types.int;
};
};
config = { config = {
gtk = { gtk = {
enable = true; enable = true;
@ -39,48 +32,19 @@
_1password-gui _1password-gui
]); ]);
programs.alacritty = { programs.kitty = {
enable = true; enable = true;
settings.font = let font = {
iosevka = style: { family = "Iosevka"; inherit style; }; package = depot.pkgs.iosevka;
in { name = "Iosevka";
normal = iosevka "Regular";
bold = iosevka "Bold";
italic = iosevka "Italic";
bold_italic = iosevka "Bold Italic";
size = config.my.alacritty.fontSize;
};
settings.colors = {
# Ayu Dark, from https://github.com/alacritty/alacritty/wiki/Color-schemes
primary = {
background = "#0A0E14";
foreground = "#B3B1AD";
}; };
extraConfig = ''
# Normal colors # BEGIN_KITTY_THEME
normal = { # Tango Dark
black = "#01060E"; include ${depot.pkgs.kitty-themes}/themes/Tango_Dark.conf
red = "#EA6C73"; # END_KITTY_THEME
green = "#91B362"; '';
yellow = "#F9AF4F";
blue = "#53BDFA";
magenta = "#FAE994";
cyan = "#90E1C6";
white = "#C7C7C7";
};
# Bright colors
bright = {
black = "#686868";
red = "#F07178";
green = "#C2D94C";
yellow = "#FFB454";
blue = "#59C2FF";
magenta = "#FFEE99";
cyan = "#95E6CB";
white = "#FFFFFF";
};
};
}; };
home.file."bin/screencap" = { home.file."bin/screencap" = {