From d026c0c4fa4e31c21d544ba177df518d6074f5ee Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Thu, 25 Sep 2025 09:57:55 +0100 Subject: [PATCH] hyprpanel fixed --- flake.lock | 124 +++----------------- flake.nix | 5 - home/arrakis/default.nix | 33 +----- home/common/programs/hyprland/default.nix | 1 - home/common/programs/hyprland/hyprpanel.nix | 39 ++++-- home/desktop/default.nix | 29 +---- hosts/common/features/display/x11.nix | 2 +- 7 files changed, 59 insertions(+), 174 deletions(-) diff --git a/flake.lock b/flake.lock index 9cef65d..3d15c1f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,70 +1,5 @@ { "nodes": { - "ags": { - "inputs": { - "astal": "astal", - "nixpkgs": [ - "hyprpanel", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1744557573, - "narHash": "sha256-XAyj0iDuI51BytJ1PwN53uLpzTDdznPDQFG4RwihlTQ=", - "owner": "aylur", - "repo": "ags", - "rev": "3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "ags", - "type": "github" - } - }, - "astal": { - "inputs": { - "nixpkgs": [ - "hyprpanel", - "ags", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1742571008, - "narHash": "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q=", - "owner": "aylur", - "repo": "astal", - "rev": "dc0e5d37abe9424c53dcbd2506a4886ffee6296e", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "astal", - "type": "github" - } - }, - "astal_2": { - "inputs": { - "nixpkgs": [ - "hyprpanel", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1748416910, - "narHash": "sha256-FEQcs58HL8Fe4i7XlqVEUwthjxwvRvgX15gTTfW17sU=", - "owner": "aylur", - "repo": "astal", - "rev": "c1bd89a47c81c66ab5fc6872db5a916c0433fb89", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "astal", - "type": "github" - } - }, "base16-schemes": { "flake": false, "locked": { @@ -180,11 +115,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1757668213, - "narHash": "sha256-ol7m8awhxa1Tbdovu1CIYsiydmvLgeebcX3oq7ex7uY=", + "lastModified": 1758705030, + "narHash": "sha256-zYM8PiEXANNrtjfyGUc7w37/D/kCynp0cQS+wCQ77GI=", "owner": "shazow", "repo": "foundry.nix", - "rev": "65a161219f9577878b2941f4ee05d21ee609f1d5", + "rev": "b59a55014050110170023e3e1c277c1d4a2f055b", "type": "github" }, "original": { @@ -272,28 +207,6 @@ "type": "github" } }, - "hyprpanel": { - "inputs": { - "ags": "ags", - "astal": "astal_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1750618016, - "narHash": "sha256-wn6XV23Sz/nsDPI+1FGjtyMfAWJWcXRpNcryS47DJdY=", - "owner": "Jas-SinghFSU", - "repo": "HyprPanel", - "rev": "2c0c66a8ddcdff69b2ff694fefbcd8df4387a9e7", - "type": "github" - }, - "original": { - "owner": "Jas-SinghFSU", - "repo": "HyprPanel", - "type": "github" - } - }, "ixx": { "inputs": { "flake-utils": [ @@ -420,11 +333,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1757034884, - "narHash": "sha256-PgLSZDBEWUHpfTRfFyklmiiLBE1i1aGCtz4eRA3POao=", + "lastModified": 1758446476, + "narHash": "sha256-5rdAi7CTvM/kSs6fHe1bREIva5W3TbImsto+dxG4mBo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ca77296380960cd497a765102eeb1356eb80fed0", + "rev": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0", "type": "github" }, "original": { @@ -474,11 +387,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1757619215, - "narHash": "sha256-AAg3S94zMF4BtByF2k9/K/tbC0awNHCc50GxCjccUhw=", + "lastModified": 1758718199, + "narHash": "sha256-xbkAs3NM9K2sPEhz0MB9kDfDPBXNkkEDueKpPkZzzSc=", "owner": "nix-community", "repo": "nixvim", - "rev": "43c6f7293eba3fa5ff699e339e55270305e51cab", + "rev": "fd835f3dd13872841ef394e97be71276f75957b9", "type": "github" }, "original": { @@ -497,11 +410,11 @@ ] }, "locked": { - "lastModified": 1756738487, - "narHash": "sha256-8QX7Ab5CcICp7zktL47VQVS+QeaU4YDNAjzty7l7TQE=", + "lastModified": 1758662783, + "narHash": "sha256-igrxT+/MnmcftPOHEb+XDwAMq3Xg1Xy7kVYQaHhPlAg=", "owner": "NuschtOS", "repo": "search", - "rev": "5feeaeefb571e6ca2700888b944f436f7c05149b", + "rev": "7d4c0fc4ffe3bd64e5630417162e9e04e64b27a4", "type": "github" }, "original": { @@ -537,11 +450,11 @@ ] }, "locked": { - "lastModified": 1757151558, - "narHash": "sha256-eRQKyD6bXhJ5Cwm26emcya4aiFnYt/TJCtgcG3Cj9Jk=", + "lastModified": 1758339154, + "narHash": "sha256-rgS4np+Yb3ci3PYOeQEDYj61tueROML9RoQEUSVzg08=", "owner": "nix-community", "repo": "nix4nvchad", - "rev": "59d8b4398ab261218a1ccd0c6e0243518e06403d", + "rev": "91576b50d2aaec7ac073e6ae0cdb5a3fb461021a", "type": "github" }, "original": { @@ -556,7 +469,6 @@ "foundry": "foundry", "hardware": "hardware", "home-manager": "home-manager", - "hyprpanel": "hyprpanel", "nix-colors": "nix-colors", "nixpkgs": "nixpkgs_4", "nixvim": "nixvim", @@ -786,11 +698,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1757999874, - "narHash": "sha256-kgV3ms4hR86tIxaNAYJI8NNgkmEygN+JwkXCPAx2P2U=", + "lastModified": 1758777544, + "narHash": "sha256-ie5ipy/vaI/fCyLkeEzXaRarUgrfbBwdMC6mi867LGM=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "7dcbd22ca3943e4cfb3122f96cf515f028b3236a", + "rev": "7f5f66287029b31a5ba62275d8079e82d39941a6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6b50fa5..abcb34c 100644 --- a/flake.nix +++ b/flake.nix @@ -32,10 +32,6 @@ utils.url = "github:numtide/flake-utils"; hardware.url = "github:NixOS/nixos-hardware/master"; rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor"; - hyprpanel = { - url = "github:Jas-SinghFSU/HyprPanel"; - inputs.nixpkgs.follows = "nixpkgs"; - }; zen-browser.url = "github:0xc000022070/zen-browser-flake"; ethui.url = "github:ethui/ethui/nix"; }; @@ -59,7 +55,6 @@ config.android_sdk.accept_license = true; overlays = [ inputs.foundry.overlay - inputs.hyprpanel.overlay ]; } ); diff --git a/home/arrakis/default.nix b/home/arrakis/default.nix index 7883902..1d2a13f 100644 --- a/home/arrakis/default.nix +++ b/home/arrakis/default.nix @@ -39,36 +39,13 @@ "size 800 600, class:bevy-.*" "move 100%-800 100%-600, class:bevy-.*" ]; - - env = [ - "GDK_SCALE, 1.5" - ]; }; - programs.hyprpanel.settings.layout = { - "bar.layouts" = { - "0" = { - "left" = [ - "dashboard" - "workspaces" - "windowtitle" - ]; - "middle" = [ "media" ]; - "right" = [ - "volume" - "network" - "power" - "bluetooth" - "systray" - "clock" - "notifications" - ]; - }; - "*" = { - "left" = [ ]; - "middle" = [ ]; - "right" = [ ]; - }; + programs.hyprpanel.settings.bar.layouts = { + "0" = { + right = [ + "battery" + ]; }; }; diff --git a/home/common/programs/hyprland/default.nix b/home/common/programs/hyprland/default.nix index 8b42431..a81bb47 100644 --- a/home/common/programs/hyprland/default.nix +++ b/home/common/programs/hyprland/default.nix @@ -5,7 +5,6 @@ in { imports = [ ./rofi.nix - ./dunst.nix ./cursor.nix ./hyprpanel.nix ]; diff --git a/home/common/programs/hyprland/hyprpanel.nix b/home/common/programs/hyprland/hyprpanel.nix index b95bb3a..cb78bb6 100644 --- a/home/common/programs/hyprland/hyprpanel.nix +++ b/home/common/programs/hyprland/hyprpanel.nix @@ -5,20 +5,41 @@ }: { - # imports = [ inputs.hyprpanel.homeManagerModules.hyprpanel ]; - home.packages = with pkgs; [ upower ]; programs.hyprpanel = { - # enable = true; - # overlay.enable = true; - # overwrite.enable = true; - + enable = true; settings = { + bar.layouts = { + "0" = { + left = [ + "dashboard" + "workspaces" + ]; + middle = [ "media" ]; + right = [ + "volume" + "network" + "bluetooth" + "systray" + "clock" + "notifications" + ]; + }; + "*" = { + left = [ ]; + middle = [ ]; + right = [ ]; + }; + }; theme.bar.transparent = true; - theme.font = { - name = "Fira Code Nerd Font"; - size = "14px"; + theme.font.size = "18px"; + + menus = { + dashboard = { + directories.enable = false; + stats.enable_gpu = true; + }; }; }; }; diff --git a/home/desktop/default.nix b/home/desktop/default.nix index c7e15b6..e2ed2da 100644 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -28,7 +28,6 @@ home.sessionVariables = { LIBVA_DRIVER_NAME = "nvidia"; - GDM_BACKEND = "nvidia-drm"; __GLX_VENDOR_LIBRARY_NAME = "nvidia"; }; @@ -55,29 +54,11 @@ }; - programs.hyprpanel.settings.layout = { - "bar.layouts" = { - "0" = { - "left" = [ - "dashboard" - "workspaces" - "windowtitle" - ]; - "middle" = [ "media" ]; - "right" = [ - "volume" - "network" - "bluetooth" - "systray" - "clock" - "notifications" - ]; - }; - "*" = { - "left" = [ ]; - "middle" = [ ]; - "right" = [ ]; - }; + programs.hyprpanel.settings.bar.layouts = { + "0" = { + right = [ + "battery" + ]; }; }; diff --git a/hosts/common/features/display/x11.nix b/hosts/common/features/display/x11.nix index fd56394..3a00971 100644 --- a/hosts/common/features/display/x11.nix +++ b/hosts/common/features/display/x11.nix @@ -7,7 +7,7 @@ }; xserver = { windowManager.i3.enable = true; - xkbOptions = "ctrl:nocaps"; + xkb.options = "ctrl:nocaps"; }; sysprof.enable = true; gnome = {