Many changes to make themes more OLED friendly

absol/configuration.nix

@@ -109,6 +109,9 @@
     enable = true;
   };
 
+  # iwlwifi fix?
+  hardware.enableRedistributableFirmware = true;
+
   # bluetooth
   hardware.bluetooth.enable = true;
   hardware.bluetooth.powerOnBoot = true;
@@ -139,14 +142,7 @@
   # List packages installed in system profile.
     environment.systemPackages = 
     with pkgs;
-      let
+      [
-        catp-gtk = pkgs.catppuccin-gtk.override {
-          accents = [ "flamingo" ]; # You can specify multiple accents here to output multiple themes
-          size = "compact";
-          tweaks = [ "rimless" "black" ]; # You can also specify multiple tweaks here
-          variant = "macchiato";
-        };
-      in [
         texliveFull
         # for connecting to nas
         nfs-utils
@@ -154,40 +150,14 @@
         # some standards for convenience
         vim
         parted
-        os-prober
         qpdfview
-        swww
-
-        # greeter
-        greetd.gtkgreet
-        catp-gtk
 
         # deps for hyprland / eww
         socat
-        xdg-desktop-portal-hyprland
       ];
 
   system.stateVersion = "24.05";
 
-  # NFS setup
-  services.rpcbind.enable = true; # needed for NFS
-  systemd.mounts = [{
-    type = "nfs";
-    mountConfig = {
-      Options = "noatime";
-    };
-    what = "192.168.178.20:/volume1/MiniDrive";
-    where = "/MiniDrive";
-  }];
-
-  systemd.automounts = [{
-    wantedBy = [ "multi-user.target" ];
-    automountConfig = {
-      TimeoutIdleSec = "10";
-    };
-    where = "/MiniDrive";
-    }];
-
   # source zsh
   programs.zsh.enable = true;
   users.defaultUserShell = pkgs.zsh;
@@ -200,8 +170,6 @@
   environment.sessionVariables = {
     ## disable logging when direnv changes
     DIRENV_LOG_FORMAT = [];
-    # GTK theme (set here for greetd)
-    GTK_THEME = "Catppuccin-Macchiato-Compact-Flamingo-Dark";
   };
 
   # fonts
@@ -237,8 +205,6 @@
     IdentityFile ~/.ssh/git
     '';
 
-  programs.steam.enable = true;
-
   # thunar
   programs.thunar = {
     enable = true;

absol/eww/config/eww.scss

@@ -23,7 +23,7 @@ $overlay0: #6e738d;
 $surface2: #5b6078;
 $surface1: #494d64;
 $surface0: #363a4f;
-$base: #24273a;
+$base: #000000;//#24273a;
 $mantle: #1e2030;
 $crust: #181926;
 
@@ -32,11 +32,6 @@ $crust: #181926;
   font-family: "monospace";
 }
 
-// .bar {
-//   background-color: $base;
-//   border-radius: 16px;
-// }
-
 .container {
   background-color: $base;
   border-radius: 16px;

absol/eww/config/eww.yuck

@@ -16,7 +16,6 @@
   (centerbox
     :class "bar"
     (left)
-;    (center)
     ""
     (right)
   )
@@ -32,15 +31,15 @@
   )
 )
 
-(defwidget center []
+; (defwidget center []
-  (box
+  ;   (box
-    :space-evenly false
+    ;     :space-evenly false
-    :halign "center"
+    ;     :halign "center"
-    :class "container"
+    ;     :class "container"
-    :visible {strlength(window) != 0}
+    ;     :visible {strlength(window) != 0}
-    (windowtitle)
+    ;     (windowtitle)
-  )
+  ;   )
-)
+; )
 
 (defwidget right []
   (box

absol/hardware-configuration.nix

@@ -8,8 +8,9 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "ahci" "usbhid" "nvme" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
+  boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 

absol/hypr/hypridle.conf

@@ -4,29 +4,22 @@ general {
     after_sleep_cmd = hyprctl dispatch dpms on  # to avoid having to press a key twice to turn on the display.
 }
 
-#listener {
-#    timeout = 150                                # 2.5min.
-#    on-timeout = brightnessctl -s set 10         # set monitor backlight to minimum, avoid 0 on OLED monitor.
-#    on-resume = brightnessctl -r                 # monitor backlight restore.
-#}
-
-# turn off keyboard backlight, comment out this section if you dont have a keyboard backlight.
-#listener { 
-#    timeout = 150                                          # 2.5min.
-#    on-timeout = brightnessctl -sd rgb:kbd_backlight set 0 # turn off keyboard backlight.
-#    on-resume = brightnessctl -rd rgb:kbd_backlight        # turn on keyboard backlight.
-#}
-
 listener {
-    timeout = 300                                 # 5min
+    timeout = 150                                # 2.5min.
-    on-timeout = loginctl lock-session            # lock screen when timeout has passed
+    on-timeout = brillo -O && brillo -S 10         # set monitor backlight to minimum, avoid 0 on OLED monitor.
+    on-resume = brillo -I                 # monitor backlight restore.
 }
 
-listener {
+#listener {
-    timeout = 330                                 # 5.5min
+#    timeout = 300                                 # 5min
-    on-timeout = hyprctl dispatch dpms off        # screen off when timeout has passed
+#    on-timeout = loginctl lock-session            # lock screen when timeout has passed
-    on-resume = hyprctl dispatch dpms on          # screen on when activity is detected after timeout has fired.
+#}
-}
+
+#listener {
+#    timeout = 330                                 # 5.5min
+#    on-timeout = hyprctl dispatch dpms off        # screen off when timeout has passed
+#    on-resume = hyprctl dispatch dpms on          # screen on when activity is detected after timeout has fired.
+#}
 
 listener {
     timeout = 1800                                # 30min

absol/hypr/hyprland.nix

@@ -1,15 +1,21 @@
 { pkgs, ... }:
 {
+  services.hypridle.enable = true;
+  services.hyprpaper.enable = true;
+  programs.hyprlock.enable = true;
+
   # hyprland setup
   wayland.windowManager.hyprland = {
     enable = true;
     xwayland.enable = true;
     settings = {
+      xwayland."force_zero_scaling" = true;
       env = [
         "HYPRCURSOR_THEME,Bibata-Original-Classic"
-        "HYPRCURSOR_SIZE,48"
+        "HYPRCURSOR_SIZE,24"
-        "XCURSOR_THEME,Catppuccin-Macchiato-Red"
+        #"XCURSOR_THEME,Catppuccin-Macchiato-Red"
-        "XCURSOR_SIZE,48"
+        "XCURSOR_SIZE,24"
+        "GDK_SCALE,2"
       ];
       workspace = [
         "1, monitor:eDP-1,  default:true, persistent:true"
@@ -17,6 +23,7 @@
       ];
       monitor = [
         "eDP-1, 2880x1800@120, 0x0, 2"
+        #"HDMI-A-1, 2560x1440@75, 0x1800, 1"
       ];
       input = {
         kb_layout = "de";
@@ -26,30 +33,17 @@
       "$mod" = "SUPER";
       "$modd" = "SUPER_SHIFT";
       general = {
-        gaps_in = 8;
+        gaps_in = 0;
-        gaps_out = 15;
+        gaps_out = 0;
-        border_size = 3;
+        border_size = 0;
 
         resize_on_border = true;
         layout = "dwindle";
-        
-        "col.active_border" = "rgba(cba6f7ff) rgba(89b4faff) rgba(94e2d5ff) 10deg";
-        "col.inactive_border" = "0xff45475a";
-        "col.nogroup_border" = "0xff89dceb";
-        "col.nogroup_border_active" = "0xfff9e2af";
       };
       decoration = {
-        blur = {
+        blur.enabled = false;
-          new_optimizations = true;
+        drop_shadow = false;
-          size = 1;
+        rounding = 0;
-          passes = 1;
-        };
-        drop_shadow = true;
-        shadow_range = 100;
-        shadow_render_power = 5;
-        "col.shadow" = "0x33000000";
-        "col.shadow_inactive" = "0x22000000";
-        rounding = 15;
       };
       animations = {
         enabled = 1;
@@ -63,6 +57,7 @@
       };
       misc = {
         disable_hyprland_logo = true;
+        vfr = true;
       };
       bind = [
         # opening programs
@@ -126,11 +121,13 @@
         ", XF86MonBrightnessDown, exec, brillo -q -U 5"
       ];
       exec-once = [
-        "/home/leonv/Git/nixos/absol/hypr/killer.sh"
+        #"/home/leonv/Git/nixos/absol/hypr/killer.sh"
-        "/home/leonv/Git/nixos/absol/hypr/start.sh"
+        #"/home/leonv/Git/nixos/absol/hypr/start.sh"
-        "hyprctl setcursor Bibata-Original-Classic 48"
+        #"hyprctl setcursor Bibata-Original-Classic 24"
-        "systemctl --user import-environment"
+        #"systemctl --user import-environment"
-        "hypridle"
+        #"hypridle"
+        #"hyprpaper"
+        "mako"
       ];
     };
   };
@@ -147,22 +144,30 @@
         dpi-aware = "yes";
       };
       colors = {
-        foreground = "cad3f5";
+        foreground="cdd6f4";
-        background = "24273a";
+        background="000000";
-        regular0 = "494d64";
+        regular0="bac2de";
-        regular1 = "ed8796";
+        regular1="f38ba8";
-        regular3 = "eed49f";
+        regular2="a6e3a1";
-        regular4 = "8aadf4";
+        regular3="f9e2af";
-        regular5 = "f5bde6";
+        regular4="89b4fa";
-        regular6 = "8bd5ca";
+        regular5="f5c2e7";
-        regular7 = "b8c0e0";
+        regular6="94e2d5";
-        bright0 = "5b6078";
+        regular7="585b70";
-        bright1 = "ed8796";
+        bright0="a6adc8";
-        bright3 = "eed49f";
+        bright1="f38ba8";
-        bright4 = "8aadf4";
+        bright2="a6e3a1";
-        bright5 = "f5bde6";
+        bright3="f9e2af";
-        bright6 = "8bd5ca";
+        bright4="89b4fa";
-        bright7 = "a5adcb";
+        bright5="f5c2e7";
+        bright6="94e2d5";
+        bright7="45475a";
+        selection-foreground="cdd6f4";
+        selection-background="414356";
+        search-box-no-match="11111b f38ba8";
+        search-box-match="cdd6f4 313244";
+        jump-labels="11111b fab387";
+        urls="89b4fa";
       };
     };
   };
@@ -190,11 +195,7 @@
     style = ''
       window {
           margin: 0px;
-          border: 2px solid #b59dc3;
-          background-color: #282a36;
           border-radius: 18px;
-
-
           }
           
           #input {
@@ -202,21 +203,21 @@
           border: none;
           color: #f8f8f2;
           border-radius: 15px;
-          background-color: #44475a;
+          background-color: #000000;
           }
           
           #inner-box {
           margin: 5px;
           border: none;
           border-radius: 15px;
-          background-color: #282a36;
+          background-color: #000000;
           }
           
           #outer-box {
           margin: 5px;
           border: none;
           border-radius: 15px;
-          background-color: #282a36;
+          background-color: #000000;
           }
           
           #scroll {
@@ -242,7 +243,7 @@
           
           #entry:selected {
               border-radius: 15px;
-              background-color: #44475a;
+              background-color: #62AEEFFF;
           }
           
           #entry:selected #text {

absol/hypr/hyprlock.conf

@@ -39,7 +39,7 @@ label {
 
 input-field {
     monitor =
-    size = 200, 50
+    size = 400, 50
     outline_thickness = 3
     dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8
     dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0

absol/hypr/hyprpaper.conf

@@ -1,4 +1,4 @@
-preload = ~/Git/nixos/absol/hypr/wallpaper.jpg
+preload = /home/leonv/Git/nixos/absol/hypr/wallpaper.jpg
 
 #set the default wallpaper(s) seen on inital workspace(s) --depending on the number of monitors used
-wallpaper = monitor1,~/Git/nixos/absol/hypr/wallpaper.jpg
+wallpaper = ,/home/leonv/Git/nixos/absol/hypr/wallpaper.jpg

absol/hypr/start.sh

@@ -3,8 +3,8 @@
 # init nmapplet
 # TODO add back once eww supports tray
 # nm-applet --indicator &
-swww init
+#swww init
-swww img /home/leonv/Git/nixos/absol/hypr/wallpaper.jpg
+#swww img /home/leonv/Git/nixos/absol/hypr/wallpaper.jpg
 
 # notification
-mako &
+#mako &

absol/leonv.nix

@@ -12,8 +12,7 @@
 
   home.packages = with pkgs; [ 
     brillo
-    # theme for gtk applications
+    synology-drive-client
-    orchis-theme
 
     # stuff
     jq
@@ -58,18 +57,14 @@
     mako
     libnotify
     pavucontrol
-    hyprpaper
     qimgv
     playerctl
     hyprpicker
-    hypridle
-    hyprlock
     wev
     inputs.hyprland-contrib.packages.${pkgs.system}.grimblast
     bluez
     htop
     archiver
-    #gnome.file-roller
     zip
     unzip
     emacs
@@ -96,6 +91,7 @@
   xdg.configHome = /home/leonv/.config;
   xdg.configFile."hypr/hypridle.conf".source = ./hypr/hypridle.conf;
   xdg.configFile."hypr/hyprlock.conf".source = ./hypr/hyprlock.conf;
+  xdg.configFile."hypr/hyprpaper.conf".source = ./hypr/hyprpaper.conf;
   xdg.configFile."doom/init.el".source = ./doom/init.el;
   xdg.configFile."doom/config.el".source = ./doom/config.el;
   xdg.configFile."doom/packages.el".source = ./doom/packages.el;
@@ -120,16 +116,18 @@
     oh-my-zsh.enable = true;
   };
 
+  home.pointerCursor = {
+    gtk.enable = true;
+    package = pkgs.bibata-cursors;
+    name = "Bibata-Modern-Classic";
+    size = 24;
+  };
+
   gtk = {
     enable = true;
     theme = {
-      name = "Catppuccin-Macchiato-Compact-Flamingo-Dark";
+      name = "Orchis-Dark-Compact";
-      package = pkgs.catppuccin-gtk.override {
+      package = pkgs.orchis-theme.overrideAttrs (finalAttrs: { tweaks = [ "dark" ]; });
-        accents = [ "flamingo" ];
-        size = "compact";
-        tweaks = [ "rimless" "black" ];
-        variant = "macchiato";
-      };
     };
     iconTheme = {
       name = "Dracula";
@@ -139,7 +137,7 @@
       name = "NotoSans Nerd Font";
     };
   };
-  home.sessionVariables.GTK_THEME = "Catppuccin-Macchiato-Compact-Flamingo-Dark";
+  home.sessionVariables.GTK_THEME = "Orchis-Dark-Compact";
   home.sessionPath = [ "$HOME/.config/emacs/bin" ];
 
   services.mpris-proxy.enable = true;

flake.nix

@@ -55,6 +55,7 @@
             home-manager.useUserPackages = true;
             home-manager.users.leonv = import ./absol/leonv.nix;
             home-manager.extraSpecialArgs = { inherit inputs; };
+            home-manager.backupFileExtension = "backup";
           }
         ];
       };