aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--common/variables.nix6
-rw-r--r--home-manager/stvnliu/assets/od_neon.pngbin0 -> 2390736 bytes
-rw-r--r--home-manager/stvnliu/hypr/hyprland/default.nix11
-rw-r--r--home-manager/stvnliu/hypr/hyprland/hyprbars.nix16
-rw-r--r--home-manager/stvnliu/hypr/hyprlock.nix45
-rw-r--r--home-manager/stvnliu/nixvim/options.nix2
-rw-r--r--home-manager/stvnliu/stylix.nix2
-rw-r--r--nixos/custom-hosts.nix2
-rw-r--r--nixos/nvidia.nix23
-rw-r--r--nixos/services/laptop.preset.nix2
-rw-r--r--nixos/services/misc.service.nix6
-rw-r--r--nixos/spec.nix6
12 files changed, 71 insertions, 50 deletions
diff --git a/common/variables.nix b/common/variables.nix
index 3998329..0430aaf 100644
--- a/common/variables.nix
+++ b/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;
- myWallPaperPathString = "/home/${myUserName}/wallpaper.jpg";
+ displayScale = 1;
+ myWallPaperPathString = "/home/${myUserName}/wallpaper.png";
myDisplayName = "Zhongheng Liu";
myEmail = "z.liu@outlook.com.gr";
specialisation."powersave".configuration = {
diff --git a/home-manager/stvnliu/assets/od_neon.png b/home-manager/stvnliu/assets/od_neon.png
new file mode 100644
index 0000000..562e977
--- /dev/null
+++ b/home-manager/stvnliu/assets/od_neon.png
Binary files differ
diff --git a/home-manager/stvnliu/hypr/hyprland/default.nix b/home-manager/stvnliu/hypr/hyprland/default.nix
index ee47242..3242555 100644
--- a/home-manager/stvnliu/hypr/hyprland/default.nix
+++ b/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;
diff --git a/home-manager/stvnliu/hypr/hyprland/hyprbars.nix b/home-manager/stvnliu/hypr/hyprland/hyprbars.nix
new file mode 100644
index 0000000..1279223
--- /dev/null
+++ b/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;"
+ ];
+ };
+}
diff --git a/home-manager/stvnliu/hypr/hyprlock.nix b/home-manager/stvnliu/hypr/hyprlock.nix
index d209a56..bbcfc3c 100644
--- a/home-manager/stvnliu/hypr/hyprlock.nix
+++ b/home-manager/stvnliu/hypr/hyprlock.nix
@@ -1,6 +1,5 @@
-{ ...
-}: {
- programs.hyprlock = {
+{ config, lib, ... }: {
+ programs.hyprlock = lib.mkForce {
enable = true;
settings = {
general = {
@@ -10,29 +9,25 @@
no_fade_in = false;
};
- #background = [
- # {
- # path = "screenshot";
- # blur_passes = 3;
- # blur_size = 8;
- # }
- #];
+ background = [{
+ path = "screenshot";
+ blur_passes = 3;
+ blur_size = 8;
+ }];
- #input-field = [
- # {
- # size = "200, 50";
- # position = "0, -80";
- # monitor = "";
- # dots_center = true;
- # fade_on_empty = false;
- # font_color = "rgb(202, 211, 245)";
- # inner_color = "rgb(91, 96, 120)";
- # outer_color = "rgb(24, 25, 38)";
- # outline_thickness = 5;
- # #placeholder_text = '\'<span foreground="##cad3f5">Password...</span>'\';
- # shadow_passes = 2;
- # }
- #];
+ input-field = [{
+ size = "400, 50";
+ position = "0, -80";
+ monitor = "";
+ dots_center = true;
+ fade_on_empty = false;
+ font_color = "rgb(${config.lib.stylix.colors.base07})";
+ inner_color = "rgb(${config.lib.stylix.colors.base02})";
+ outer_color = "rgb(${config.lib.stylix.colors.base03})";
+ outline_thickness = 1;
+ placeholder_text = ''<span foreground="##cad3f5">Password...</span>'';
+ shadow_passes = 2;
+ }];
};
};
}
diff --git a/home-manager/stvnliu/nixvim/options.nix b/home-manager/stvnliu/nixvim/options.nix
index 5243cf9..231c131 100644
--- a/home-manager/stvnliu/nixvim/options.nix
+++ b/home-manager/stvnliu/nixvim/options.nix
@@ -3,7 +3,7 @@
updatetime = 100; # Faster completion
number = true;
- relativenumber = false;
+ relativenumber = true;
autoindent = true;
clipboard = "unnamedplus";
diff --git a/home-manager/stvnliu/stylix.nix b/home-manager/stvnliu/stylix.nix
index c9ff740..262849a 100644
--- a/home-manager/stvnliu/stylix.nix
+++ b/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 = {
diff --git a/nixos/custom-hosts.nix b/nixos/custom-hosts.nix
index 495adb4..423229e 100644
--- a/nixos/custom-hosts.nix
+++ b/nixos/custom-hosts.nix
@@ -8,6 +8,8 @@ let
"www"
"blog"
"files"
+ "code"
+ "chat"
];
in
{
diff --git a/nixos/nvidia.nix b/nixos/nvidia.nix
index bb2f679..fa603e5 100644
--- a/nixos/nvidia.nix
+++ b/nixos/nvidia.nix
@@ -1,19 +1,18 @@
{ config
-, lib
, pkgs
, ...
}: {
- specialisation = {
- powersave.configuration = {
- hardware.nvidia.prime = {
- offload = {
- enable = lib.mkForce true;
- enableOffloadCmd = lib.mkForce true;
- };
- sync.enable = lib.mkForce false;
- };
- };
- };
+ #specialisation = {
+ # powersave.configuration = {
+ # hardware.nvidia.prime = {
+ # offload = {
+ # enable = lib.mkForce true;
+ # enableOffloadCmd = lib.mkForce true;
+ # };
+ # sync.enable = lib.mkForce false;
+ # };
+ # };
+ #};
boot.kernelModules = [ "nvidia_uvm" ];
hardware.graphics = {
enable = true;
diff --git a/nixos/services/laptop.preset.nix b/nixos/services/laptop.preset.nix
index 96e097e..152442b 100644
--- a/nixos/services/laptop.preset.nix
+++ b/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
];
diff --git a/nixos/services/misc.service.nix b/nixos/services/misc.service.nix
index 86f490d..f204f44 100644
--- a/nixos/services/misc.service.nix
+++ b/nixos/services/misc.service.nix
@@ -1,7 +1,7 @@
{ ... }: {
- specialisation.powersave.configuration = {
- services.auto-cpufreq.enable = true;
- };
+ #specialisation.powersave.configuration = {
+ # services.auto-cpufreq.enable = true;
+ #};
services = {
upower.enable = true;
udisks2.enable = true;
diff --git a/nixos/spec.nix b/nixos/spec.nix
index 77ac310..504eee2 100644
--- a/nixos/spec.nix
+++ b/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;
});
};
};
generated by cgit (git 2.34.1) at 2025-05-22 22:09:49 +0000