Zynh0722
/
nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macos: extract macos option globally

main
Zynh Ludwig 2024-07-21 12:41:21 -07:00
parent 4dad83e4ae
commit bf3ae9c4d0
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
home/modules/alacritty.nix
View File

@ -2,11 +2,11 @@
let let
cfg = config.snowhawk.alacritty; cfg = config.snowhawk.alacritty;
macos = config.snowhawk.macos.enable;
in in
{ {
options.snowhawk.alacritty = { options.snowhawk.alacritty = {
enable = lib.mkEnableOption "alacritty home-manager module"; enable = lib.mkEnableOption "alacritty home-manager module";
macos = lib.mkEnableOption "macos specific tweaks";
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
@ -15,8 +15,8 @@ in
settings = { settings = {
window = { window = {
opacity = 0.98; opacity = 0.98;
decorations = lib.mkIf cfg.macos "buttonless"; decorations = lib.mkIf macos "buttonless";
option_as_alt = lib.mkIf cfg.macos "Both"; option_as_alt = lib.mkIf macos "Both";
}; };
colors = { colors = {
primary.background = "#050505"; primary.background = "#050505";

7
home/modules/fish.nix
View File

@ -2,16 +2,15 @@
let let
cfg = config.snowhawk.fish; cfg = config.snowhawk.fish;
macos = config.snowhawk.macos.enable;
in in
{ {
options.snowhawk.fish = { options.snowhawk.fish = {
enable = lib.mkEnableOption "fish"; enable = lib.mkEnableOption "fish";
macos = lib.mkEnableOption "macos specific tweaks";
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
programs.bash = lib.mkIf (!cfg.macos) { programs.bash = lib.mkIf (!macos) {
enable = true; enable = true;
initExtra = '' initExtra = ''
if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]] if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
@ -22,7 +21,7 @@ in
''; '';
}; };
programs.zsh = lib.mkIf cfg.macos { programs.zsh = lib.mkIf macos {
enable = true; enable = true;
initExtra = '' initExtra = ''
if [[ $(${pkgs.procps}/bin/ps $(${pkgs.procps}/bin/ps -p $$ -co "ppid=") -co "comm=") != "fish" && -z ''${BASH_EXECUTION_STRING} ]] if [[ $(${pkgs.procps}/bin/ps $(${pkgs.procps}/bin/ps -p $$ -co "ppid=") -co "comm=") != "fish" && -z ''${BASH_EXECUTION_STRING} ]]

7
home/modules/macos.nix Normal file
View File

@ -0,0 +1,7 @@
{ lib, ... }:
{
options.snowhawk.macos = {
enable = lib.mkEnableOption "macos";
};
}

4
hosts/little-lightning/home.nix
View File

@ -15,9 +15,9 @@
}; };
snowhawk.alacritty = { snowhawk.alacritty = {
enable = true; enable = true;
macos = true;
}; };
snowhawk.fish.macos = true;
snowhawk.macos.enable = true;
programs.alacritty.settings = { programs.alacritty.settings = {
font.size = lib.mkForce 16.0; font.size = lib.mkForce 16.0;