anotherhadi/nixy
1
Fork 0
mirror of https://github.com/anotherhadi/nixy.git synced 2026-04-02 11:12:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

update flake & fix hyprpanel

Browse Source 
Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>

Former-commit-id: eebaa0ffc17af2e314bba4c7161a9b76ffd03cd8
This commit is contained in:
Hadi
2025-07-01 17:36:22 +02:00
parent 38665036fc
commit fc3d977050
2 changed files with 163 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
flake.lock generated
View File

@@ -89,11 +89,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750372185, "lastModified": 1750974272,
"narHash": "sha256-lVBKxd9dsZOH1fA6kSE5WNnt8e+09fN+NL/Q3BjTWHY=", "narHash": "sha256-VaeQzSzekMvP+/OhwNZP4kzs4paWk5+20N0MFLTn+cs=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "7cef49d261cbbe537e8cb662485e76d29ac4cbca", "rev": "dd921421391e75793d0cc674dc15eca16b46a089",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -518,11 +518,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750654717, "lastModified": 1751336185,
"narHash": "sha256-YXlhTUGaLAY1rSosaRXO5RSGriEyF9BGdLkpKV+9jyI=", "narHash": "sha256-ptnVr2x+sl7cZcTuGx/0BOE2qCAIYHTcgfA+/h60ml0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4c9e99e8e8e36bcdfa9cdb102e45e4dc95aa5c5b", "rev": "96354906f58464605ff81d2f6c2ea23211cbf051",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -618,11 +618,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750371717, "lastModified": 1750621377,
"narHash": "sha256-cNP+bVq8m5x2Rl6MTjwfQLCdwbVmKvTH7yqVc1SpiJM=", "narHash": "sha256-8u6b5oAdX0rCuoR8wFenajBRmI+mzbpNig6hSCuWUzE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprgraphics", "repo": "hyprgraphics",
"rev": "15c6f8f3a567fec9a0f732cd310a7ff456deef88", "rev": "b3d628d01693fb9bb0a6690cd4e7b80abda04310",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -647,11 +647,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1750679370, "lastModified": 1751362428,
"narHash": "sha256-2Wqnw3bxy1VuXanPAyIUouf9NWdLogBLu8T9E2QNqcU=", "narHash": "sha256-iss0EjjnaSWQ9la9A+Uv/8flOrBNpTllgcov6xCckC8=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "24e5f9974d56741ee22e125b78731503345dc510", "rev": "e9c5594186d7ba935e966751d4d676cda998c34b",
"revCount": 6214, "revCount": 6237,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@@ -791,11 +791,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1750618016, "lastModified": 1751087867,
"narHash": "sha256-wn6XV23Sz/nsDPI+1FGjtyMfAWJWcXRpNcryS47DJdY=", "narHash": "sha256-DFPuZLYopXRmqfu9IQn8RVBbxaPXIbyW0PXUFrfbJ9k=",
"owner": "Jas-SinghFSU", "owner": "Jas-SinghFSU",
"repo": "HyprPanel", "repo": "HyprPanel",
"rev": "2c0c66a8ddcdff69b2ff694fefbcd8df4387a9e7", "rev": "d4895922de7c0908218557f252e4f8778da60fe2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -812,11 +812,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1747531250, "lastModified": 1751272032,
"narHash": "sha256-uDhXNURTJgQSpiaCgzqAizbblpcEWEB1WGWEqtCnLLM=", "narHash": "sha256-493llKN7yyLkKlz8uYVAyvXH261IpDzuVA+TnewFIAg=",
"owner": "KZDKM", "owner": "KZDKM",
"repo": "Hyprspace", "repo": "Hyprspace",
"rev": "511d399120bdcafb43e57ca5ff35167c2bba6db8", "rev": "847a770436e1ecebdbe5ed006a93db7666937ff2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -837,11 +837,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750371096, "lastModified": 1751061882,
"narHash": "sha256-JB1IeJ41y7kWc/dPGV6RMcCUM0Xj2NEK26A2Ap7EM9c=", "narHash": "sha256-g9n8Vrbx+2JYM170P9BbvGHN39Wlkr4U+V2WLHQsXL8=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "38f3a211657ce82a1123bf19402199b67a410f08", "rev": "4737241eaf8a1e51671a2a088518071f9a265cf4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -946,11 +946,11 @@
"website-builder": "website-builder" "website-builder": "website-builder"
}, },
"locked": { "locked": {
"lastModified": 1750616651, "lastModified": 1750925878,
"narHash": "sha256-Ylb2Jx+y4dsy3ZRh4FNQ+FT5FEqF3/qwopVNG+6/f1E=", "narHash": "sha256-HgCU4qyRsN72Ce+3KACGqv0vpQppKEBaEUWs4Nl/Mqk=",
"owner": "rasmus-kirk", "owner": "rasmus-kirk",
"repo": "nixarr", "repo": "nixarr",
"rev": "7b4e2e6780c0f6979cd0c7f4375c15de06554d1a", "rev": "b47442260a4754cc362067f572ad27254a200bc9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -966,11 +966,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1750660663, "lastModified": 1751334412,
"narHash": "sha256-FP9GL/kbk1amhXvCvC/wINzMxDZC4OPA4DSXZobMTCQ=", "narHash": "sha256-Q0Bf7Bd5i/fp5B/ZCeZcLRCH4vfRejcmMnkotXJEWmM=",
"owner": "kaylorben", "owner": "kaylorben",
"repo": "nixcord", "repo": "nixcord",
"rev": "cb53650de4bc91d948b65ab8ac99fadc875204bb", "rev": "f4ae2c29c2d3480167a8c67291b2741225d67012",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -981,11 +981,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1750431636, "lastModified": 1751379130,
"narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", "narHash": "sha256-TObxiGbuX/4FbOnzDRvznfMUjIgS+d71+BetT35EOB8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", "rev": "8b1f894089789eb39eacf0d6891d1e17cc3a84ab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1107,11 +1107,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1750365781, "lastModified": 1751011381,
"narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1171,11 +1171,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1750506804, "lastModified": 1751271578,
"narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4206c4cb56751df534751b058295ea61357bbbaa", "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1227,11 +1227,11 @@
"systems": "systems_5" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1750619045, "lastModified": 1751144320,
"narHash": "sha256-ucgldLHtLTbtk09NadxBWi8m4tE07VinTSECR+m9lN4=", "narHash": "sha256-KJsKiGfkfXFB23V26NQ1p+UPsexI6NKtivnrwSlWWdQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "d2c3b26bf739686bcb08247692a99766f7c44a3b", "rev": "ceb52aece5d571b37096945c2815604195a04eb4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1299,11 +1299,11 @@
"systems": "systems_7" "systems": "systems_7"
}, },
"locked": { "locked": {
"lastModified": 1750441488, "lastModified": 1751186226,
"narHash": "sha256-JuFBp2xM4JD/XGb69dTSDOdGbUD0fVHlgY9X9GHGTFE=", "narHash": "sha256-Bt7jtmCW72JUPxOIrV73qBTAUOy4qvJXsls2ERDUcGo=",
"owner": "notashelf", "owner": "notashelf",
"repo": "nvf", "repo": "nvf",
"rev": "18c17b7b8dbf6e0f10e3eb5f1fa5341a9175a3b1", "rev": "5bad5dd94ce5ea3b40b08d9e6802e69d02198d21",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1334,11 +1334,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749636823, "lastModified": 1750779888,
"narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "623c56286de5a3193aa38891a6991b28f9bab056", "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1496,11 +1496,11 @@
"systems": "systems_8" "systems": "systems_8"
}, },
"locked": { "locked": {
"lastModified": 1750567035, "lastModified": 1751171964,
"narHash": "sha256-GVNXxMZynKZt+83QQQEVXscqtkJbScvaBrwianovUW4=", "narHash": "sha256-SeVvQm9ex+6BhDPIsRt9E1kSmMblQ6gTi53baphnX08=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "e32285f5d1dfc184b039a813644e226c3914e7d7", "rev": "16adc163d966fc2bb5da47580df4602ae2c7a310",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1531,11 +1531,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1750562714, "lastModified": 1751379237,
"narHash": "sha256-GEQdMsWrij7y1UjuONVZYWLBo1OPIt709KcyCxcDfxU=", "narHash": "sha256-jDoLz04rgXS0jYLT017RARjcC7PoZoJ6NzH6ypi2kKM=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "100b968012804d6526c5f48a32c30680916bc474", "rev": "4bc15ef13c970981e37506491e18d1158af9a70c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1865,11 +1865,11 @@
"nixpkgs": "nixpkgs_12" "nixpkgs": "nixpkgs_12"
}, },
"locked": { "locked": {
"lastModified": 1750649182, "lastModified": 1751341208,
"narHash": "sha256-beNAQ63SY8HxBsFdMGv/fdLzjQMYgifMh1DcmaIzMjo=", "narHash": "sha256-D659vmh5bseh5rB0tH4osXFXimh+QQLBBMKkdMH/DMk=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "c0785a69fe3988b4ef44c74575f4a2f698f91f32", "rev": "97da6393f00eff37d787dcb1447afc65e9b4d57e",
"type": "github" "type": "github"
}, },
"original": { "original": {

186
home/system/hyprpanel/default.nix
View File

@@ -1,7 +1,6 @@
# Hyprpanel is the bar on top of the screen # Hyprpanel is the bar on top of the screen
# Display informations like workspaces, battery, wifi, ... # Display information like workspaces, battery, wifi, ...
{ inputs, config, ... }: {config, ...}: let
let
transparentButtons = config.theme.bar.transparentButtons; transparentButtons = config.theme.bar.transparentButtons;
accent = "#${config.lib.stylix.colors.base0D}"; accent = "#${config.lib.stylix.colors.base0D}";
@@ -27,21 +26,22 @@ let
location = config.var.location; location = config.var.location;
in { in {
imports = [ inputs.hyprpanel.homeManagerModules.hyprpanel ];
programs.hyprpanel = { programs.hyprpanel = {
enable = true; enable = true;
hyprland.enable = true;
overwrite.enable = true;
overlay.enable = true;
settings = { settings = {
layout = { layout = {
"bar.layouts" = { bar.layouts = {
"*" = { "*" = {
"left" = [ "dashboard" "workspaces" "windowtitle" ]; "left" = [
"middle" = [ "media" "cava" ]; "dashboard"
"workspaces"
"windowtitle"
];
"middle" = [
"media"
"cava"
];
"right" = [ "right" = [
"systray" "systray"
"volume" "volume"
@@ -59,28 +59,48 @@ in {
theme.font.size = fontSizeForHyprpanel; theme.font.size = fontSizeForHyprpanel;
theme.bar.outer_spacing = theme.bar.outer_spacing =
if floating && transparent then "0px" else "8px"; if floating && transparent
then "0px"
else "8px";
theme.bar.buttons.y_margins = theme.bar.buttons.y_margins =
if floating && transparent then "0px" else "8px"; if floating && transparent
then "0px"
else "8px";
theme.bar.buttons.spacing = "0.3em"; theme.bar.buttons.spacing = "0.3em";
theme.bar.buttons.radius = theme.bar.buttons.radius =
(if transparent then toString rounding else toString (rounding - 8)) (
if transparent
then toString rounding
else toString (rounding - 8)
)
+ "px"; + "px";
theme.bar.floating = floating; theme.bar.floating = floating;
theme.bar.buttons.padding_x = "0.8rem"; theme.bar.buttons.padding_x = "0.8rem";
theme.bar.buttons.padding_y = "0.4rem"; theme.bar.buttons.padding_y = "0.4rem";
theme.bar.margin_top = theme.bar.margin_top =
(if position == "top" then toString (gaps-in * 2) else "0") + "px"; (
if position == "top"
then toString (gaps-in * 2)
else "0"
)
+ "px";
theme.bar.margin_bottom = theme.bar.margin_bottom =
(if position == "top" then "0" else toString (gaps-in * 2)) + "px"; (
if position == "top"
then "0"
else toString (gaps-in * 2)
)
+ "px";
theme.bar.margin_sides = toString gaps-out + "px"; theme.bar.margin_sides = toString gaps-out + "px";
theme.bar.border_radius = toString rounding + "px"; theme.bar.border_radius = toString rounding + "px";
theme.bar.transparent = transparent; theme.bar.transparent = transparent;
theme.bar.location = position; theme.bar.location = position;
theme.bar.dropdownGap = "4.5em"; theme.bar.dropdownGap = "4.5em";
theme.bar.menus.shadow = theme.bar.menus.shadow =
if transparent then "0 0 0 0" else "0px 0px 3px 1px #16161e"; if transparent
then "0 0 0 0"
else "0px 0px 3px 1px #16161e";
theme.bar.buttons.style = "default"; theme.bar.buttons.style = "default";
theme.bar.buttons.monochrome = true; theme.bar.buttons.monochrome = true;
theme.bar.menus.monochrome = true; theme.bar.menus.monochrome = true;
@@ -146,78 +166,88 @@ in {
menus.dashboard.shortcuts.right.shortcut1.command = "hyprpicker -a"; menus.dashboard.shortcuts.right.shortcut1.command = "hyprpicker -a";
menus.dashboard.shortcuts.right.shortcut1.tooltip = "Color Picker"; menus.dashboard.shortcuts.right.shortcut1.tooltip = "Color Picker";
menus.dashboard.shortcuts.right.shortcut3.icon = "󰄀"; menus.dashboard.shortcuts.right.shortcut3.icon = "󰄀";
menus.dashboard.shortcuts.right.shortcut3.command = menus.dashboard.shortcuts.right.shortcut3.command = "screenshot region swappy";
"screenshot region swappy";
menus.dashboard.shortcuts.right.shortcut3.tooltip = "Screenshot"; menus.dashboard.shortcuts.right.shortcut3.tooltip = "Screenshot";
menus.power.lowBatteryNotification = true; menus.power.lowBatteryNotification = true;
wallpaper.enable = false; wallpaper.enable = false;
};
override = { theme.bar.buttons.workspaces.hover = accent-alt;
"theme.bar.buttons.workspaces.hover" = accent-alt; theme.bar.buttons.workspaces.active = accent;
"theme.bar.buttons.workspaces.active" = accent; theme.bar.buttons.workspaces.available = accent-alt;
"theme.bar.buttons.workspaces.available" = accent-alt; theme.bar.buttons.workspaces.occupied = accent-alt;
"theme.bar.buttons.workspaces.occupied" = accent-alt;
"theme.bar.menus.background" = background; theme.bar.menus.background = background;
"theme.bar.menus.cards" = background-alt; theme.bar.menus.cards = background-alt;
"theme.bar.menus.label" = foreground; theme.bar.menus.label = foreground;
"theme.bar.menus.text" = foreground; theme.bar.menus.text = foreground;
"theme.bar.menus.border.color" = accent; theme.bar.menus.border.color = accent;
"theme.bar.menus.popover.text" = foreground; theme.bar.menus.popover.text = foreground;
"theme.bar.menus.popover.background" = background-alt; theme.bar.menus.popover.background = background-alt;
"theme.bar.menus.listitems.active" = accent; theme.bar.menus.listitems.active = accent;
"theme.bar.menus.icons.active" = accent; theme.bar.menus.icons.active = accent;
"theme.bar.menus.switch.enabled" = accent; theme.bar.menus.switch.enabled = accent;
"theme.bar.menus.check_radio_button.active" = accent; theme.bar.menus.check_radio_button.active = accent;
"theme.bar.menus.buttons.default" = accent; theme.bar.menus.buttons.default = accent;
"theme.bar.menus.buttons.active" = accent; theme.bar.menus.buttons.active = accent;
"theme.bar.menus.iconbuttons.active" = accent; theme.bar.menus.iconbuttons.active = accent;
"theme.bar.menus.progressbar.foreground" = accent; theme.bar.menus.progressbar.foreground = accent;
"theme.bar.menus.slider.primary" = accent; theme.bar.menus.slider.primary = accent;
"theme.bar.menus.tooltip.background" = background-alt; theme.bar.menus.tooltip.background = background-alt;
"theme.bar.menus.tooltip.text" = foreground; theme.bar.menus.tooltip.text = foreground;
"theme.bar.menus.dropdownmenu.background" = background-alt; theme.bar.menus.dropdownmenu.background = background-alt;
"theme.bar.menus.dropdownmenu.text" = foreground; theme.bar.menus.dropdownmenu.text = foreground;
"theme.bar.background" = background theme.bar.background =
+ (if transparentButtons && transparent then "00" else ""); background
"theme.bar.buttons.text" = if transparent && transparentButtons then + (
foregroundOnWallpaper if transparentButtons && transparent
else then "00"
foreground; else ""
"theme.bar.buttons.background" = );
(if transparent then background else background-alt) theme.bar.buttons.text =
+ (if transparentButtons then "00" else ""); if transparent && transparentButtons
"theme.bar.buttons.icon" = accent; then foregroundOnWallpaper
else foreground;
theme.bar.buttons.background =
(
if transparent
then background
else background-alt
)
+ (
if transparentButtons
then "00"
else ""
);
theme.bar.buttons.icon = accent;
"theme.bar.buttons.notifications.background" = background-alt; theme.bar.buttons.notifications.background = background-alt;
"theme.bar.buttons.hover" = background; theme.bar.buttons.hover = background;
"theme.bar.buttons.notifications.hover" = background; theme.bar.buttons.notifications.hover = background;
"theme.bar.buttons.notifications.total" = accent; theme.bar.buttons.notifications.total = accent;
"theme.bar.buttons.notifications.icon" = accent; theme.bar.buttons.notifications.icon = accent;
"theme.osd.bar_color" = accent; theme.osd.bar_color = accent;
"theme.osd.bar_overflow_color" = accent-alt; theme.osd.bar_overflow_color = accent-alt;
"theme.osd.icon" = background; theme.osd.icon = background;
"theme.osd.icon_container" = accent; theme.osd.icon_container = accent;
"theme.osd.label" = accent; theme.osd.label = accent;
"theme.osd.bar_container" = background-alt; theme.osd.bar_container = background-alt;
"theme.bar.menus.menu.media.background.color" = background-alt; theme.bar.menus.menu.media.background.color = background-alt;
"theme.bar.menus.menu.media.card.color" = background-alt; theme.bar.menus.menu.media.card.color = background-alt;
"theme.notification.background" = background-alt; theme.notification.background = background-alt;
"theme.notification.actions.background" = accent; theme.notification.actions.background = accent;
"theme.notification.actions.text" = foreground; theme.notification.actions.text = foreground;
"theme.notification.label" = accent; theme.notification.label = accent;
"theme.notification.border" = background-alt; theme.notification.border = background-alt;
"theme.notification.text" = foreground; theme.notification.text = foreground;
"theme.notification.labelicon" = accent; theme.notification.labelicon = accent;
"theme.notification.close_button.background" = background-alt; theme.notification.close_button.background = background-alt;
"theme.notification.close_button.label" = "#f38ba8"; theme.notification.close_button.label = "#f38ba8";
}; };
}; };
} }