Compare commits

...

4 Commits

Author SHA1 Message Date
Tom Alexander
e1a274c88e
Do not install media role on neelix. 2025-01-23 21:06:11 -05:00
Tom Alexander
cdc4bdffb6
Git buildEnv is failing. 2025-01-23 20:59:39 -05:00
Tom Alexander
9b9a103e49
Do not install gnome-firmware on non-graphical installs. 2025-01-23 20:46:03 -05:00
Tom Alexander
ea7bf809fc
Do not install the launch keyboard configurator on neelix or non-graphical installs. 2025-01-23 20:42:22 -05:00
7 changed files with 138 additions and 102 deletions

View File

@ -28,4 +28,5 @@
me.graphical = true; me.graphical = true;
me.graphics_card_type = "intel"; me.graphics_card_type = "intel";
me.kodi.enable = true; me.kodi.enable = true;
me.lvfs.enable = true;
} }

View File

@ -37,11 +37,14 @@
me.docker.enable = true; me.docker.enable = true;
me.emacs_flavor = "full"; me.emacs_flavor = "full";
me.firefox.enable = true; me.firefox.enable = true;
me.git.config = ./roles/git/files/gitconfig_home; me.git.config = ../../roles/git/files/gitconfig_home;
me.graphical = true; me.graphical = true;
me.graphics_card_type = "amd"; me.graphics_card_type = "amd";
me.kanshi.enable = true; me.kanshi.enable = true;
me.kubernetes.enable = true; me.kubernetes.enable = true;
me.latex.enable = true; me.latex.enable = true;
me.launch_keyboard.enable = true;
me.sway.enable = true; me.sway.enable = true;
me.lvfs.enable = true;
me.media.enable = true;
} }

View File

@ -84,7 +84,7 @@ in
}; };
}; };
environment.variables.EDITOR = "${pkgs.my_emacs}/bin/plainmacs"; environment.variables.EDITOR = "plainmacs";
} }
(lib.mkIf (config.me.graphical) { (lib.mkIf (config.me.graphical) {
nixpkgs.overlays = [ nixpkgs.overlays = [

View File

@ -32,54 +32,54 @@
}; };
}; };
}) })
(lib.mkIf (config.me.graphical) { # (lib.mkIf (config.me.graphical) {
nixpkgs.overlays = [ # nixpkgs.overlays = [
(final: prev: { # (final: prev: {
git = pkgs.buildEnv { # git = pkgs.buildEnv {
name = prev.git.name; # name = prev.git.name;
paths = [ # paths = [
prev.git # prev.git
]; # ];
extraOutputsToInstall = [ # extraOutputsToInstall = [
"man" # "man"
"doc" # "doc"
"info" # "info"
]; # ];
buildInputs = [ final.makeWrapper ]; # buildInputs = [ final.makeWrapper ];
postBuild = '' # postBuild = ''
wrapProgram $out/bin/git --prefix PATH : ${ # wrapProgram $out/bin/git --prefix PATH : ${
lib.makeBinPath [ # lib.makeBinPath [
final.meld # final.meld
] # ]
} # }
''; # '';
}; # };
}) # })
]; # ];
}) # })
(lib.mkIf (!config.me.graphical) { # (lib.mkIf (!config.me.graphical) {
nixpkgs.overlays = [ # nixpkgs.overlays = [
(final: prev: { # (final: prev: {
git = pkgs.buildEnv { # git = pkgs.buildEnv {
name = prev.git.name; # name = prev.git.name;
paths = [ # paths = [
prev.git # prev.git
]; # ];
extraOutputsToInstall = [ # extraOutputsToInstall = [
"man" # "man"
"doc" # "doc"
"info" # "info"
]; # ];
buildInputs = [ final.makeWrapper ]; # buildInputs = [ final.makeWrapper ];
postBuild = '' # postBuild = ''
wrapProgram $out/bin/git --prefix PATH : ${ # wrapProgram $out/bin/git --prefix PATH : ${
lib.makeBinPath [ # lib.makeBinPath [
] # ]
} # }
''; # '';
}; # };
}) # })
]; # ];
}) # })
]; ];
} }

View File

@ -8,7 +8,18 @@
{ {
imports = [ ]; imports = [ ];
config = lib.mkIf config.me.graphical { options.me = {
launch_keyboard.enable = lib.mkOption {
type = lib.types.bool;
default = false;
example = true;
description = "Whether we want to install launch_keyboard.";
};
};
config = lib.mkIf config.me.launch_keyboard.enable (
lib.mkMerge [
(lib.mkIf config.me.graphical {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
system76-keyboard-configurator system76-keyboard-configurator
dfu-programmer # For flashing keyboard https://support.system76.com/articles/launch_2-firmware-update/ dfu-programmer # For flashing keyboard https://support.system76.com/articles/launch_2-firmware-update/
@ -31,5 +42,7 @@
}; };
}; };
}; };
}; })
]
);
} }

View File

@ -8,10 +8,19 @@
{ {
imports = [ ]; imports = [ ];
config = lib.mkMerge [ options.me = {
lvfs.enable = lib.mkOption {
type = lib.types.bool;
default = false;
example = true;
description = "Whether we want to install lvfs.";
};
};
config = lib.mkIf config.me.lvfs.enable (
lib.mkMerge [
{ {
services.fwupd.enable = true; services.fwupd.enable = true;
environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) { environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
hideMounts = true; hideMounts = true;
directories = [ directories = [
@ -29,5 +38,6 @@
gnome-firmware gnome-firmware
]; ];
}) })
]; ]
);
} }

View File

@ -21,20 +21,21 @@ in
{ {
imports = [ ]; imports = [ ];
config = ( options.me = {
media.enable = lib.mkOption {
type = lib.types.bool;
default = false;
example = true;
description = "Whether we want to install media.";
};
};
config = lib.mkIf config.me.media.enable (
lib.mkMerge [ lib.mkMerge [
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
ffmpeg ffmpeg
]; ];
home-manager.users.talexander =
{ pkgs, ... }:
{
home.file.".config/mpv/mpv.conf" = {
source = ./files/mpv.conf;
};
};
} }
(lib.mkIf config.me.graphical { (lib.mkIf config.me.graphical {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -44,6 +45,14 @@ in
# So far I prefer imv over swayimg because imv supports the 'p' hotkey to print the currently-viewed file to stdout (useful for pipelines) and afaik doesn't support the exec:// protocol which seems like a massive risk. # So far I prefer imv over swayimg because imv supports the 'p' hotkey to print the currently-viewed file to stdout (useful for pipelines) and afaik doesn't support the exec:// protocol which seems like a massive risk.
imv imv
]; ];
home-manager.users.talexander =
{ pkgs, ... }:
{
home.file.".config/mpv/mpv.conf" = {
source = ./files/mpv.conf;
};
};
}) })
(lib.mkIf (config.me.graphics_card_type == "amd" || config.me.graphics_card_type == "intel") { (lib.mkIf (config.me.graphics_card_type == "amd" || config.me.graphics_card_type == "intel") {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [