diff --git a/flake.lock b/flake.lock index 60df6eb5..e96faf8c 100644 --- a/flake.lock +++ b/flake.lock @@ -1,26 +1,5 @@ { "nodes": { - "anyrun": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1696926085, - "narHash": "sha256-PuaKdM4Nems/wQ2B+K7hI2UJYld/+64NdkcsYD1YJwM=", - "owner": "Kirottu", - "repo": "anyrun", - "rev": "f9073a6184f61a07bb584ecc47fbb8eb997e9216", - "type": "github" - }, - "original": { - "owner": "Kirottu", - "repo": "anyrun", - "type": "github" - } - }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -151,21 +130,6 @@ "type": "github" } }, - "blank": { - "locked": { - "lastModified": 1625557891, - "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", - "owner": "divnix", - "repo": "blank", - "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "blank", - "type": "github" - } - }, "crafted-emacs": { "flake": false, "locked": { @@ -182,105 +146,6 @@ "type": "github" } }, - "crane": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "watershot", - "std", - "paisano-mdbook-preprocessor", - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1676162383, - "narHash": "sha256-krUCKdz7ebHlFYm/A7IbKDnj2ZmMMm3yIEQcooqm7+E=", - "owner": "ipetkov", - "repo": "crane", - "rev": "6fb400ec631b22ccdbc7090b38207f7fb5cfb5f2", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "devshell": { - "inputs": { - "flake-utils": [ - "watershot", - "std", - "flake-utils" - ], - "nixpkgs": [ - "watershot", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1682700442, - "narHash": "sha256-qjaAAcCYgp1pBBG7mY9z95ODUBZMtUpf0Qp3Gt/Wha0=", - "owner": "numtide", - "repo": "devshell", - "rev": "fb6673fe9fe4409e3f43ca86968261e970918a83", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "dmerge": { - "inputs": { - "nixlib": [ - "watershot", - "std", - "nixpkgs" - ], - "yants": [ - "watershot", - "std", - "yants" - ] - }, - "locked": { - "lastModified": 1659548052, - "narHash": "sha256-fzI2gp1skGA8mQo/FBFrUAtY0GQkAIAaV/V127TJPyY=", - "owner": "divnix", - "repo": "data-merge", - "rev": "d160d18ce7b1a45b88344aa3f13ed1163954b497", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "data-merge", - "type": "github" - } - }, - "fenix": { - "inputs": { - "nixpkgs": "nixpkgs_2", - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1677306201, - "narHash": "sha256-VZ9x7qdTosFvVsrpgFHrtYfT6PU3yMIs7NRYn9ELapI=", - "owner": "nix-community", - "repo": "fenix", - "rev": "0923f0c162f65ae40261ec940406049726cfeab4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -297,73 +162,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "anyrun", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-utils": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -421,55 +219,6 @@ "type": "github" } }, - "incl": { - "inputs": { - "nixlib": [ - "watershot", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1669263024, - "narHash": "sha256-E/+23NKtxAqYG/0ydYgxlgarKnxmDbg6rCMWnOBqn9Q=", - "owner": "divnix", - "repo": "incl", - "rev": "ce7bebaee048e4cd7ebdb4cee7885e00c4e2abca", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "incl", - "type": "github" - } - }, - "n2c": { - "inputs": { - "flake-utils": [ - "watershot", - "std", - "flake-utils" - ], - "nixpkgs": [ - "watershot", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1677330646, - "narHash": "sha256-hUYCwJneMjnxTvj30Fjow6UMJUITqHlpUGpXMPXUJsU=", - "owner": "nlewo", - "repo": "nix2container", - "rev": "ebca8f58d450cae1a19c07701a5a8ae40afc9efc", - "type": "github" - }, - "original": { - "owner": "nlewo", - "repo": "nix2container", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -490,38 +239,6 @@ "type": "github" } }, - "nixago": { - "inputs": { - "flake-utils": [ - "watershot", - "std", - "flake-utils" - ], - "nixago-exts": [ - "watershot", - "std", - "blank" - ], - "nixpkgs": [ - "watershot", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1683210100, - "narHash": "sha256-bhGDOlkWtlhVECpoOog4fWiFJmLCpVEg09a40aTjCbw=", - "owner": "nix-community", - "repo": "nixago", - "rev": "1da60ad9412135f9ed7a004669fdcf3d378ec630", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixago", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1697059129, @@ -538,249 +255,14 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1677063315, - "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "988cc958c57ce4350ec248d2d53087777f9e1949", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nosys": { - "locked": { - "lastModified": 1668010795, - "narHash": "sha256-JBDVBnos8g0toU7EhIIqQ1If5m/nyBqtHhL3sicdPwI=", - "owner": "divnix", - "repo": "nosys", - "rev": "feade0141487801c71ff55623b421ed535dbdefa", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "nosys", - "type": "github" - } - }, - "paisano": { - "inputs": { - "nixpkgs": [ - "watershot", - "std", - "nixpkgs" - ], - "nosys": "nosys", - "yants": [ - "watershot", - "std", - "yants" - ] - }, - "locked": { - "lastModified": 1678949904, - "narHash": "sha256-oAoF66hYYz1RPh3lEwb9/4e4iyBAfTbQKZRRQ8gP0Ds=", - "owner": "paisano-nix", - "repo": "core", - "rev": "88f2aff10a5064551d1d4cb86800d17084489ce3", - "type": "github" - }, - "original": { - "owner": "paisano-nix", - "repo": "core", - "type": "github" - } - }, - "paisano-actions": { - "inputs": { - "nixpkgs": [ - "watershot", - "std", - "paisano-mdbook-preprocessor", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1677306424, - "narHash": "sha256-H9/dI2rGEbKo4KEisqbRPHFG2ajF8Tm111NPdKGIf28=", - "owner": "paisano-nix", - "repo": "actions", - "rev": "65ec4e080b3480167fc1a748c89a05901eea9a9b", - "type": "github" - }, - "original": { - "owner": "paisano-nix", - "repo": "actions", - "type": "github" - } - }, - "paisano-mdbook-preprocessor": { - "inputs": { - "crane": "crane", - "fenix": "fenix", - "nixpkgs": [ - "watershot", - "std", - "nixpkgs" - ], - "paisano-actions": "paisano-actions", - "std": [ - "watershot", - "std" - ] - }, - "locked": { - "lastModified": 1680654400, - "narHash": "sha256-Qdpio+ldhUK3zfl22Mhf8HUULdUOJXDWDdO7MIK69OU=", - "owner": "paisano-nix", - "repo": "mdbook-paisano-preprocessor", - "rev": "11a8fc47f574f194a7ae7b8b98001f6143ba4cf1", - "type": "github" - }, - "original": { - "owner": "paisano-nix", - "repo": "mdbook-paisano-preprocessor", - "type": "github" - } - }, - "paisano-tui": { - "inputs": { - "nixpkgs": [ - "watershot", - "std", - "blank" - ], - "std": [ - "watershot", - "std" - ] - }, - "locked": { - "lastModified": 1681847764, - "narHash": "sha256-mdd7PJW1BZvxy0cIKsPfAO+ohVl/V7heE5ZTAHzTdv8=", - "owner": "paisano-nix", - "repo": "tui", - "rev": "3096bad91cae73ab8ab3367d31f8a143d248a244", - "type": "github" - }, - "original": { - "owner": "paisano-nix", - "ref": "0.1.1", - "repo": "tui", - "type": "github" - } - }, "root": { "inputs": { - "anyrun": "anyrun", "crafted-emacs": "crafted-emacs", "home-manager": "home-manager", "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs", "stylix": "stylix", - "tokyonight-folke": "tokyonight-folke", - "watershot": "watershot" - } - }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1677221702, - "narHash": "sha256-1M+58rC4eTCWNmmX0hQVZP20t3tfYNunl9D/PrGUyGE=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "f5401f620699b26ed9d47a1d2e838143a18dbe3b", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "rust-overlay": { - "inputs": { - "flake-utils": [ - "watershot", - "std", - "paisano-mdbook-preprocessor", - "crane", - "flake-utils" - ], - "nixpkgs": [ - "watershot", - "std", - "paisano-mdbook-preprocessor", - "crane", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1675391458, - "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "std": { - "inputs": { - "arion": [ - "watershot", - "std", - "blank" - ], - "blank": "blank", - "devshell": "devshell", - "dmerge": "dmerge", - "flake-utils": "flake-utils", - "incl": "incl", - "makes": [ - "watershot", - "std", - "blank" - ], - "microvm": [ - "watershot", - "std", - "blank" - ], - "n2c": "n2c", - "nixago": "nixago", - "nixpkgs": [ - "watershot", - "nixpkgs" - ], - "paisano": "paisano", - "paisano-mdbook-preprocessor": "paisano-mdbook-preprocessor", - "paisano-tui": "paisano-tui", - "yants": "yants" - }, - "locked": { - "lastModified": 1683210511, - "narHash": "sha256-Ag85i6rHubOLB6ChsqGUyZlB2SQCjF7Seo5q12g7jJk=", - "owner": "divnix", - "repo": "std", - "rev": "562310786b998bf52bd02bf7ac6bfcc743e8d45d", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "std", - "type": "github" + "tokyonight-folke": "tokyonight-folke" } }, "stylix": { @@ -828,49 +310,6 @@ "repo": "tokyonight.nvim", "type": "github" } - }, - "watershot": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "std": "std" - }, - "locked": { - "lastModified": 1695911603, - "narHash": "sha256-l9CPSB8TCw901ugl5FLVZDkp2rLha0yXMewK7LxXIiE=", - "owner": "Kirottu", - "repo": "watershot", - "rev": "64a97b995b153e48063b1cdfda39c9b67f08fe93", - "type": "github" - }, - "original": { - "owner": "Kirottu", - "repo": "watershot", - "type": "github" - } - }, - "yants": { - "inputs": { - "nixpkgs": [ - "watershot", - "std", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1667096281, - "narHash": "sha256-wRRec6ze0gJHmGn6m57/zhz/Kdvp9HS4Nl5fkQ+uIuA=", - "owner": "divnix", - "repo": "yants", - "rev": "d18f356ec25cb94dc9c275870c3a7927a10f8c3c", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "yants", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index a07bab2d..cb693914 100644 --- a/flake.nix +++ b/flake.nix @@ -15,14 +15,6 @@ url = "github:danth/stylix"; inputs.nixpkgs.follows = "nixpkgs"; }; - anyrun = { - url = "github:Kirottu/anyrun"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - watershot = { - url = "github:Kirottu/watershot"; - inputs.nixpkgs.follows = "nixpkgs"; - }; # Non-flake inputs crafted-emacs = { @@ -65,10 +57,7 @@ , homeModules ? default.homeModules, stateVersion ? default.stateVersion }: let - specialArgs = { - inherit hostName user; - inherit (inputs) anyrun watershot; - }; + specialArgs = { inherit hostName user; }; extraSpecialArgs = specialArgs // { inherit (inputs) crafted-emacs tokyonight-folke; }; diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix index 84cd757b..bddc2364 100644 --- a/home/hyprland/config.nix +++ b/home/hyprland/config.nix @@ -89,24 +89,26 @@ in '' # See https://wiki.hyprland.org/Configuring/Keywords/ for more bind = SUPER, F1, exec, ${pkgs.gtklock}/bin/gtklock bind = SUPER, Q, killactive, - bind = SUPER SHIFT, Q, exec, wlogout + bind = SUPER SHIFT, Q, exec, rofi -replace -show power-menu bind = SUPER, V, togglefloating bind = SUPER, M, fullscreen, 0 bind = SUPER SHIFT, M, fullscreen, 1 - bind = SUPER, P, exec, pkill rofi || rofi-pass - bind = SUPER SHIFT, P, exec, pkill rofi || rofi-pass --last-used + bind = SUPER, tab, exec, rofi -replace -show window + bind = SUPER, P, exec, rofi-pass -replace + bind = SUPER SHIFT, P, exec, rofi-pass -replace --last-used bind = SUPER, X, exec, ${pkgs.mako}/bin/makoctl restore bind = SUPER SHIFT, X, exec, ${pkgs.mako}/bin/makoctl dismiss -a # Common program shortcuts - bind = SUPER, Space, exec, pkill anyrun || anyrun + bind = SUPER, Space, exec, rofi -replace -show drun + bind = SUPER SHIFT, Space, exec, rofi -replace -show run bind = SUPER, E, exec, emacsclient -c -a "alacritty -e nano" + bind = SUPER ALT, F, exec, rofi -replace -show filebrowser bind = SUPER, Return, exec, alacritty - bind = SUPER SHIFT, Return, exec, [float] alacritty + bind = SUPER SHIFT, Return, exec, rofi -replace -show ssh # Misc useful binds - bind=,Print,exec,watershot directory ${config.xdg.userDirs.pictures} - bind=,XF86Calculator,exec,pkill anyrun || anyrun + bind=,XF86Calculator,exec,rofi -replace -show calc # Sound bindl=,XF86AudioMute,exec,${pkgs.avizo}/bin/volumectl % @@ -254,8 +256,6 @@ in '' bind = SUPER SHIFT, N, movetoworkspace, empty bind = SUPER, minus, togglespecialworkspace bind = SUPER SHIFT, minus, movetoworkspace, special - bind = SUPER, tab, workspace, previous - bind = SUPER SHIFT, tab, movetoworkspace, previous bind = SUPER, bracketright, focusmonitor, +1 bind = SUPER SHIFT, bracketright, movecurrentworkspacetomonitor, +1 bind = SUPER, bracketleft, focusmonitor, -1 diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index 1c547072..467f3da5 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -1,15 +1,13 @@ -{ config, lib, pkgs, anyrun, ... }: +{ config, lib, pkgs, ... }: { imports = [ ./wlogout/default.nix ./waybar/default.nix - ./anyrun.nix ./gtk.nix ./mako.nix ./rofi.nix ]; - home.packages = [ anyrun.packages.${pkgs.system}.default ]; services = { avizo.enable = true; syncthing.enable = true; diff --git a/home/hyprland/rofi.nix b/home/hyprland/rofi.nix index dda1af36..c48ede72 100644 --- a/home/hyprland/rofi.nix +++ b/home/hyprland/rofi.nix @@ -1,6 +1,9 @@ { pkgs, config, ... }: +let + icon-theme = config.gtk.iconTheme.name; + power-menu = "power-menu:${pkgs.rofi-power-menu}/bin/rofi-power-menu"; -{ +in { programs.rofi = { enable = true; package = pkgs.rofi-wayland; @@ -13,13 +16,28 @@ USERNAME_field='login' ''; }; + plugins = with pkgs; [ rofi-calc ]; extraConfig = { + modi = "window,run,drun,ssh,filebrowser,calc,${power-menu},combi"; + combi-modi = "window,drun,ssh,filebrowser"; + theme-str = "#window {border-radius: 10px;}"; + sidebar-mode = true; sort = true; sorting-method = "fzf"; matching = "fuzzy"; - show-icons = false; + icon-theme = icon-theme; + show-icons = true; + application-fallback-icon = "󰣆"; + drun-display-format = "{icon} {name}"; disable-history = false; hide-scrollbar = true; + display-window = " 󰧨 Move "; + display-run = " 󰅴 Run "; + display-drun = " 󱓞 Launch "; + display-ssh = " 󰢹 SSH "; + display-filebrowser = " 󰝰 Files "; + display-calc = " 󰪚 Calculator "; + display-combi = " 󰛡 Combi "; }; }; } diff --git a/system/hyprland.nix b/system/hyprland.nix index 24252367..a66397ba 100644 --- a/system/hyprland.nix +++ b/system/hyprland.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, user, watershot, ... }: +{ config, lib, pkgs, user, ... }: { imports = [ ./desktop.nix ]; @@ -15,7 +15,6 @@ wireplumber wtype wl-clipboard - watershot.packages.${pkgs.system}.default grim swayimg pamixer