talexander/machine_setup
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

base: talexander:e1a274c88eca1ddaacbc48175f508d4b4599c31f
Branches Tags
talexander:main
talexander:nix
talexander:install_files_mixin
talexander:starship
talexander:pixelbook
..
compare: talexander:88a6d046b80af97dd62c1f2da777a77b8416d0ac
Branches Tags
talexander:nix
talexander:install_files_mixin
talexander:main
talexander:starship
talexander:pixelbook

No commits in common. "e1a274c88eca1ddaacbc48175f508d4b4599c31f" and "88a6d046b80af97dd62c1f2da777a77b8416d0ac" have entirely different histories.
e1a274c88e ... 88a6d046b8

7 changed files with 103 additions and 139 deletions
Show Stats Expand all files Collapse all files

1
nix/configuration/hosts/neelix/default.nix
View File

@ -28,5 +28,4 @@
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;
} }

5
nix/configuration/hosts/odo/default.nix
View File

@ -37,14 +37,11 @@
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;
} }

2
nix/configuration/roles/emacs/default.nix
View File

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

98
nix/configuration/roles/git/default.nix
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 [
# ] ]
# } }
# ''; '';
# }; };
# }) })
# ]; ];
# }) })
]; ];
} }

17
nix/configuration/roles/launch_keyboard/default.nix
View File

@ -8,18 +8,7 @@
{ {
imports = [ ]; imports = [ ];
options.me = { config = lib.mkIf config.me.graphical {
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/
@ -42,7 +31,5 @@
}; };
}; };
}; };
}) };
]
);
} }

16
nix/configuration/roles/lvfs/default.nix
View File

@ -8,19 +8,10 @@
{ {
imports = [ ]; imports = [ ];
options.me = { config = lib.mkMerge [
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 = [
@ -38,6 +29,5 @@
gnome-firmware gnome-firmware
]; ];
}) })
] ];
);
} }

29
nix/configuration/roles/media/default.nix
View File

@ -21,30 +21,12 @@ in
{ {
imports = [ ]; imports = [ ];
options.me = { config = (
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
]; ];
}
(lib.mkIf config.me.graphical {
environment.systemPackages = with pkgs; [
mpv
evince
gimp
# 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
];
home-manager.users.talexander = home-manager.users.talexander =
{ pkgs, ... }: { pkgs, ... }:
@ -53,6 +35,15 @@ in
source = ./files/mpv.conf; source = ./files/mpv.conf;
}; };
}; };
}
(lib.mkIf config.me.graphical {
environment.systemPackages = with pkgs; [
mpv
evince
gimp
# 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
];
}) })
(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; [