From cb88e8405e7dfe6d1f25884334b48b26ee47668d Mon Sep 17 00:00:00 2001 From: Sense T Date: Mon, 26 Jun 2023 07:12:37 +0800 Subject: [PATCH] seems okay --- configuration.nix | 2 +- home/user/config/waybar.nix | 78 ++++++++++++++++++------------------- home/user/home.nix | 4 +- home/user/programs.nix | 2 +- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/configuration.nix b/configuration.nix index 6b2d489..e5f6305 100644 --- a/configuration.nix +++ b/configuration.nix @@ -16,5 +16,5 @@ boot.loader.efi.canTouchEfiVariables = true; # Use xanmod kernel - boot.kernelPackages = pkgs.linuxKernel.kernels.linux_xanmod; + boot.kernelPackages = pkgs.linuxPackages_xanmod_latest; } \ No newline at end of file diff --git a/home/user/config/waybar.nix b/home/user/config/waybar.nix index 2a9b457..75b249e 100644 --- a/home/user/config/waybar.nix +++ b/home/user/config/waybar.nix @@ -1,34 +1,34 @@ { - layer = "top"; + layer = "top"; position = "top"; height = 32; - modules-left = [ + modules-left = [ "custom/launcher" "hyprland/window" ]; - modules-center = [ "wlr/workspaces" ]; - modules-right = [ - backlight - pulseaudio # use pipewire, test needed. - battery - cpu - memory - tray - clock + modules-center = [ "wlr/workspaces" ]; + modules-right = [ + "backlight" + "pulseaudio" # use pipewire, test needed. + "cpu" + "memory" + "tray" + "battery" + "clock" "custom/power" ]; - - pulseaudio = { - tooltip = false; - scroll-step = 5; - format = "{icon} {volume}%"; - format-muted = "{icon} {volume}%"; - on-click ="pactl set-sink-mute @DEFAULT_SINK@ toggle"; - format-icons = { - default = [""; ""; ""] - } - }; + + pulseaudio = { + tooltip = false; + scroll-step = 5; + format = "{icon} {volume}%"; + format-muted = "{icon} {volume}%"; + on-click ="pactl set-sink-mute @DEFAULT_SINK@ toggle"; + format-icons = { + default = ["" "" ""]; + }; + }; "wlr/workspaces" = { format = "{icon}"; @@ -46,37 +46,37 @@ sort-by-number = true; }; - network = { - tooltip = false; - format-wifi = " {essid}"; - format-ethernet = "" - }; + network = { + tooltip = false; + format-wifi = " {essid}"; + format-ethernet = ""; + }; - backlight = { - tooltip = false; - format = " {}%"; - interval = 1; + backlight = { + tooltip = false; + format = " {}%"; + interval = 1; on-scroll-up = "light -A 5"; - on-scroll-down = "light -U 5"; - }; + on-scroll-down = "light -U 5"; + }; battery = { states = { good = 95; warning = 30; - critical = 20 + critical = 20; }; format = "{icon} {capacity}%"; format-charging = " {capacity}%"; format-plugged = " {capacity}%"; format-alt = "{time} {icon}"; - format-icons = [""; ""; ""; ""; ""]; + format-icons = ["" "" "" "" ""]; }; - tray = { - icon-size = 16; - spacing = 10; - }; + tray = { + icon-size = 16; + spacing = 10; + }; clock = { format = "{ = %I =%M %p  %d/%m/%Y}"; diff --git a/home/user/home.nix b/home/user/home.nix index cee1fe1..f260087 100644 --- a/home/user/home.nix +++ b/home/user/home.nix @@ -1,7 +1,7 @@ {pkgs, ...}: { home = { stateVersion = "23.05"; # Static - username = "GPD User"; + username = "user"; homeDirectory = "/home/user"; packages = with pkgs; [ @@ -34,7 +34,7 @@ ".config/hypr/hyprland.conf".source = ./files/hyprland.conf; # Use flatseal to change permissions. - ".local/share/fonts".source = /run/current-system/sw/share/X11/fonts; + #".local/share/fonts".source = /run/current-system/sw/share/X11/fonts; # Fix flatpak fonts ".local/share/flatpak/overrides/global".text = '' diff --git a/home/user/programs.nix b/home/user/programs.nix index 9d05398..d900322 100644 --- a/home/user/programs.nix +++ b/home/user/programs.nix @@ -48,7 +48,7 @@ }; settings = { - background_opacity = 0.8; + background_opacity = "0.8"; }; };