continue improvement

README.md

@@ -14,6 +14,7 @@ nixos-rebuild switch --flake 'git+https://git.sense-t.eu.org/NixOS/gpd-configura
 - [ ] wsproxy on podman
 - [ ] waybar 微调
   - [ ] 使用 pipewire
-  - [ ] 电源选项
+  - [x] 电源选项
 - [x] hyprland 微调
 - [ ] nwg-launchers 微调+配置
+- [ ] [HMCL](https://gitlab.com/accessable-net/hmcl-flatpak)

flake.nix

@@ -8,6 +8,7 @@
             "https://mirrors.tuna.tsinghua.edu.cn/nix-channels/store"   # 清华
             "https://mirrors.bfsu.edu.cn/nix-channels/store"            # 北外
             "https://mirror.sjtu.edu.cn/nix-channels/store"             # 交大
+            "https://nixos-cn.cachix.org"
             "https://cache.nixos.org/"
         ];
 
@@ -40,6 +41,14 @@
                 pkgs = import nixpkgs {
                     system = system;
                     config.allowUnfree = true;
+                    overlays = [
+                        (self: super: {
+                            waybar = super.waybar.overrideAttrs (oldAttrs: {
+                                # enable hyprland support
+                                mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
+                            });
+                        })
+                    ];
                 };
 
                 cn-pkgs = import nixos-cn {
@@ -51,6 +60,8 @@
             modules = [ 
                 ./configuration.nix 
                 impermanence.nixosModules.impermanence
+                nixos-cn.nixosModules.nixos-cn-registries
+                nixos-cn.nixosModules.nixos-cn
 
                 home-manager.nixosModules.home-manager {
                     home-manager.useGlobalPkgs = true;

global/font-configuration.nix

@@ -11,6 +11,7 @@
             fira-code-symbols
             source-han-sans 
             source-han-serif
+            source-han-mono
             source-code-pro
             font-awesome_5
             powerline-fonts
@@ -22,16 +23,16 @@
 
         fontconfig.defaultFonts = {
             serif = [
-                "Source Han Serif"
+                "Source Han Serif SC"
             ];
 
             sansSerif = [
-                "Source Han Sans"
+                "Source Han Sans SC"
             ];
 
             monospace = [
                 "Fira Code"
-                "Source Han Serif SC"
+                "Source Han Mono SC"
             ];
         };
     };

global/software-configuration.nix

@@ -6,6 +6,11 @@
     
     # Enable automatic login for the user.
     services = {
+        # flatpak dev.deedles.Trayscale
+        # sudo tailscale up --operator=$USER 
+        # use https://hs.wetofu.me
+        tailscale.enable = true;
+        blueman.enable = true;
         logrotate.checkConfig = false;
         flatpak.enable = true;
         
@@ -56,5 +61,6 @@
 
         git.enable = true;
         zsh.enable = true;
+        light.enable = true;
     };
 }

global/user-configuration.nix

@@ -9,6 +9,8 @@
                     "networkmanager"
                     "wheel"
                     "input"
+                    "video"
+                    "kvm"
                 ];
                 hashedPassword = "";  # Login directly
                 shell = pkgs.zsh;

hardware-configuration.nix

@@ -13,12 +13,6 @@
     boot.kernelModules = [ "kvm-intel" ];
     boot.extraModulePackages = [ ];
 
-    fileSystems."/" = { 
-        device = "tmpfs";
-        fsType = "tmpfs";
-        options = [ "relatime" "mode=755" ];
-    };
-
     fileSystems."/boot" = { 
         device = "/dev/disk/by-uuid/8095-BE1B";
         fsType = "vfat";

home/user/config/waybar-style.nix

@@ -3,7 +3,7 @@
 	border: none;
 	border-radius: 10;
     font-family: "nerdfonts" ;
-	font-size: 15px;
+	font-size: 12px;
 	min-height: 10px;
 }
 
@@ -81,7 +81,7 @@ window#waybar.hidden {
 	background: #bd93f9;
 }
 
-#pulseaudio {
+#wireplumber {
 	margin-top: 6px;
 	margin-left: 8px;
 	padding-left: 10px;
@@ -213,40 +213,4 @@ window#waybar.hidden {
 	color: #161320;
 	background: #F28FAD;
 }
-
-#custom-wallpaper {
-	margin-top: 6px;
-	margin-left: 8px;
-	padding-left: 10px;
-	padding-right: 10px;
-	margin-bottom: 0px;
-	border-radius: 10px;
-	transition: none;
-	color: #161320;
-	background: #C9CBFF;
-}
-
-#custom-updates {
-	margin-top: 6px;
-	margin-left: 8px;
-	padding-left: 10px;
-	padding-right: 10px;
-	margin-bottom: 0px;
-	border-radius: 10px;
-	transition: none;
-	color: #161320;
-	background: #E8A2AF;
-}
-
-#custom-media {
-	margin-top: 6px;
-	margin-left: 8px;
-	padding-left: 10px;
-	padding-right: 10px;
-	margin-bottom: 0px;
-	border-radius: 10px;
-	transition: none;
-	color: #161320;
-	background: #F2CDCD;
-}
 ''

home/user/config/waybar.nix

@@ -4,27 +4,27 @@
     height = 24;
 
     modules-left = [
-        "custom/launcher" 
+        "custom/launcher"
         "hyprland/window"
     ];
     modules-center = [ "wlr/workspaces" ];
     modules-right = [
         "backlight"
-        "pulseaudio"  # use pipewire, test needed.
+        "wireplumber"
-        "cpu"
+        # "cpu"
-        "memory"
+        # "memory"
-        "tray"
         "battery"
+        "tray"
         "clock"
         "custom/power"
     ];
 
-    pulseaudio = {
+    wireplumber = {
         tooltip = false;
         scroll-step = 5;
         format = "{icon} {volume}%";
         format-muted = "{icon} {volume}%";
-        on-click ="pactl set-sink-mute @DEFAULT_SINK@ toggle";
+        on-click ="pactl set-sink-mute @DEFAULT_SINK@ toggle"; # wpctl?
         format-icons = {
             default = ["" "" ""];
         };
@@ -52,7 +52,7 @@
 
     network = {
         tooltip = false;
-        format-wifi = "  {essid}";
+        format-wifi = " {essid}";
         format-ethernet = "";
     };
 
@@ -83,7 +83,19 @@
     };
 
     clock = {
-        format = "{ = %I =%M %p   %d/%m/%Y}";
+        format = " {:%H:%M}";
+        tooltip-format = "\n<span size='9pt' font='Source Han Mono SC'>{calendar}</span>";
+        calendar = {
+            mode = "month";
+            weeks-pos = "right";
+            format = {
+                months = "<span color='#ffead3'><b>{}</b></span>";
+                days = "<span color='#ecc6d9'><b>{}</b></span>";
+                weeks = "<span color='#99ffdd'><b>W{}</b></span>";
+                weekdays = "<span color='#ffcc66'><b>{}</b></span>";
+                today = "<span color='#ff6699'><b><u>{}</u></b></span>";
+            };
+        };
     };
 
     cpu = {
@@ -98,13 +110,13 @@
         max-length = 10;
     };
 
-    "custom/launcher" ={
+    "custom/launcher" = {
-        format = " ";
+        format = " ";
-        on-click = "nwggrid -o 0.8";
+        on-click = "nwggrid";
     };
 
-    "custom/power" ={
+    "custom/power" = {
-        format = " ";
+        format = "󰐥 ";
         on-click = "nwgbar";
     };
-}
+}

home/user/files/ranger-rc.conf

@@ -0,0 +1,2 @@
+set preview_images true
+set preview_images_method kitty

home/user/home.nix

@@ -15,6 +15,7 @@
             #rofi
             #rofi-rbw
             nwg-launchers
+            iconpack-obsidian # icon theme
         ];
 
         sessionPath = [
@@ -34,6 +35,9 @@
             # hyprland
             ".config/hypr/hyprland.conf".source = ./files/hyprland.conf;
 
+            # ranger
+            ".config/ranger/rc.conf".source = ./files/rager-rc.conf;
+
             # Use flatseal to change permissions.
             #".local/share/fonts".source = /run/current-system/sw/share/X11/fonts;