From 60364b8d20ef32df2a19a1d6a34907f4c5623c0a Mon Sep 17 00:00:00 2001 From: Liam Malone Date: Thu, 13 Nov 2025 12:42:08 +0000 Subject: [PATCH] Power management & theming changes --- configs/hypr-darp8/hypr-colors.conf | 188 ++++++++++++++-------------- configs/hypr/hyprland.conf | 2 +- hosts/darp8/configuration.nix | 37 +++++- hosts/darp8/home.nix | 25 ---- hosts/graphical/configuration.nix | 3 - hosts/graphical/file.nix | 10 ++ hosts/graphical/pkgs.nix | 3 + 7 files changed, 143 insertions(+), 125 deletions(-) diff --git a/configs/hypr-darp8/hypr-colors.conf b/configs/hypr-darp8/hypr-colors.conf index ae5503d..56fba21 100644 --- a/configs/hypr-darp8/hypr-colors.conf +++ b/configs/hypr-darp8/hypr-colors.conf @@ -1,151 +1,151 @@ -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$background = rgba(111410ff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$background = rgba(1e100eff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png +$image = /home/liamm/pictures/wallpapers/halloween-temple.png $error = rgba(ffb4abff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png +$image = /home/liamm/pictures/wallpapers/halloween-temple.png $error_container = rgba(93000aff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$inverse_on_surface = rgba(2e312dff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$inverse_on_surface = rgba(3d2c2aff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$inverse_primary = rgba(36693aff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$inverse_primary = rgba(b6231fff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$inverse_surface = rgba(e1e3dcff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$inverse_surface = rgba(f8dcd9ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$on_background = rgba(e1e3dcff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$on_background = rgba(f8dcd9ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png +$image = /home/liamm/pictures/wallpapers/halloween-temple.png $on_error = rgba(690005ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png +$image = /home/liamm/pictures/wallpapers/halloween-temple.png $on_error_container = rgba(ffdad6ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$on_primary = rgba(00390fff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$on_primary = rgba(690004ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$on_primary_container = rgba(00320cff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$on_primary_container = rgba(000000ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$on_primary_fixed = rgba(002106ff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$on_primary_fixed = rgba(410002ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$on_primary_fixed_variant = rgba(1d5124ff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$on_primary_fixed_variant = rgba(930009ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$on_secondary = rgba(213521ff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$on_secondary = rgba(5e1511ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$on_secondary_container = rgba(cfe7caff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$on_secondary_container = rgba(ffdcd8ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$on_secondary_fixed = rgba(0d200eff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$on_secondary_fixed = rgba(410102ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$on_secondary_fixed_variant = rgba(374c36ff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$on_secondary_fixed_variant = rgba(7d2c25ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$on_surface = rgba(e1e3dcff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$on_surface = rgba(f8dcd9ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$on_surface_variant = rgba(c1c9bcff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$on_surface_variant = rgba(e3beb9ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$on_tertiary = rgba(561b32ff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$on_tertiary = rgba(00363dff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$on_tertiary_container = rgba(4e152cff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$on_tertiary_container = rgba(000000ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$on_tertiary_fixed = rgba(3b051dff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$on_tertiary_fixed = rgba(001f24ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$on_tertiary_fixed_variant = rgba(713148ff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$on_tertiary_fixed_variant = rgba(004f58ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$outline = rgba(8b9388ff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$outline = rgba(aa8985ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$outline_variant = rgba(41493fff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$outline_variant = rgba(5a403dff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$primary = rgba(a7e0a5ff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$primary = rgba(ffb4abff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$primary_container = rgba(8cc48bff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$primary_container = rgba(fd564aff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$primary_fixed = rgba(b7f1b4ff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$primary_fixed = rgba(ffdad5ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$primary_fixed_dim = rgba(9cd49aff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$primary_fixed_dim = rgba(ffb4abff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png +$image = /home/liamm/pictures/wallpapers/halloween-temple.png $scrim = rgba(000000ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$secondary = rgba(b5cdb1ff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$secondary = rgba(ffb4abff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$secondary_container = rgba(374c36ff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$secondary_container = rgba(802e27ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$secondary_fixed = rgba(d1e9ccff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$secondary_fixed = rgba(ffdad5ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$secondary_fixed_dim = rgba(b5cdb1ff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$secondary_fixed_dim = rgba(ffb4abff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png +$image = /home/liamm/pictures/wallpapers/halloween-temple.png $shadow = rgba(000000ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$source_color = rgba(8cc48bff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$source_color = rgba(e6463cff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$surface = rgba(111410ff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$surface = rgba(1e100eff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$surface_bright = rgba(373a35ff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$surface_bright = rgba(473533ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$surface_container = rgba(1d201cff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$surface_container = rgba(2b1c1aff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$surface_container_high = rgba(282b26ff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$surface_container_high = rgba(362624ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$surface_container_highest = rgba(323631ff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$surface_container_highest = rgba(42312eff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$surface_container_low = rgba(191c18ff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$surface_container_low = rgba(271816ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$surface_container_lowest = rgba(0c0f0bff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$surface_container_lowest = rgba(180b09ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$surface_dim = rgba(111410ff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$surface_dim = rgba(1e100eff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$surface_tint = rgba(9cd49aff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$surface_tint = rgba(ffb4abff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$surface_variant = rgba(41493fff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$surface_variant = rgba(5a403dff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$tertiary = rgba(ffc2d3ff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$tertiary = rgba(6ed5e6ff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$tertiary_container = rgba(f39eb8ff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$tertiary_container = rgba(2b9eafff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$tertiary_fixed = rgba(ffd9e2ff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$tertiary_fixed = rgba(9af0ffff) -$image = /home/liamm/pictures/wallpapers/frieren-and-himmel.png -$tertiary_fixed_dim = rgba(ffb1c8ff) +$image = /home/liamm/pictures/wallpapers/halloween-temple.png +$tertiary_fixed_dim = rgba(6ed5e6ff) diff --git a/configs/hypr/hyprland.conf b/configs/hypr/hyprland.conf index a54f983..2998ce1 100644 --- a/configs/hypr/hyprland.conf +++ b/configs/hypr/hyprland.conf @@ -10,7 +10,7 @@ source = ./hypr-monitors.conf # Environment -env=HYPRCURSOR_THEME,Bibata-Modern-Ice +# env=HYPRCURSOR_THEME,Bibata-Modern-Ice env=HYPRCURSOR_SIZE,24 env=XDG_CURRENT_DESKTOP,Hyprland env=XDG_SESSION_TYPE,wayland diff --git a/hosts/darp8/configuration.nix b/hosts/darp8/configuration.nix index 25362f4..d0e19f2 100644 --- a/hosts/darp8/configuration.nix +++ b/hosts/darp8/configuration.nix @@ -12,8 +12,6 @@ time.timeZone = "Europe/Dublin"; # time.timeZone = "America/New_York"; - services.tailscale.enable = false; - hardware = { bluetooth.enable = true; graphics = { @@ -25,6 +23,41 @@ }; system76.enableAll = true; }; + swapDevices = [ { + device = "/var/swapfile"; + size = 24 * 1024; + } ]; + + boot.resumeDevice = "/dev/disk/by-uuid/c7704142-d0b9-4a85-af1c-ce776b895c0f"; + boot.kernelParams = [ + "resume_offset=13629440" + "mem_sleep_default=deep" + ]; + boot.initrd.postMountCommands = lib.mkAfter '' + swapon /mnt-root/var/swapfile + ''; + + services.system76-scheduler.enable = true; + services.tailscale.enable = false; + services.power-profiles-daemon.enable = false; + services.auto-cpufreq.enable = false; + services.thermald.enable = true; + + systemd.services.charge-thresholds = { + description = "Set System76 battery charge thresholds"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; # Ensure daemon is ready + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.system76-power}/bin/system76-power charge-thresholds --profile balanced"; + RemainAfterExit = true; + }; + }; + services.logind.lidSwitch = "suspend-then-hibernate"; + systemd.sleep.extraConfig = '' + HibernateDelaySec=20m + SuspendState=mem + ''; nixpkgs.config.allowUnfree = true; diff --git a/hosts/darp8/home.nix b/hosts/darp8/home.nix index 298e5f1..539484a 100644 --- a/hosts/darp8/home.nix +++ b/hosts/darp8/home.nix @@ -41,33 +41,8 @@ ]; nix.settings.experimental-features = [ "nix-command" "flakes" ]; - # THEMING - - ## GTK SECTION - gtk = { - enable = true; - cursorTheme = { - package = pkgs.bibata-cursors; - name = "Bibata-Modern-Ice"; - }; - theme = { - name = "Materia-dark"; - package = pkgs.materia-theme; - }; - iconTheme = { - package = pkgs.arc-icon-theme; - name = "arc-icon-theme"; - }; - }; - - # ENV SETTINGS xdg.enable = true; - xdg.configFile = { - "user-dirs.dirs".source = ../../configs/user-dirs.dirs; - "user-dirs.locale".source = ../../configs/user-dirs.locale; - }; - # Let Home Manager install and manage itself. programs.home-manager.enable = true; diff --git a/hosts/graphical/configuration.nix b/hosts/graphical/configuration.nix index 6d1db7d..d9ad301 100644 --- a/hosts/graphical/configuration.nix +++ b/hosts/graphical/configuration.nix @@ -62,13 +62,10 @@ }; }; - auto-cpufreq.enable = true; libinput.enable = true; blueman.enable = true; gvfs.enable = true; - thermald.enable = true; - power-profiles-daemon.enable = false; pulseaudio.enable = false; upower.enable = true; }; diff --git a/hosts/graphical/file.nix b/hosts/graphical/file.nix index 3c5a74b..eb45853 100644 --- a/hosts/graphical/file.nix +++ b/hosts/graphical/file.nix @@ -76,5 +76,15 @@ in outOfStoreSymlink = true; recursive = true; }; + ".config/user-dirs.dirs" = { + source = ../../configs/user-dirs.dirs; + outOfStoreSymlink = true; + recursive = false; + }; + ".config/user-dirs.locale" = { + source = ../../configs/user-dirs.locale; + outOfStoreSymlink = true; + recursive = false; + }; }; } diff --git a/hosts/graphical/pkgs.nix b/hosts/graphical/pkgs.nix index 324c606..7cb7123 100644 --- a/hosts/graphical/pkgs.nix +++ b/hosts/graphical/pkgs.nix @@ -6,9 +6,11 @@ { # BEGIN PACKAGES home.packages = with pkgs; [ + arc-icon-theme audacity android-studio bat + bibata-cursors brave brightnessctl btop @@ -36,6 +38,7 @@ keepassxc libreoffice localsend + materia-theme mpv mupdf networkmanagerapplet