dotfiles
My PC Dotfiles & Websitegit clone https://github.com/maydayv7/dotfiles
commit 2e2e5d42216449a695ca68e6ef3b489b6ada9d76 parent 02ec6e9aca4d7e043882c9ea0a12564f3f2bbaae Author: maydayv7 <maydayv7@gmail.com> Date: Fri, 23 Feb 2024 12:08:02 +0530 feat: Use `nixpkgs-wayland` Also add hyprpicker
Diffstat:
| M | flake.lock | | | 225 | ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- |
| M | flake.nix | | | 5 | +++++ |
| M | modules/gui/desktop/hyprland/README.md | | | 1 | + |
| M | modules/gui/desktop/hyprland/apps/bar.nix | | | 14 | ++------------ |
| M | modules/gui/desktop/hyprland/apps/default.nix | | | 4 | ++++ |
| M | modules/gui/desktop/hyprland/default.nix | | | 2 | +- |
| M | modules/gui/desktop/hyprland/settings/plugins.nix | | | 2 | +- |
| M | packages/flake.nix | | | 5 | +++-- |
8 files changed, 241 insertions(+), 17 deletions(-)
diff --git a/flake.lock b/flake.lock @@ -320,6 +320,21 @@ } }, "flake-compat_4": { + "locked": { + "lastModified": 1688025799, + "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", + "owner": "nix-community", + "repo": "flake-compat", + "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1673956053, @@ -335,6 +350,28 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "wayland", + "nix-eval-jobs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1701473968, + "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-schemas": { "locked": { "lastModified": 1697467827, @@ -367,6 +404,24 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flatpak": { "locked": { "lastModified": 1706716715, @@ -706,6 +761,68 @@ "type": "github" } }, + "lib-aggregate": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1708258113, + "narHash": "sha256-SYqkbLHSe4UxgcNwUHrMPnRmX/oJFzRILrpyn5dsJVE=", + "owner": "nix-community", + "repo": "lib-aggregate", + "rev": "42e4c0c8b04cecec07e796ce8efcb5378e93a319", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "lib-aggregate", + "type": "github" + } + }, + "nix-eval-jobs": { + "inputs": { + "flake-parts": "flake-parts", + "nix-github-actions": "nix-github-actions", + "nixpkgs": "nixpkgs_4", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1705242886, + "narHash": "sha256-TLj334vRwFtSym3m+NnKcNCnKKPNoTC/TDZL40vmOso=", + "owner": "nix-community", + "repo": "nix-eval-jobs", + "rev": "6b03a93296faf174b97546fd573c8b379f523a8d", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-eval-jobs", + "type": "github" + } + }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "wayland", + "nix-eval-jobs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1701208414, + "narHash": "sha256-xrQ0FyhwTZK6BwKhahIkUVZhMNk21IEI1nUcWSONtpo=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "93e39cc1a087d65bcf7a132e75a650c44dd2b734", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1706367331, @@ -722,6 +839,21 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1708217146, + "narHash": "sha256-nGfEv7k78slqIR5E0zzWSx214d/4/ZPKDkObLJqVLVw=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "e623008d8a46517470e6365505f1a3ce171fa46a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1678872516, @@ -770,6 +902,38 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1703134684, + "narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d6863cbcbbb80e71cecfc03356db1cda38919523", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1708296515, + "narHash": "sha256-FyF489fYNAUy7b6dkYV6rGPyzp+4tThhr80KNAaF/yY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "locked": { "lastModified": 1706741181, @@ -865,6 +1029,7 @@ "utils": "utils_2", "vscode": "vscode", "vscode-catppuccin": "vscode-catppuccin", + "wayland": "wayland", "wfvm": "wfvm", "windows": "windows" } @@ -997,6 +1162,43 @@ "type": "github" } }, + "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" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "wayland", + "nix-eval-jobs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1702979157, + "narHash": "sha256-RnFBbLbpqtn4AoJGXKevQMCGhra4h6G2MPcuTSZZQ+g=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "2961375283668d867e64129c22af532de8e77734", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "unstable": { "locked": { "lastModified": 1708118438, @@ -1094,6 +1296,27 @@ "type": "github" } }, + "wayland": { + "inputs": { + "flake-compat": "flake-compat_4", + "lib-aggregate": "lib-aggregate", + "nix-eval-jobs": "nix-eval-jobs", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1708457584, + "narHash": "sha256-bcu7zHORoF+xtkmiRZR/Ipu9ZMR8CBg0m/gQmDEYcW8=", + "owner": "nix-community", + "repo": "nixpkgs-wayland", + "rev": "119087e7a51a320b699d97463f837b75dd5768fc", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs-wayland", + "type": "github" + } + }, "wfvm": { "inputs": { "nixpkgs": [ @@ -1116,7 +1339,7 @@ }, "windows": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_5", "nixpkgs": [ "unstable" ] diff --git a/flake.nix b/flake.nix @@ -68,6 +68,9 @@ inputs.flake-parts.follows = "framework"; }; + # Wayland Repository + wayland.url = "github:nix-community/nixpkgs-wayland"; + ## Configuration Modules ## ## Language Addendum # Supported Architectures @@ -255,6 +258,7 @@ "https://nix-community.cachix.org" "https://nix-gaming.cachix.org" "https://nixpkgs-unfree.cachix.org" + "https://nixpkgs-wayland.cachix.org" "https://nyx.chaotic.cx/" "https://maydayv7-dotfiles.cachix.org" ]; @@ -267,6 +271,7 @@ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" + "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA=" "nyx.chaotic.cx-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" "maydayv7-dotfiles.cachix.org-1:dpECO0Z2ZMttY6JgWHuAR5M7cqeyfFjUsvHdnMz+j6U=" ]; diff --git a/modules/gui/desktop/hyprland/README.md b/modules/gui/desktop/hyprland/README.md @@ -55,6 +55,7 @@ | <kbd>$mod 1</kbd> | workspace | num | Create workspace 'num' | | <kbd>$mod SHIFT 1</kbd> | movetoworkspace | num | Move window to workspace 'num' | | <kbd>$mod A</kbd> | exec | nwg-drawer | Application Drawer | +| <kbd>$mod C</kbd> | exec | hyprpicker -arf hex | Color Picker | | <kbd>$mod D</kbd> | exec | nwg-displays | Monitor Configuration | | <kbd>$mod F</kbd> | exec | thunar | File Manager | | <kbd>$mod T</kbd> | exec | kitty | Terminal | diff --git a/modules/gui/desktop/hyprland/apps/bar.nix b/modules/gui/desktop/hyprland/apps/bar.nix @@ -36,19 +36,9 @@ in rec { programs.waybar = { enable = true; systemd.enable = true; + package = pkgs.wayworld.waybar; inherit (files.waybar) style; - package = pkgs.waybar.overrideAttrs (old: { - version = "hypr"; - nativeCheckInputs = [pkgs.unstable.catch2_3]; - src = pkgs.fetchFromGitHub { - owner = "Syndelis"; - repo = "Waybar"; - rev = "1bf97f532e5aac74fe9e9ca61500c3e26b14422f"; - sha256 = "sha256-kAaMoFqaJ9qUVztpLJWiZAq/EKHuhJFBbGyuGbINq/U="; - }; - }); - # Panel settings = [ { @@ -96,7 +86,7 @@ in rec { "hyprland/workspaces" = { all-outputs = true; - show-special = true; + show-special = false; format = "{icon}"; on-scroll-up = "hyprctl dispatch workspace m+1"; on-scroll-down = "hyprctl dispatch workspace m-1"; diff --git a/modules/gui/desktop/hyprland/apps/default.nix b/modules/gui/desktop/hyprland/apps/default.nix @@ -36,6 +36,7 @@ in { font-manager geany gnome.file-roller + hyprpicker lollypop mate.atril mission-center @@ -95,6 +96,7 @@ in { # Shortcuts wayland.windowManager.hyprland.settings.bind = [ "$mod, A, exec, nwg-drawer" + "$mod, C, exec, hyprpicker -arf hex" "$mod, D, exec, nwg-displays" "$mod, F, exec, thunar" "$mod, N, exec, dunstctl history-pop" @@ -243,6 +245,8 @@ in { # Wallpaper ".config/hypr/hyprpaper.conf".text = '' + splash = true + ipc = false preload = ${wallpaper} wallpaper = , ${wallpaper} ''; diff --git a/modules/gui/desktop/hyprland/default.nix b/modules/gui/desktop/hyprland/default.nix @@ -27,7 +27,7 @@ in { hyprland = { enable = true; xwayland.enable = true; - package = pkgs.hyprworld.hyprland; + package = pkgs.wayworld.hyprland; }; # Login diff --git a/modules/gui/desktop/hyprland/settings/plugins.nix b/modules/gui/desktop/hyprland/settings/plugins.nix @@ -1,7 +1,7 @@ {pkgs, ...}: { ## Plugin Settings wayland.windowManager.hyprland = { - plugins = with pkgs.hyprworld; [hych hycov]; + plugins = with pkgs.wayworld; [hych hycov]; extraConfig = '' plugin { # Window Minimize diff --git a/packages/flake.nix b/packages/flake.nix @@ -60,8 +60,9 @@ in { code = vscode.extensions."${system}"; gaming = gaming.packages."${system}"; wine = windows.packages."${system}"; - hyprworld = - hych.packages."${system}" + wayworld = + wayland.packages."${system}" + // hych.packages."${system}" // hycov.packages."${system}" // hyprland-plugins.packages."${system}" // hyprland.packages."${system}";