The Blue Update #1

Merged
Jimbo merged 101 commits from Refactor into main 2024-10-25 21:26:22 -04:00
12 changed files with 44 additions and 32 deletions
Showing only changes of commit 49ce2cd341 - Show all commits

View file

@ -7,6 +7,8 @@
../../../modules/home/files ../../../modules/home/files
../../../modules/home/settings ../../../modules/home/settings
../../../modules/home/programs ../../../modules/home/programs
../../../modules/home/programs/misc/production
../../../modules/home/programs/misc/school
../../../modules/home/programs/misc/gaming/xash3d ../../../modules/home/programs/misc/gaming/xash3d
../../../modules/home/sway ../../../modules/home/sway
../../../modules/home/utils ../../../modules/home/utils
@ -14,6 +16,7 @@
# Misc # Misc
../../../overlays ../../../overlays
../../../variables ../../../variables
../../../variables/look/colors/red
# Imports # Imports
nur.nixosModules.nur nur.nixosModules.nur

View file

@ -1,13 +1,22 @@
{ nur, ... }: { nur, ... }:
{ {
imports = [ imports = [
nur.nixosModules.nur # Apps and programs
../../../modules/home ../../../modules/home
../../../modules/home/users ../../../modules/home/users
../../../modules/home/files ../../../modules/home/files
../../../modules/home/settings ../../../modules/home/settings
../../../modules/home/programs ../../../modules/home/programs
../../../modules/home/programs/misc/remote-desktop
../../../modules/home/sway ../../../modules/home/sway
../../../modules/home/utils ../../../modules/home/utils
# Misc
../../../overlays
../../../variables
../../../variables/look/colors/purple
# Imports
nur.nixosModules.nur
]; ];
} }

View file

@ -11,11 +11,13 @@
../../../modules/system/services ../../../modules/system/services
# Devices and hardware # Devices and hardware
hardware.nixosModules.pine64-pinebook-pro
../../../modules/system/devices ../../../modules/system/devices
../../../modules/system/devices/boot/extlinux ../../../modules/system/devices/boot/extlinux
../../../modules/system/devices/networking/firewall/pc ../../../modules/system/devices/networking/firewall/pc
../../../modules/system/devices/networking/wireguard/pc ../../../modules/system/devices/networking/wireguard/pc
# Imports
hardware.nixosModules.pine64-pinebook-pro
]; ];
networking.hostName = "shuttleworth"; networking.hostName = "shuttleworth";

View file

@ -7,7 +7,7 @@
source = ./assets/pfp.png; source = ./assets/pfp.png;
}; };
".assets/wallpapers" = { ".assets/wallpapers" = {
source = ./assets/wallpapers/dogmatica; source = ./assets/wallpapers/${config.look.colors.wallpapers};
}; };
".assets/lockscreen" = { ".assets/lockscreen" = {
source = ./assets/lockscreens/holymoly; source = ./assets/lockscreens/holymoly;

View file

@ -3,7 +3,7 @@
services.mako = { services.mako = {
enable = true; enable = true;
borderColor = "#${config.look.colors.accent}"; borderColor = "#${config.look.colors.accent}";
backgroundColor = "#${config.look.colors.dark}CC"; backgroundColor = "#${config.look.colors.dark}D9";
output = "${config.displays.d1}"; output = "${config.displays.d1}";
sort = "+time"; sort = "+time";
layer = "overlay"; layer = "overlay";

View file

@ -20,7 +20,7 @@
urgent-foreground = mkLiteral "#${config.look.colors.urgent}"; urgent-foreground = mkLiteral "#${config.look.colors.urgent}";
active-foreground = mkLiteral "#${config.look.colors.split}"; active-foreground = mkLiteral "#${config.look.colors.split}";
selected-active-foreground = mkLiteral "#${config.look.colors.prime}"; 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}"; bordercolor = mkLiteral "#${config.look.colors.prime}";
selected-normal-foreground = mkLiteral "#FFFFFF"; selected-normal-foreground = mkLiteral "#FFFFFF";
selected-normal-background = mkLiteral "#${config.look.colors.prime}80"; selected-normal-background = mkLiteral "#${config.look.colors.prime}80";

View file

@ -6,6 +6,5 @@
./gaming/launchers ./gaming/launchers
./general ./general
./headless ./headless
./production
]; ];
} }

View file

@ -16,7 +16,7 @@
}; };
}; };
iconTheme = { iconTheme = {
package = pkgs.papirus-icon-theme.override { color = "red"; }; package = pkgs.papirus-icon-theme.override { color = "${config.look.colors.folder}"; };
name = "Papirus-Dark"; name = "Papirus-Dark";
}; };
cursorTheme = { cursorTheme = {

View file

@ -1,6 +0,0 @@
{ ... }:
{
imports = [
./red
];
}

View file

@ -6,14 +6,17 @@
}; };
config.look.colors = { config.look.colors = {
prime = ''3823C4''; #3823C4 prime = "3823C4"; #3823C4
accent = ''1B1F59''; #1B1F59 accent = "1B1F59"; #1B1F59
split = ''555B9E''; #555B9E split = "555B9E"; #555B9E
actSplit = ''5980B7''; #5980B7 actSplit = "5980B7"; #5980B7
dark = ''101419''; #101419 dark = "101419"; #101419
mid = ''171C23''; #171C23 mid = "171C23"; #171C23
light = ''272b33''; #272B33 light = "272b33"; #272B33
urgent = ''C43823''; #C43823 urgent = "C43823"; #C43823
text = ''C7D3E3''; #C7D3E3 text = "C7D3E3"; #C7D3E3
folder = "indigo";
wallpapers = "purplespace";
}; };
} }

View file

@ -6,14 +6,17 @@
}; };
config.look.colors = { config.look.colors = {
prime = ''c91236''; #c91236 prime = "c91236"; #c91236
accent = ''56111f''; #56111f accent = "56111f"; #56111f
split = ''722d51''; #722d51 split = "722d51"; #722d51
actSplit = ''754566''; #754566 actSplit = "754566"; #754566
dark = ''191016''; #191016 dark = "191016"; #191016
mid = ''23171d''; #23171d mid = "23171d"; #23171d
light = ''272b33''; #272B33 light = "272b33"; #272B33
urgent = ''C43823''; #C43823 urgent = "C43823"; #C43823
text = ''C7D3E3''; #C7D3E3 text = "C7D3E3"; #C7D3E3
folder = "red";
wallpapers = "dogmatica";
}; };
} }

View file

@ -2,7 +2,6 @@
{ {
imports = [ imports = [
./border ./border
./colors
./fonts ./fonts
]; ];
} }