From 49ce2cd34174f44a092664209501b16b1b025aa8 Mon Sep 17 00:00:00 2001 From: Jimbo Date: Wed, 16 Oct 2024 00:04:56 -0400 Subject: [PATCH] Changes to make the laptop work --- hosts/firefly/home/default.nix | 3 +++ hosts/shuttleworth/home/default.nix | 11 ++++++++++- hosts/shuttleworth/system/default.nix | 4 +++- modules/home/files/default.nix | 2 +- modules/home/programs/gui/mako/default.nix | 2 +- modules/home/programs/gui/rofi/default.nix | 2 +- modules/home/programs/misc/default.nix | 1 - modules/home/settings/gtk/default.nix | 2 +- variables/look/colors/default.nix | 6 ------ variables/look/colors/purple/default.nix | 21 ++++++++++++--------- variables/look/colors/red/default.nix | 21 ++++++++++++--------- variables/look/default.nix | 1 - 12 files changed, 44 insertions(+), 32 deletions(-) delete mode 100644 variables/look/colors/default.nix diff --git a/hosts/firefly/home/default.nix b/hosts/firefly/home/default.nix index ae119d8..ceccba1 100644 --- a/hosts/firefly/home/default.nix +++ b/hosts/firefly/home/default.nix @@ -7,6 +7,8 @@ ../../../modules/home/files ../../../modules/home/settings ../../../modules/home/programs + ../../../modules/home/programs/misc/production + ../../../modules/home/programs/misc/school ../../../modules/home/programs/misc/gaming/xash3d ../../../modules/home/sway ../../../modules/home/utils @@ -14,6 +16,7 @@ # Misc ../../../overlays ../../../variables + ../../../variables/look/colors/red # Imports nur.nixosModules.nur diff --git a/hosts/shuttleworth/home/default.nix b/hosts/shuttleworth/home/default.nix index 5e34610..ff54bf3 100644 --- a/hosts/shuttleworth/home/default.nix +++ b/hosts/shuttleworth/home/default.nix @@ -1,13 +1,22 @@ { nur, ... }: { imports = [ - nur.nixosModules.nur + # Apps and programs ../../../modules/home ../../../modules/home/users ../../../modules/home/files ../../../modules/home/settings ../../../modules/home/programs + ../../../modules/home/programs/misc/remote-desktop ../../../modules/home/sway ../../../modules/home/utils + + # Misc + ../../../overlays + ../../../variables + ../../../variables/look/colors/purple + + # Imports + nur.nixosModules.nur ]; } diff --git a/hosts/shuttleworth/system/default.nix b/hosts/shuttleworth/system/default.nix index 244f280..3f406b5 100644 --- a/hosts/shuttleworth/system/default.nix +++ b/hosts/shuttleworth/system/default.nix @@ -11,11 +11,13 @@ ../../../modules/system/services # Devices and hardware - hardware.nixosModules.pine64-pinebook-pro ../../../modules/system/devices ../../../modules/system/devices/boot/extlinux ../../../modules/system/devices/networking/firewall/pc ../../../modules/system/devices/networking/wireguard/pc + + # Imports + hardware.nixosModules.pine64-pinebook-pro ]; networking.hostName = "shuttleworth"; diff --git a/modules/home/files/default.nix b/modules/home/files/default.nix index 206b170..e640b39 100644 --- a/modules/home/files/default.nix +++ b/modules/home/files/default.nix @@ -7,7 +7,7 @@ source = ./assets/pfp.png; }; ".assets/wallpapers" = { - source = ./assets/wallpapers/dogmatica; + source = ./assets/wallpapers/${config.look.colors.wallpapers}; }; ".assets/lockscreen" = { source = ./assets/lockscreens/holymoly; diff --git a/modules/home/programs/gui/mako/default.nix b/modules/home/programs/gui/mako/default.nix index 4d3e139..c818efc 100644 --- a/modules/home/programs/gui/mako/default.nix +++ b/modules/home/programs/gui/mako/default.nix @@ -3,7 +3,7 @@ services.mako = { enable = true; borderColor = "#${config.look.colors.accent}"; - backgroundColor = "#${config.look.colors.dark}CC"; + backgroundColor = "#${config.look.colors.dark}D9"; output = "${config.displays.d1}"; sort = "+time"; layer = "overlay"; diff --git a/modules/home/programs/gui/rofi/default.nix b/modules/home/programs/gui/rofi/default.nix index 4967db5..a46ab78 100644 --- a/modules/home/programs/gui/rofi/default.nix +++ b/modules/home/programs/gui/rofi/default.nix @@ -20,7 +20,7 @@ urgent-foreground = mkLiteral "#${config.look.colors.urgent}"; active-foreground = mkLiteral "#${config.look.colors.split}"; selected-active-foreground = mkLiteral "#${config.look.colors.prime}"; - background = mkLiteral "#${config.look.colors.dark}B3"; + background = mkLiteral "#${config.look.colors.dark}D9"; bordercolor = mkLiteral "#${config.look.colors.prime}"; selected-normal-foreground = mkLiteral "#FFFFFF"; selected-normal-background = mkLiteral "#${config.look.colors.prime}80"; diff --git a/modules/home/programs/misc/default.nix b/modules/home/programs/misc/default.nix index a5833d9..6172737 100644 --- a/modules/home/programs/misc/default.nix +++ b/modules/home/programs/misc/default.nix @@ -6,6 +6,5 @@ ./gaming/launchers ./general ./headless - ./production ]; } diff --git a/modules/home/settings/gtk/default.nix b/modules/home/settings/gtk/default.nix index 4c9b04b..a02f0a1 100644 --- a/modules/home/settings/gtk/default.nix +++ b/modules/home/settings/gtk/default.nix @@ -16,7 +16,7 @@ }; }; iconTheme = { - package = pkgs.papirus-icon-theme.override { color = "red"; }; + package = pkgs.papirus-icon-theme.override { color = "${config.look.colors.folder}"; }; name = "Papirus-Dark"; }; cursorTheme = { diff --git a/variables/look/colors/default.nix b/variables/look/colors/default.nix deleted file mode 100644 index 8d32ff2..0000000 --- a/variables/look/colors/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: -{ - imports = [ - ./red - ]; -} diff --git a/variables/look/colors/purple/default.nix b/variables/look/colors/purple/default.nix index de215fb..00d8f56 100644 --- a/variables/look/colors/purple/default.nix +++ b/variables/look/colors/purple/default.nix @@ -6,14 +6,17 @@ }; config.look.colors = { - prime = ''3823C4''; #3823C4 - accent = ''1B1F59''; #1B1F59 - split = ''555B9E''; #555B9E - actSplit = ''5980B7''; #5980B7 - dark = ''101419''; #101419 - mid = ''171C23''; #171C23 - light = ''272b33''; #272B33 - urgent = ''C43823''; #C43823 - text = ''C7D3E3''; #C7D3E3 + prime = "3823C4"; #3823C4 + accent = "1B1F59"; #1B1F59 + split = "555B9E"; #555B9E + actSplit = "5980B7"; #5980B7 + dark = "101419"; #101419 + mid = "171C23"; #171C23 + light = "272b33"; #272B33 + urgent = "C43823"; #C43823 + text = "C7D3E3"; #C7D3E3 + + folder = "indigo"; + wallpapers = "purplespace"; }; } diff --git a/variables/look/colors/red/default.nix b/variables/look/colors/red/default.nix index 0837ba5..5da2db1 100644 --- a/variables/look/colors/red/default.nix +++ b/variables/look/colors/red/default.nix @@ -6,14 +6,17 @@ }; config.look.colors = { - prime = ''c91236''; #c91236 - accent = ''56111f''; #56111f - split = ''722d51''; #722d51 - actSplit = ''754566''; #754566 - dark = ''191016''; #191016 - mid = ''23171d''; #23171d - light = ''272b33''; #272B33 - urgent = ''C43823''; #C43823 - text = ''C7D3E3''; #C7D3E3 + prime = "c91236"; #c91236 + accent = "56111f"; #56111f + split = "722d51"; #722d51 + actSplit = "754566"; #754566 + dark = "191016"; #191016 + mid = "23171d"; #23171d + light = "272b33"; #272B33 + urgent = "C43823"; #C43823 + text = "C7D3E3"; #C7D3E3 + + folder = "red"; + wallpapers = "dogmatica"; }; } diff --git a/variables/look/default.nix b/variables/look/default.nix index a5930b9..0fd75f1 100644 --- a/variables/look/default.nix +++ b/variables/look/default.nix @@ -2,7 +2,6 @@ { imports = [ ./border - ./colors ./fonts ]; }