This commit is contained in:
암냥 2026-09-12 03:47:58 +09:00
commit 1ab0263e27
3 changed files with 45 additions and 60 deletions

View file

@ -31,24 +31,18 @@
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" =
device = "/dev/disk/by-uuid/161e6b72-1ec6-4b9c-b1b7-325dd4320c2e"; { device = "/dev/mapper/luks-532f8eb8-c21b-483b-8029-247b999446fe";
fsType = "ext4"; fsType = "ext4";
}; };
boot.initrd.luks.devices."luks-5a2a5e2d-749d-408e-82df-82e8607ae67e" = { boot.initrd.luks.devices."luks-532f8eb8-c21b-483b-8029-247b999446fe".device = "/dev/disk/by-uuid/532f8eb8-c21b-483b-8029-247b999446fe";
device = "/dev/disk/by-uuid/5a2a5e2d-749d-408e-82df-82e8607ae67e";
allowDiscards = true;
};
fileSystems."/boot" = { fileSystems."/boot" =
device = "/dev/disk/by-uuid/7078-16D1"; { device = "/dev/disk/by-uuid/65CB-E571";
fsType = "vfat"; fsType = "vfat";
options = [ options = [ "fmask=0077" "dmask=0077" ];
"fmask=0077" };
"dmask=0077"
];
};
swapDevices = [ ]; swapDevices = [ ];

View file

@ -15,7 +15,7 @@ let
hyprlandConfig = '' hyprlandConfig = ''
source = colors.conf source = colors.conf
monitor = eDP-1, 1920x1080@60, 0x0, 1 monitor = , preferred, auto, 1
$terminal = ${pkgs.ghostty}/bin/ghostty $terminal = ${pkgs.ghostty}/bin/ghostty
$fileManager = ${pkgs.nautilus}/bin/nautilus $fileManager = ${pkgs.nautilus}/bin/nautilus
@ -138,48 +138,34 @@ let
bindl = , XF86AudioPrev, exec, ${pkgs.playerctl}/bin/playerctl previous bindl = , XF86AudioPrev, exec, ${pkgs.playerctl}/bin/playerctl previous
''; '';
# ponytail: keep the upstream core rice only; add Matugen/extra Waybar modules when needed. # ponytail: use the upstream visual composition; only remove its personal include.
waybarConfig = builtins.toJSON { fixWaybarPaths = text:
layer = "top"; builtins.replaceStrings
position = "top"; [
spacing = 3; "$HOME/.config/hypr/scripts/volume.sh --inc"
margin-top = 3; "$HOME/.config/hypr/scripts/volume.sh --dec"
margin-left = 8; "$HOME/.config/hypr/scripts/volume.sh --toggle-mic"
margin-right = 8; "$HOME/.config/hypr/scripts/volume.sh --toggle"
modules-left = [ "clock" "tray" ]; "$HOME/.config/hypr/scripts/volume.sh --mic-inc"
modules-center = [ "hyprland/workspaces" ]; "$HOME/.config/hypr/scripts/volume.sh --mic-dec"
modules-right = [ "network" "pulseaudio" "battery" "custom/power" ]; "$HOME/.config/hypr/scripts/Wlogout.sh"
clock = { ]
interval = 1; [
format = " {:%I:%M %p}"; "${pkgs.wireplumber}/bin/wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+"
format-alt = " {:%H:%M %Y, %d %B, %A}"; "${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
tooltip-format = "<tt><small>{calendar}</small></tt>"; "${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
}; "${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
network = { "${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%+"
format-wifi = " {essid}"; "${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%-"
format-ethernet = "󰈀 {ifname}"; "${pkgs.wlogout}/bin/wlogout"
format-disconnected = "󰤮"; ]
tooltip-format = "{ifname}: {ipaddr}/{cidr}"; text;
}; waybarConfig = builtins.replaceStrings
pulseaudio = { [ " \"$HOME/.config/waybar/UserModules\",\n" ]
format = "{icon} {volume}%"; [ "" ]
format-muted = "󰖁 muted"; (builtins.readFile "${upstream}/waybar/configs/bintang default");
format-icons = [ "" "" "" ]; waybarModules = fixWaybarPaths (builtins.readFile "${upstream}/waybar/Modules");
on-click = "${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; waybarCustomModules = fixWaybarPaths (builtins.readFile "${upstream}/waybar/ModulesCustom");
};
battery = {
states = { warning = 30; critical = 15; };
format = "{icon} {capacity}%";
format-charging = " {capacity}%";
format-icons = [ "󰂎" "󰁺" "󰁻" "󰁼" "󰁽" "󰁾" "󰁿" "󰂀" "󰂁" "󰂂" "󰁹" ];
};
"custom/power" = {
format = "";
on-click = "${pkgs.wlogout}/bin/wlogout";
tooltip = true;
tooltip-format = "Logout Menu";
};
};
in in
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
@ -191,6 +177,7 @@ in
libnotify libnotify
nautilus nautilus
networkmanagerapplet networkmanagerapplet
pavucontrol
playerctl playerctl
rofi rofi
slurp slurp
@ -218,6 +205,10 @@ in
"hypr/hypridle.conf".source = "${upstream}/hypr/hypridle.conf"; "hypr/hypridle.conf".source = "${upstream}/hypr/hypridle.conf";
"hypr/hyprlock.conf".source = "${upstream}/hypr/hyprlock.conf"; "hypr/hyprlock.conf".source = "${upstream}/hypr/hyprlock.conf";
"waybar/config".text = waybarConfig; "waybar/config".text = waybarConfig;
"waybar/Modules".text = waybarModules;
"waybar/ModulesCustom".text = waybarCustomModules;
"waybar/ModulesGroups".source = "${upstream}/waybar/ModulesGroups";
"waybar/ModulesWorkspaces".source = "${upstream}/waybar/ModulesWorkspaces";
"waybar/colors.css".source = "${upstream}/waybar/colors.css"; "waybar/colors.css".source = "${upstream}/waybar/colors.css";
"waybar/style.css".source = "${upstream}/waybar/style/bintang default.css"; "waybar/style.css".source = "${upstream}/waybar/style/bintang default.css";
"wlogout/layout".text = '' "wlogout/layout".text = ''

View file

@ -31,7 +31,7 @@ in
src = builtins.fetchTarball { src = builtins.fetchTarball {
url = "https://code.visualstudio.com/sha/download?build=insider&os=linux-x64"; url = "https://code.visualstudio.com/sha/download?build=insider&os=linux-x64";
sha256 = "1dihwp3smr1k52wrd1w93y66k3czjj5ccdqzfrzh00lgrl1dvfka"; sha256 = "0lcx0bh0r4lsll47b45qd69871lrcwg43s903p6gddcdi9k48lav";
}; };
buildInputs = oldAttrs.buildInputs ++ [ buildInputs = oldAttrs.buildInputs ++ [