feat: redesign, with onedark theme

common/variables.nix

@@ -32,10 +32,10 @@ in
   # Default values for this configuration
   config = rec {
     myUserName = "stvnliu";
-    myWallPaperPath = ../home-manager/${myUserName}/assets/deer-wallpaper.jpg;
+    myWallPaperPath = ../home-manager/${myUserName}/assets/od_neon.png;
     myHostName = "nixos-msi";
-    displayScale = 2;
+    displayScale = 1;
-    myWallPaperPathString = "/home/${myUserName}/wallpaper.jpg";
+    myWallPaperPathString = "/home/${myUserName}/wallpaper.png";
     myDisplayName = "Zhongheng Liu";
     myEmail = "z.liu@outlook.com.gr";
     specialisation."powersave".configuration = {

home-manager/stvnliu/hypr/hyprland/default.nix

@@ -1,4 +1,9 @@
-{ inputs, config, pkgs, ... }: {
+{ inputs, config, pkgs, lib, ... }:
+let
+  bgbordercolor = config.lib.stylix.colors.base01;
+  fgbordercolor = config.lib.stylix.colors.base02;
+in
+{
   home.packages =
     [ inputs.hyprland-qtutils.packages.x86_64-linux.default pkgs.foot ];
   wayland.windowManager.hyprland = {
@@ -8,6 +13,7 @@
     package = pkgs.hyprland;
     plugins = with pkgs.hyprlandPlugins;
       [
+        hyprbars
         # hyprexpo
         # hyprfocus
         # hycov
@@ -15,6 +21,7 @@
     # Whether to enable XWayland
     xwayland.enable = true;
     settings = {
+      plugins = import ./hyprbars.nix { inherit config; };
       env = [ "AQ_DRM_DEVICES, /dev/dri/card1:/dev/dri/card0" ];
       xwayland = { force_zero_scaling = true; };
       monitor = [
@@ -26,6 +33,8 @@
         ", preferred, auto, 1" # wildcard definition
       ];
       general = {
+        "col.inactive_border" = lib.mkForce "rgb(${bgbordercolor})";
+        "col.active_border" = lib.mkForce "rgb(${fgbordercolor})";
         border_size = 1;
         gaps_in = 2.5;
         gaps_out = 5;

home-manager/stvnliu/hypr/hyprland/hyprbars.nix

@@ -0,0 +1,16 @@
+{ config }: {
+  hyprbars = {
+    bar_height = 38;
+    bar_color = "rgb(1e1e1e)";
+    "col.text" = "ffffff";
+    bar_text_size = 12;
+    bar_text_font = config.desktopFontFullName;
+    bar_button_padding = 12;
+    bar_padding = 10;
+    bar_precedence_over_border = true;
+    hyprbars-button = [
+      "rgb(ffffff), 20, 󰅖, hyprctl dispatch killactive;"
+      "rgb(ffffff), 20, 󰊓, hyprctl dispatch fullscreen 2;"
+    ];
+  };
+}

home-manager/stvnliu/hypr/hyprlock.nix

@@ -1,6 +1,5 @@
-{ ...
+{ config, lib, ... }: {
-}: {
+  programs.hyprlock = lib.mkForce {
-  programs.hyprlock = {
     enable = true;
     settings = {
       general = {
@@ -10,29 +9,25 @@
         no_fade_in = false;
       };
 
-      #background = [
+      background = [{
-      #  {
+        path = "screenshot";
-      #    path = "screenshot";
+        blur_passes = 3;
-      #    blur_passes = 3;
+        blur_size = 8;
-      #    blur_size = 8;
+      }];
-      #  }
-      #];
 
-      #input-field = [
+      input-field = [{
-      #  {
+        size = "400, 50";
-      #    size = "200, 50";
+        position = "0, -80";
-      #    position = "0, -80";
+        monitor = "";
-      #    monitor = "";
+        dots_center = true;
-      #    dots_center = true;
+        fade_on_empty = false;
-      #    fade_on_empty = false;
+        font_color = "rgb(${config.lib.stylix.colors.base07})";
-      #    font_color = "rgb(202, 211, 245)";
+        inner_color = "rgb(${config.lib.stylix.colors.base02})";
-      #    inner_color = "rgb(91, 96, 120)";
+        outer_color = "rgb(${config.lib.stylix.colors.base03})";
-      #    outer_color = "rgb(24, 25, 38)";
+        outline_thickness = 1;
-      #    outline_thickness = 5;
+        placeholder_text = ''<span foreground="##cad3f5">Password...</span>'';
-      #    #placeholder_text = '\'<span foreground="##cad3f5">Password...</span>'\';
+        shadow_passes = 2;
-      #    shadow_passes = 2;
+      }];
-      #  }
-      #];
     };
   };
 }

home-manager/stvnliu/nixvim/options.nix

@@ -3,7 +3,7 @@
     updatetime = 100; # Faster completion
 
     number = true;
-    relativenumber = false;
+    relativenumber = true;
 
     autoindent = true;
     clipboard = "unnamedplus";

home-manager/stvnliu/stylix.nix

@@ -9,7 +9,7 @@ in
   stylix = {
     enable = true;
     autoEnable = true;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/phd.yaml";
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/onedark-dark.yaml";
     image = config.myWallPaperPath;
     fonts = {
       sansSerif = {

nixos/custom-hosts.nix

@@ -8,6 +8,8 @@ let
     "www"
     "blog"
     "files"
+    "code"
+    "chat"
   ];
 in
 {

nixos/nvidia.nix

@@ -1,19 +1,18 @@
 { config
-, lib
 , pkgs
 , ...
 }: {
-  specialisation = {
+  #specialisation = {
-    powersave.configuration = {
+  #  powersave.configuration = {
-      hardware.nvidia.prime = {
+  #    hardware.nvidia.prime = {
-        offload = {
+  #      offload = {
-          enable = lib.mkForce true;
+  #        enable = lib.mkForce true;
-          enableOffloadCmd = lib.mkForce true;
+  #        enableOffloadCmd = lib.mkForce true;
-        };
+  #      };
-        sync.enable = lib.mkForce false;
+  #      sync.enable = lib.mkForce false;
-      };
+  #    };
-    };
+  #  };
-  };
+  #};
   boot.kernelModules = [ "nvidia_uvm" ];
   hardware.graphics = {
     enable = true;

nixos/services/laptop.preset.nix

@@ -8,7 +8,7 @@
     ./printing.service.nix
     ./tailscale.service.nix
     ./power_management.service.nix
-    ./seatd.service.nix
+    #./seatd.service.nix
     ./logind.service.nix
     #./mpd.service.nix
   ];

nixos/services/misc.service.nix

@@ -1,7 +1,7 @@
 { ... }: {
-  specialisation.powersave.configuration = {
+  #specialisation.powersave.configuration = {
-    services.auto-cpufreq.enable = true;
+  #  services.auto-cpufreq.enable = true;
-  };
+  #};
   services = {
     upower.enable = true;
     udisks2.enable = true;

nixos/spec.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }: {
+{ pkgs, lib, ... }: {
   specialisation = {
     wayland = {
       configuration = {
@@ -16,9 +16,9 @@
           services.xserver.displayManager.startx.enable = true;
         }
         (import ./dwm {
-          inherit config;
+          #inherit config;
           inherit pkgs;
-          inherit lib;
+          #inherit lib;
         });
     };
   };