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

Do not install sway on neelix.

Browse Source
This commit is contained in:
Tom Alexander 2025-01-20 20:06:33 -05:00
parent 9d49eb9d6a
commit d0c1bb1b65
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
11 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,4 +27,6 @@
me.graphical = true; me.graphical = true;
me.graphicsCardType = "intel"; me.graphicsCardType = "intel";
me.kodi.enable = true;
} }

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

@ -31,4 +31,6 @@
me.graphical = true; me.graphical = true;
me.graphicsCardType = "amd"; me.graphicsCardType = "amd";
me.sway.enable = true;
} }

4
nix/configuration/roles/blank/default.nix
View File

@ -9,7 +9,7 @@
imports = [ ]; imports = [ ];
options.me = { options.me = {
blank.enabled = lib.mkOption { blank.enable = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
example = true; example = true;
@ -17,7 +17,7 @@
}; };
}; };
config = lib.mkIf config.me.blank.enabled ( config = lib.mkIf config.me.blank.enable (
lib.mkMerge [ lib.mkMerge [
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

8
nix/configuration/roles/kodi/default.nix
View File

@ -9,7 +9,7 @@
imports = [ ]; imports = [ ];
options.me = { options.me = {
kodi.enabled = lib.mkOption { kodi.enable = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
example = true; example = true;
@ -17,13 +17,17 @@
}; };
}; };
config = lib.mkIf config.me.kodi.enabled ( config = lib.mkIf config.me.kodi.enable (
lib.mkMerge [ lib.mkMerge [
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
]; ];
} }
(lib.mkIf config.me.graphical { (lib.mkIf config.me.graphical {
users.extraUsers.kodi.isNormalUser = true;
services.cage.user = "kodi";
services.cage.program = "${pkgs.kodi-wayland}/bin/kodi-standalone";
services.cage.enable = true;
}) })
] ]
); );

4
nix/configuration/roles/sway/default.nix
View File

@ -267,7 +267,7 @@ in
]; ];
options.me = { options.me = {
sway.enabled = lib.mkOption { sway.enable = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
example = true; example = true;
@ -286,7 +286,7 @@ in
description = "List of packages to import as sway configs."; description = "List of packages to import as sway configs.";
}; };
config = { config = lib.mkIf (config.me.graphical && config.me.sway.enable) {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
alacritty alacritty
pcmanfm pcmanfm

2
nix/configuration/roles/sway/force_focus.nix
View File

@ -19,7 +19,7 @@ in
{ {
imports = [ ]; imports = [ ];
config = lib.mkIf config.me.graphical { config = lib.mkIf (config.me.graphical && config.me.sway.enable) {
me.swayIncludes = [ me.swayIncludes = [
force_focus_sway_config force_focus_sway_config
]; ];

2
nix/configuration/roles/sway/iso.nix
View File

@ -16,7 +16,7 @@ in
{ {
imports = [ ]; imports = [ ];
config = lib.mkIf (config.me.buildingIso) { config = lib.mkIf (config.me.buildingIso && config.me.graphical && config.me.sway.enable) {
# Launch a terminal at boot in the live ISO for when hotkeys don't work. # Launch a terminal at boot in the live ISO for when hotkeys don't work.
me.swayIncludes = [ me.swayIncludes = [
launch_terminal launch_terminal

2
nix/configuration/roles/sway/lockscreen.nix
View File

@ -25,7 +25,7 @@ in
{ {
imports = [ ]; imports = [ ];
config = lib.mkIf config.me.graphical { config = lib.mkIf (config.me.graphical && config.me.sway.enable) {
me.swayIncludes = [ me.swayIncludes = [
lockscreen_sway_config lockscreen_sway_config
]; ];

2
nix/configuration/roles/sway/notification.nix
View File

@ -24,7 +24,7 @@ in
{ {
imports = [ ]; imports = [ ];
config = lib.mkIf config.me.graphical { config = lib.mkIf (config.me.graphical && config.me.sway.enable) {
me.swayIncludes = [ me.swayIncludes = [
notification_sway_config notification_sway_config
]; ];

18
nix/configuration/roles/sway/rofimoji.nix
View File

@ -17,7 +17,7 @@ in
{ {
imports = [ ]; imports = [ ];
config = lib.mkIf config.me.graphical { config = lib.mkIf (config.me.graphical && config.me.sway.enable) {
me.swayIncludes = [ me.swayIncludes = [
rofimoji_sway_config rofimoji_sway_config
]; ];
@ -49,14 +49,14 @@ in
}) })
(final: prev: { (final: prev: {
tofi = pkgs.symlinkJoin { tofi = pkgs.symlinkJoin {
name = "tofi"; name = "tofi";
paths = [ prev.tofi ]; paths = [ prev.tofi ];
buildInputs = [ pkgs.makeWrapper ]; buildInputs = [ pkgs.makeWrapper ];
postBuild = '' postBuild = ''
wrapProgram $out/bin/tofi-drun --add-flags --font=${pkgs.source-sans-pro}/share/fonts/opentype/SourceSansPro-Regular.otf --add-flags --config=${./files/tofi-config} wrapProgram $out/bin/tofi-drun --add-flags --font=${pkgs.source-sans-pro}/share/fonts/opentype/SourceSansPro-Regular.otf --add-flags --config=${./files/tofi-config}
wrapProgram $out/bin/tofi --add-flags --config=${./files/tofi-config} wrapProgram $out/bin/tofi --add-flags --config=${./files/tofi-config}
''; '';
}; };
}) })
]; ];
}; };

2
nix/configuration/roles/sway/screenshot.nix
View File

@ -34,7 +34,7 @@ in
{ {
imports = [ ]; imports = [ ];
config = lib.mkIf config.me.graphical { config = lib.mkIf (config.me.graphical && config.me.sway.enable) {
me.swayIncludes = [ me.swayIncludes = [
screenshot_sway_config screenshot_sway_config
]; ];