diff --git a/README.md b/README.md
index bbcd67d..627ab85 100644
--- a/README.md
+++ b/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)
diff --git a/flake.nix b/flake.nix
index af455c7..fc037ff 100644
--- a/flake.nix
+++ b/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;
diff --git a/global/font-configuration.nix b/global/font-configuration.nix
index e28f492..bd77a4b 100644
--- a/global/font-configuration.nix
+++ b/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"
];
};
};
diff --git a/global/software-configuration.nix b/global/software-configuration.nix
index 2dc2156..566d4ea 100644
--- a/global/software-configuration.nix
+++ b/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;
};
}
\ No newline at end of file
diff --git a/global/user-configuration.nix b/global/user-configuration.nix
index 570a1a8..1505f31 100644
--- a/global/user-configuration.nix
+++ b/global/user-configuration.nix
@@ -9,6 +9,8 @@
"networkmanager"
"wheel"
"input"
+ "video"
+ "kvm"
];
hashedPassword = ""; # Login directly
shell = pkgs.zsh;
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index c02e91b..5c12100 100644
--- a/hardware-configuration.nix
+++ b/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";
diff --git a/home/user/config/waybar-style.nix b/home/user/config/waybar-style.nix
index c4a3c94..0c7318f 100644
--- a/home/user/config/waybar-style.nix
+++ b/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;
-}
''
\ No newline at end of file
diff --git a/home/user/config/waybar.nix b/home/user/config/waybar.nix
index a88e34c..f3de3f0 100644
--- a/home/user/config/waybar.nix
+++ b/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.
- "cpu"
- "memory"
- "tray"
+ "wireplumber"
+ # "cpu"
+ # "memory"
"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{calendar}";
+ calendar = {
+ mode = "month";
+ weeks-pos = "right";
+ format = {
+ months = "{}";
+ days = "{}";
+ weeks = "W{}";
+ weekdays = "{}";
+ today = "{}";
+ };
+ };
};
cpu = {
@@ -98,13 +110,13 @@
max-length = 10;
};
- "custom/launcher" ={
- format = " ";
- on-click = "nwggrid -o 0.8";
+ "custom/launcher" = {
+ format = " ";
+ on-click = "nwggrid";
};
- "custom/power" ={
- format = " ";
+ "custom/power" = {
+ format = " ";
on-click = "nwgbar";
};
-}
\ No newline at end of file
+}
diff --git a/home/user/files/ranger-rc.conf b/home/user/files/ranger-rc.conf
new file mode 100644
index 0000000..8c90d2d
--- /dev/null
+++ b/home/user/files/ranger-rc.conf
@@ -0,0 +1,2 @@
+set preview_images true
+set preview_images_method kitty
\ No newline at end of file
diff --git a/home/user/home.nix b/home/user/home.nix
index d602428..91ad9dd 100644
--- a/home/user/home.nix
+++ b/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;