diff --git a/flake.lock b/flake.lock index ed264eb..7104bae 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,24 @@ { "nodes": { + "ags": { + "inputs": { + "nixpkgs": "nixpkgs_4", + "systems": "systems_2" + }, + "locked": { + "lastModified": 1727303518, + "narHash": "sha256-lO5JMynTxNZxg/+E4/Y9reeLGIz/M8cEue+Re4cP6qo=", + "owner": "Aylur", + "repo": "ags", + "rev": "cd543afec4d9ed708990e5ba52184716809bf248", + "type": "github" + }, + "original": { + "owner": "Aylur", + "repo": "ags", + "type": "github" + } + }, "aquamarine": { "inputs": { "hyprutils": [ @@ -247,7 +266,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1726560853, @@ -582,7 +601,7 @@ "rose-pine-hyprcursor", "nixpkgs" ], - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1709914708, @@ -598,6 +617,25 @@ "type": "github" } }, + "hyprpanel": { + "inputs": { + "ags": "ags", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1730100704, + "narHash": "sha256-L1SSqLhwBc4NYegileXcfe6LN8VYzDdfUiVzwcCUVE0=", + "owner": "Jas-SinghFSU", + "repo": "HyprPanel", + "rev": "41a8e44ffdc0503382e77a9db973a6de27749173", + "type": "github" + }, + "original": { + "owner": "Jas-SinghFSU", + "repo": "HyprPanel", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -655,7 +693,7 @@ "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1727852635, @@ -789,6 +827,38 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1727634051, + "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1727747005, "narHash": "sha256-2PBox0LkPhxirg1asEIpvfFARjq5KLw0EHPCy4unjPs=", @@ -804,39 +874,39 @@ "type": "github" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_7": { + "locked": { + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { "locked": { "lastModified": 1710272261, "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", @@ -860,7 +930,7 @@ "git-hooks": "git-hooks_2", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_8", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, @@ -903,11 +973,11 @@ "nvchad-starter": { "flake": false, "locked": { - "lastModified": 1729095846, - "narHash": "sha256-Rt54HnLMjrpwOQEi1MF8v3wBiV0nTBH+GGb0g/01ekQ=", + "lastModified": 1730538333, + "narHash": "sha256-cG525DBXP+GJKZ0kzbqjLgbp8Otp+2sT9SsurQT6jWc=", "owner": "naps62", "repo": "nvchad-starter", - "rev": "a07141003942296d47f3b49db46db1a286900328", + "rev": "2aeb30f3880d2e0b666a681da6645e86cf295791", "type": "github" }, "original": { @@ -947,21 +1017,22 @@ "hardware": "hardware", "home-manager": "home-manager", "hyprland": "hyprland", + "hyprpanel": "hyprpanel", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-colors": "nix-colors", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_7", "nixvim": "nixvim", "nvchad-starter": "nvchad-starter", "nvchad4nix": "nvchad4nix", "rose-pine-hyprcursor": "rose-pine-hyprcursor", - "systems": "systems_5", + "systems": "systems_6", "utils": "utils_2" } }, "rose-pine-hyprcursor": { "inputs": { "hyprlang": "hyprlang_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_9", "utils": "utils" }, "locked": { @@ -995,20 +1066,35 @@ }, "systems_2": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_4": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1023,7 +1109,7 @@ "type": "github" } }, - "systems_4": { + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1038,7 +1124,7 @@ "type": "github" } }, - "systems_5": { + "systems_6": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1053,7 +1139,7 @@ "type": "github" } }, - "systems_6": { + "systems_7": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1091,7 +1177,7 @@ }, "utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -1109,7 +1195,7 @@ }, "utils_2": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1726560853, diff --git a/flake.nix b/flake.nix index ef51dfb..50e5eb5 100644 --- a/flake.nix +++ b/flake.nix @@ -41,6 +41,7 @@ hardware.url = "github:NixOS/nixos-hardware/master"; firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor"; + hyprpanel.url = "github:Jas-SinghFSU/HyprPanel"; }; outputs = @@ -62,6 +63,7 @@ config.allowUnfree = true; overlays = [ inputs.foundry.overlay + inputs.hyprpanel.overlay ]; } ); diff --git a/home/arrakis/default.nix b/home/arrakis/default.nix index 370f404..d0d852e 100644 --- a/home/arrakis/default.nix +++ b/home/arrakis/default.nix @@ -15,7 +15,6 @@ ../common/programs/default.nix ../common/programs/desktop ../common/programs/hyprland - ../common/programs/eww ../common/programs/kitty.nix ../common/programs/syncthing.nix ../common/features/colorscheme.nix diff --git a/home/common/programs/eww/config/eww.scss b/home/common/programs/eww/config/eww.scss deleted file mode 100644 index f955345..0000000 --- a/home/common/programs/eww/config/eww.scss +++ /dev/null @@ -1,44 +0,0 @@ -* { - all: unset; // Unsets everything so you can style everything from scratch -} - -// Global Styles -.bar { - background-color: #3a3a3a; - color: #b0b4bc; - padding: 10px; -} - -// Styles on classes (see eww.yuck for more information) - -.sidestuff slider { - all: unset; - color: #ffd5cd; -} - -.metric scale trough highlight { - all: unset; - background-color: #D35D6E; - color: #000000; - border-radius: 10px; -} - -.metric scale trough { - all: unset; - background-color: #4e4e4e; - border-radius: 50px; - min-height: 3px; - min-width: 50px; - margin-left: 10px; - margin-right: 20px; -} - -.label-ram { - font-size: large; -} - -.workspaces button:hover { - color: #D35D6E; -} - - diff --git a/home/common/programs/eww/config/eww.yuck b/home/common/programs/eww/config/eww.yuck deleted file mode 100644 index d28d581..0000000 --- a/home/common/programs/eww/config/eww.yuck +++ /dev/null @@ -1,72 +0,0 @@ -(defwidget bar [] - (centerbox :orientation "h" - (workspaces) - (music) - (sidestuff))) - -(defwidget sidestuff [] - (box :class "sidestuff" :orientation "h" :space-evenly false :halign "end" - (metric :label "🔊" - :value volume - :onchange "amixer -D pulse sset Master {}%") - (metric :label "" - :value {EWW_RAM.used_mem_perc} - :onchange "") - (metric :label "💾" - :value {round((1 - (EWW_DISK["/"].free / EWW_DISK["/"].total)) * 100, 0)} - :onchange "") - time)) - -(defwidget workspaces [] - (box :class "workspaces" - :orientation "h" - :space-evenly true - :halign "start" - :spacing 10 - (button :onclick "hyprctl dispatch workspace 1" 1) - (button :onclick "hyprctl dispatch workspace 2" 2) - (button :onclick "hyprctl dispatch workspace 3" 3) - (button :onclick "hyprctl dispatch workspace 4" 4) - (button :onclick "hyprctl dispatch workspace 5" 5) - (button :onclick "hyprctl dispatch workspace 8" 6))) - -(defwidget music [] - (box :class "music" - :orientation "h" - :space-evenly false - :halign "center" - {music != "" ? "🎵${music}" : ""})) - - -(defwidget metric [label value onchange] - (box :orientation "h" - :class "metric" - :space-evenly false - (box :class "label" label) - (scale :min 0 - :max 101 - :active {onchange != ""} - :value value - :onchange onchange))) - - - -(deflisten music :initial "" - "playerctl --follow metadata --format '{{ artist }} - {{ title }}' || true") - -(defpoll volume :interval "1s" - "scripts/getvol") - -(defpoll time :interval "10s" - "date '+%H:%M %b %d, %Y'") - -(defwindow bar - :monitor 0 - :windowtype "dock" - :geometry (geometry :x "0%" - :y "0%" - :width "100%" - :height "10px" - :anchor "top center") - (bar)) - diff --git a/home/common/programs/eww/config/scripts/getvol b/home/common/programs/eww/config/scripts/getvol deleted file mode 100755 index 4e4275d..0000000 --- a/home/common/programs/eww/config/scripts/getvol +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -if command -v pamixer &>/dev/null; then - if [ true == $(pamixer --get-mute) ]; then - echo 0 - exit - else - pamixer --get-volume - fi -else - amixer -D pulse sget Master | awk -F '[^0-9]+' '/Left:/{print $3}' -fi diff --git a/home/common/programs/eww/default.nix b/home/common/programs/eww/default.nix deleted file mode 100644 index 34ed791..0000000 --- a/home/common/programs/eww/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ config, pkgs, ... }: -{ - programs.eww = { - enable = true; - enableZshIntegration = true; - configDir = ./config; - }; -} diff --git a/home/common/programs/hyprland/avizo.nix b/home/common/programs/hyprland/avizo.nix deleted file mode 100644 index 0cfd33b..0000000 --- a/home/common/programs/hyprland/avizo.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, ... }: -{ - services.avizo = { - enable = true; - settings = { - default = { - time = 1.0; - }; - }; - }; -} diff --git a/home/common/programs/hyprland/default.nix b/home/common/programs/hyprland/default.nix index 2ddfcb3..f3c177a 100644 --- a/home/common/programs/hyprland/default.nix +++ b/home/common/programs/hyprland/default.nix @@ -6,7 +6,6 @@ in imports = [ ./rofi.nix ./dunst.nix - ./avizo.nix ./cursor.nix ]; @@ -14,16 +13,13 @@ in hyprcursor pamixer hyprshot + hyprpanel ]; home.sessionVariables = { ELECTRON_OZONE_PLATFORM_HINT = "auto"; }; - xdg.configFile = { - "hypr/scripts".source = ./scripts; - }; - wayland.windowManager.hyprland = { enable = true; settings = { @@ -92,7 +88,7 @@ in "exec-once" = [ "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" - "eww daemon" + "hyprpanel" ]; windowrulev2 = [ @@ -120,8 +116,6 @@ in "$mod, f, fullscreen, 0" "$mod SHIFT, f, fullscreen, 1" - "$mod, d, exec, ~/.config/hypr/scripts/toggle-bar" - # rofi "$mod, space, exec, launcher_t2" diff --git a/home/common/programs/hyprland/scripts/toggle-bar b/home/common/programs/hyprland/scripts/toggle-bar deleted file mode 100755 index 35ef132..0000000 --- a/home/common/programs/hyprland/scripts/toggle-bar +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env zsh - -if eww active-windows | grep bar; then - eww close bar -else - eww open bar -fi diff --git a/home/common/programs/neovim/default.nix b/home/common/programs/neovim/default.nix index 11f3958..fb75f2c 100644 --- a/home/common/programs/neovim/default.nix +++ b/home/common/programs/neovim/default.nix @@ -8,6 +8,7 @@ nixfmt-rfc-style biome stylua + neovide ]; programs.nvchad = { diff --git a/home/common/programs/rust.nix b/home/common/programs/rust.nix index c2b351e..9ea6885 100644 --- a/home/common/programs/rust.nix +++ b/home/common/programs/rust.nix @@ -3,6 +3,7 @@ home.packages = with pkgs; [ rustup bacon + mprocs ]; home.sessionPath = [ "\${CARGO_HOME:-~/.cargo}/bin" ]; diff --git a/home/trantor/default.nix b/home/trantor/default.nix index 370f404..d0d852e 100644 --- a/home/trantor/default.nix +++ b/home/trantor/default.nix @@ -15,7 +15,6 @@ ../common/programs/default.nix ../common/programs/desktop ../common/programs/hyprland - ../common/programs/eww ../common/programs/kitty.nix ../common/programs/syncthing.nix ../common/features/colorscheme.nix