From aab35e484c6412e04e0e4c18ee2bef3e6f0b3cdd Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Fri, 25 Jul 2025 12:29:23 +0100 Subject: [PATCH] ethui --- flake.lock | 183 +++++++++++++++---- flake.nix | 2 +- home/arrakis/default.nix | 2 + home/common/programs/desktop/default.nix | 9 + home/common/programs/ethui.nix | 4 + home/common/programs/hyprland/cursor.nix | 10 +- home/common/programs/i3.nix | 4 + home/desktop/default.nix | 1 + home/desktop/monitors.nix | 3 +- hosts/arrakis/default.nix | 7 +- hosts/common/features/display/x11.nix | 9 +- hosts/common/features/gpu/intel-graphics.nix | 4 + hosts/desktop/default.nix | 2 +- 13 files changed, 189 insertions(+), 51 deletions(-) create mode 100644 home/common/programs/ethui.nix diff --git a/flake.lock b/flake.lock index cb78eed..f3f13a0 100644 --- a/flake.lock +++ b/flake.lock @@ -81,6 +81,27 @@ "type": "github" } }, + "ethui": { + "inputs": { + "nixpkgs": "nixpkgs", + "rust": "rust", + "utils": "utils" + }, + "locked": { + "lastModified": 1753379057, + "narHash": "sha256-9HPBVXbZQAiMy3cgBnq1mzBncSxK02WjhModv6scTs8=", + "owner": "ethui", + "repo": "ethui", + "rev": "e83bd77465744f0fcf045d76304bba36a5dc0594", + "type": "github" + }, + "original": { + "owner": "ethui", + "ref": "e83bd774", + "repo": "ethui", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -119,7 +140,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -137,7 +158,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -156,7 +177,7 @@ "foundry": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1752657157, @@ -216,11 +237,11 @@ ] }, "locked": { - "lastModified": 1743604125, - "narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=", + "lastModified": 1752603129, + "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", "owner": "nix-community", "repo": "home-manager", - "rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a", + "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", "type": "github" }, "original": { @@ -235,7 +256,7 @@ "rose-pine-hyprcursor", "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1709914708, @@ -322,16 +343,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1666753130, - "narHash": "sha256-Wff1dGPFSneXJLI2c0kkdWTgxnQ416KE6X4KnFkgPYQ=", - "owner": "NixOS", + "lastModified": 1752480373, + "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "f540aeda6f677354f1e7144ab04352f61aaa0118", + "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-lib": { @@ -350,6 +373,36 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1744536153, + "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1666753130, + "narHash": "sha256-Wff1dGPFSneXJLI2c0kkdWTgxnQ416KE6X4KnFkgPYQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f540aeda6f677354f1e7144ab04352f61aaa0118", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1748929857, "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", @@ -365,7 +418,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_5": { "locked": { "lastModified": 1752077645, "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", @@ -381,7 +434,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_6": { "locked": { "lastModified": 1710272261, "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", @@ -397,13 +450,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_7": { "locked": { - "lastModified": 1743448293, - "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=", + "lastModified": 1752480373, + "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3", + "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", "type": "github" }, "original": { @@ -416,9 +469,9 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_5", "nuschtosSearch": "nuschtosSearch", - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1752546848, @@ -460,11 +513,11 @@ "nvchad-starter": { "flake": false, "locked": { - "lastModified": 1752585730, - "narHash": "sha256-XvDiWl//3G/eBztmEr4MkGVmTjeZ3T6IBgQn6Gp1NB0=", + "lastModified": 1753196524, + "narHash": "sha256-iLewIAiXmah4Gm5dPEfMVJFin6OgDWxQwkPGC8tCl7E=", "owner": "naps62", "repo": "nvchad-starter", - "rev": "96ea3c5fa5bece1fcbd24ad76279011a28b0bb50", + "rev": "00e57b5004f240de9310de2a3789586f8291cfbc", "type": "github" }, "original": { @@ -499,26 +552,27 @@ }, "root": { "inputs": { + "ethui": "ethui", "foundry": "foundry", "hardware": "hardware", "home-manager": "home-manager", "hyprpanel": "hyprpanel", "nix-colors": "nix-colors", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_4", "nixvim": "nixvim", "nvchad-starter": "nvchad-starter", "nvchad4nix": "nvchad4nix", "rose-pine-hyprcursor": "rose-pine-hyprcursor", - "systems": "systems_6", - "utils": "utils_2", + "systems": "systems_7", + "utils": "utils_3", "zen-browser": "zen-browser" } }, "rose-pine-hyprcursor": { "inputs": { "hyprlang": "hyprlang", - "nixpkgs": "nixpkgs_4", - "utils": "utils" + "nixpkgs": "nixpkgs_6", + "utils": "utils_2" }, "locked": { "lastModified": 1748096947, @@ -534,6 +588,24 @@ "type": "github" } }, + "rust": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1752633862, + "narHash": "sha256-Bj7ozT1+5P7NmvDcuAXJvj56txcXuAhk3Vd9FdWFQzk=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "8668ca94858206ac3db0860a9dec471de0d995f8", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -580,6 +652,21 @@ } }, "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -594,7 +681,7 @@ "type": "github" } }, - "systems_5": { + "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -609,7 +696,7 @@ "type": "github" } }, - "systems_6": { + "systems_7": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -624,7 +711,7 @@ "type": "github" } }, - "systems_7": { + "systems_8": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -641,7 +728,25 @@ }, "utils": { "inputs": { - "systems": "systems_5" + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_2": { + "inputs": { + "systems": "systems_6" }, "locked": { "lastModified": 1710146030, @@ -657,9 +762,9 @@ "type": "github" } }, - "utils_2": { + "utils_3": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1731533236, @@ -678,14 +783,14 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1752584655, - "narHash": "sha256-nPHrsq0vSh0+BqV2xAAVsfoVqzP9KYG7Zicc6oA0nfk=", + "lastModified": 1753069499, + "narHash": "sha256-YtgY0ueqKNrBma4Euu8WH23BhUkBujirJDMDE1KujnU=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "759a7860416dfd8c86f383d4ea4009bb034d869c", + "rev": "c64b94235ae24e3b9e01a08f0331d8bb0e5b037a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 89bfe81..1dd3d29 100644 --- a/flake.nix +++ b/flake.nix @@ -36,8 +36,8 @@ url = "github:Jas-SinghFSU/HyprPanel"; inputs.nixpkgs.follows = "nixpkgs"; }; - zen-browser.url = "github:0xc000022070/zen-browser-flake"; + ethui.url = "github:ethui/ethui/e83bd774"; }; outputs = diff --git a/home/arrakis/default.nix b/home/arrakis/default.nix index 74997e4..e46e5f6 100644 --- a/home/arrakis/default.nix +++ b/home/arrakis/default.nix @@ -14,10 +14,12 @@ ../common/programs/desktop ../common/programs/zen-browser.nix ../common/programs/hyprland + ../common/programs/i3.nix ../common/programs/ghostty.nix ../common/programs/kitty.nix ../common/programs/syncthing.nix ../common/programs/unity.nix + ../common/programs/ethui.nix ../common/programs/gpg.nix ../common/features/xdg.nix ../common/features/bluetooth.nix diff --git a/home/common/programs/desktop/default.nix b/home/common/programs/desktop/default.nix index 09a4537..bc9b6df 100644 --- a/home/common/programs/desktop/default.nix +++ b/home/common/programs/desktop/default.nix @@ -58,5 +58,14 @@ name = "Tela black"; package = pkgs.tela-icon-theme; }; + cursorTheme = { + name = "Numix-Cursor-Light"; + package = pkgs.numix-cursor-theme; + }; + }; + + home.pointerCursor = { + package = pkgs.numix-cursor-theme; + name = "Numix-Cursor-Light"; }; } diff --git a/home/common/programs/ethui.nix b/home/common/programs/ethui.nix new file mode 100644 index 0000000..681dabf --- /dev/null +++ b/home/common/programs/ethui.nix @@ -0,0 +1,4 @@ +{ inputs, ... }: +{ + home.packages = [ inputs.ethui.packages.x86_64-linux.default ]; +} diff --git a/home/common/programs/hyprland/cursor.nix b/home/common/programs/hyprland/cursor.nix index 7b911ca..45a7e95 100644 --- a/home/common/programs/hyprland/cursor.nix +++ b/home/common/programs/hyprland/cursor.nix @@ -14,10 +14,10 @@ dconf = { enable = true; - settings = { - "org/gnome/desktop/interface" = { - cursor-theme = "BreezeX-RosePine-Linux"; - }; - }; + # settings = { + # "org/gnome/desktop/interface" = { + # cursor-theme = "BreezeX-RosePine-Linux"; + # }; + # }; }; } diff --git a/home/common/programs/i3.nix b/home/common/programs/i3.nix index 36c44d0..57aed54 100644 --- a/home/common/programs/i3.nix +++ b/home/common/programs/i3.nix @@ -54,6 +54,10 @@ for_window [class="kitty"] border none for_window [class="kitty"] gaps inner current set 0 for_window [class="kitty"] gaps outer current set 0 + + for_window [class="^zen"] border none + for_window [class="^zen"] gaps inner current set 0 + for_window [class="^zen"] gaps outer current set 0 ''; }; diff --git a/home/desktop/default.nix b/home/desktop/default.nix index 9b6da6d..84000a9 100644 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -20,6 +20,7 @@ ../common/programs/syncthing.nix ../common/programs/unity.nix ../common/programs/gpg.nix + ../common/programs/ethui.nix ../common/features/xdg.nix ../common/features/bluetooth.nix ../common/features/ledger.nix diff --git a/home/desktop/monitors.nix b/home/desktop/monitors.nix index 93ea2f1..1295297 100644 --- a/home/desktop/monitors.nix +++ b/home/desktop/monitors.nix @@ -44,8 +44,7 @@ in workspace 2 output DP-2 workspace 3 output DP-0 - for_window [class="Ethui"] workspace 2 - for_window [class="Ethui"] floating enable + for_window [class="Ethui"] workspace 3 ''; }; diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix index 8d3890d..4ffe907 100644 --- a/hosts/arrakis/default.nix +++ b/hosts/arrakis/default.nix @@ -30,7 +30,10 @@ systemd-boot.enable = true; efi.canTouchEfiVariables = true; }; - kernelParams = [ "i915=force_probe=46a6" ]; + kernelParams = [ + "i915=force_probe=46a6" + "i915.enable_psr=0" + ]; }; system.stateVersion = "24.05"; @@ -53,7 +56,7 @@ let authorizedKeys = pkgs.fetchurl { url = "https://github.com/naps62.keys"; - sha256 = "sha256-O5JbzK5ulPob0HIrO8DT1MxfkC9bnfBw/0GR8Xu1tjw="; + sha256 = "sha256-L90zBt9vR4TqKj9wN2QsCvja4StgJsm/rdHuQSC9Mlg="; }; in pkgs.lib.splitString "\n" (builtins.readFile authorizedKeys); diff --git a/hosts/common/features/display/x11.nix b/hosts/common/features/display/x11.nix index 90610c1..fd56394 100644 --- a/hosts/common/features/display/x11.nix +++ b/hosts/common/features/display/x11.nix @@ -5,7 +5,10 @@ desktopManager = { gnome.enable = true; }; - xserver.windowManager.i3.enable = true; + xserver = { + windowManager.i3.enable = true; + xkbOptions = "ctrl:nocaps"; + }; sysprof.enable = true; gnome = { glib-networking.enable = true; @@ -19,6 +22,10 @@ dconf.enable = true; }; + environment.systemPackages = with pkgs; [ + xclip + ]; + environment.gnome.excludePackages = (with pkgs; [ gnome-photos diff --git a/hosts/common/features/gpu/intel-graphics.nix b/hosts/common/features/gpu/intel-graphics.nix index 130364d..cfc0006 100644 --- a/hosts/common/features/gpu/intel-graphics.nix +++ b/hosts/common/features/gpu/intel-graphics.nix @@ -3,8 +3,12 @@ services.xserver.videoDrivers = [ "intel" ]; hardware.graphics = { enable = true; + enable32Bit = true; extraPackages = with pkgs; [ vpl-gpu-rt # or intel-media-sdk for QSV + vaapiVdpau + intel-media-driver + intel-vaapi-driver ]; }; diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index 0949bce..21f0510 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -63,7 +63,7 @@ let authorizedKeys = pkgs.fetchurl { url = "https://github.com/naps62.keys"; - sha256 = "sha256-O5JbzK5ulPob0HIrO8DT1MxfkC9bnfBw/0GR8Xu1tjw="; + sha256 = "sha256-L90zBt9vR4TqKj9wN2QsCvja4StgJsm/rdHuQSC9Mlg="; }; in pkgs.lib.splitString "\n" (builtins.readFile authorizedKeys);