upstream hyprland and change to tofi
tofi is way faster than wofi
This commit is contained in:
parent
3d02938194
commit
0edc2708a1
7 changed files with 21 additions and 12 deletions
15
flake.lock
generated
15
flake.lock
generated
|
|
@ -233,15 +233,16 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1704475363,
|
||||
"narHash": "sha256-isiBkAsjXIvb/6McVK42/iBbC4h+UL3JRkkLqTSPE48=",
|
||||
"lastModified": 1704110595,
|
||||
"narHash": "sha256-WSrjBI3k2dM/kGF20At0E6NlrJSB4+pE+WGJ6dFzWEs=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"rev": "7e033e48ace5406a9bc442f7d403f9ce3af193f3",
|
||||
"rev": "03ebbe18ed8517ee22591eac82cd54322f42cb7d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hyprwm",
|
||||
"ref": "v0.34.0",
|
||||
"repo": "Hyprland",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -424,18 +425,18 @@
|
|||
"flake": false,
|
||||
"locked": {
|
||||
"host": "gitlab.freedesktop.org",
|
||||
"lastModified": 1703963193,
|
||||
"narHash": "sha256-ke8drv6PTrdQDruWbajrRJffP9A9PU6FRyjJGNZRTs4=",
|
||||
"lastModified": 1701368958,
|
||||
"narHash": "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo=",
|
||||
"owner": "wlroots",
|
||||
"repo": "wlroots",
|
||||
"rev": "f81c3d93cd6f61b20ae784297679283438def8df",
|
||||
"rev": "5d639394f3e83b01596dcd166a44a9a1a2583350",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
"host": "gitlab.freedesktop.org",
|
||||
"owner": "wlroots",
|
||||
"repo": "wlroots",
|
||||
"rev": "f81c3d93cd6f61b20ae784297679283438def8df",
|
||||
"rev": "5d639394f3e83b01596dcd166a44a9a1a2583350",
|
||||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
stylix.url = "github:danth/stylix";
|
||||
hyprland.url = "github:hyprwm/Hyprland";
|
||||
hyprland.url = "github:hyprwm/Hyprland/v0.34.0";
|
||||
hycov = {
|
||||
url = "github:DreamMaoMao/hycov";
|
||||
inputs.hyprland.follows = "hyprland";
|
||||
|
|
|
|||
|
|
@ -27,6 +27,12 @@
|
|||
}
|
||||
];
|
||||
|
||||
programs.menu = {
|
||||
package = pkgs.tofi;
|
||||
dmenuCommand = "${pkgs.tofi}/bin/tofi --fuzzy-match true";
|
||||
drunCommand = "${pkgs.tofi}/bin/tofi-drun --drun-launch true";
|
||||
};
|
||||
|
||||
roles.mpd.enable = true;
|
||||
|
||||
programs.home-manager.enable = true;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
}: let
|
||||
editor = config.programs.editor;
|
||||
pkg = editor.package;
|
||||
menu = config.programs.menu.package + config.programs.menu.dmenuCommand;
|
||||
menu = config.programs.menu.dmenuCommand;
|
||||
editorCmd = "NIXOS_OZONE_WL= ${pkg}/bin/${pkg.executableName}";
|
||||
in {
|
||||
options.programs = with lib; {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
cfg = config.programs.menu;
|
||||
terminal = config.programs.terminal;
|
||||
termcmd = "${terminal}/bin/${terminal.pname}";
|
||||
menucmd = "${config.programs.menu.package}${config.programs.menu.drunCommand}";
|
||||
menucmd = config.programs.menu.drunCommand;
|
||||
in {
|
||||
options.programs = with lib; {
|
||||
menu = {
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@
|
|||
jq = "${pkgs.jq}/bin/jq";
|
||||
hyprctl = "${pkgs.hyprland}/bin/hyprctl";
|
||||
xargs = "${pkgs.findutils}/bin/xargs";
|
||||
menu = "${config.programs.menu.package}${config.programs.menu.dmenuCommand}";
|
||||
runmenu = "${config.programs.menu.package}/bin/wofi --show drun";
|
||||
menu = config.programs.menu.dmenuCommand;
|
||||
runmenu = config.programs.menu.drunCommand;
|
||||
fileman = "${pkgs.pcmanfm}/bin/pcmanfm";
|
||||
gawk = "${pkgs.gawk}/bin/awk";
|
||||
hyprpicker = "${pkgs.hyprpicker}/bin/hyprpicker";
|
||||
|
|
|
|||
|
|
@ -30,7 +30,9 @@ with inputs;
|
|||
}
|
||||
];
|
||||
};
|
||||
programs.hyprland.package = hyprland.packages."${system}".hyprland;
|
||||
nixpkgs.config.packageOverrides = pkgs: {
|
||||
inherit (hyprland.packages.${system}) xdg-desktop-portal-hyprland hyprland hyprland-protocols;
|
||||
hycov = hycov.packages.${system}.hycov;
|
||||
brave = (import stable-nixpkgs {inherit system;}).brave;
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue