tristan/nix
1
0
Fork 0
Code Projects Releases Packages Activity

upstream hyprland and change to tofi

Browse source 
tofi is way faster than wofi
This commit is contained in:
Tristan 2024-01-23 10:09:02 +00:00
parent 3d02938194
commit 0edc2708a1
7 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
flake.lock generated
View file

@ -233,15 +233,16 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1704475363, "lastModified": 1704110595,
"narHash": "sha256-isiBkAsjXIvb/6McVK42/iBbC4h+UL3JRkkLqTSPE48=", "narHash": "sha256-WSrjBI3k2dM/kGF20At0E6NlrJSB4+pE+WGJ6dFzWEs=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "7e033e48ace5406a9bc442f7d403f9ce3af193f3", "rev": "03ebbe18ed8517ee22591eac82cd54322f42cb7d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "hyprwm", "owner": "hyprwm",
"ref": "v0.34.0",
"repo": "Hyprland", "repo": "Hyprland",
"type": "github" "type": "github"
} }
@ -424,18 +425,18 @@
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1703963193, "lastModified": 1701368958,
"narHash": "sha256-ke8drv6PTrdQDruWbajrRJffP9A9PU6FRyjJGNZRTs4=", "narHash": "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "f81c3d93cd6f61b20ae784297679283438def8df", "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "f81c3d93cd6f61b20ae784297679283438def8df", "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350",
"type": "gitlab" "type": "gitlab"
} }
}, },

2
flake.nix
View file

@ -9,7 +9,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
stylix.url = "github:danth/stylix"; stylix.url = "github:danth/stylix";
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland/v0.34.0";
hycov = { hycov = {
url = "github:DreamMaoMao/hycov"; url = "github:DreamMaoMao/hycov";
inputs.hyprland.follows = "hyprland"; inputs.hyprland.follows = "hyprland";

6
home/default.nix
View file

@ -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; roles.mpd.enable = true;
programs.home-manager.enable = true; programs.home-manager.enable = true;

2
home/modules/editor.nix
View file

@ -6,7 +6,7 @@
}: let }: let
editor = config.programs.editor; editor = config.programs.editor;
pkg = editor.package; 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}"; editorCmd = "NIXOS_OZONE_WL= ${pkg}/bin/${pkg.executableName}";
in { in {
options.programs = with lib; { options.programs = with lib; {

2
home/modules/menu.nix
View file

@ -7,7 +7,7 @@
cfg = config.programs.menu; cfg = config.programs.menu;
terminal = config.programs.terminal; terminal = config.programs.terminal;
termcmd = "${terminal}/bin/${terminal.pname}"; termcmd = "${terminal}/bin/${terminal.pname}";
menucmd = "${config.programs.menu.package}${config.programs.menu.drunCommand}"; menucmd = config.programs.menu.drunCommand;
in { in {
options.programs = with lib; { options.programs = with lib; {
menu = { menu = {

4
home/programs/scripts.nix
View file

@ -19,8 +19,8 @@
jq = "${pkgs.jq}/bin/jq"; jq = "${pkgs.jq}/bin/jq";
hyprctl = "${pkgs.hyprland}/bin/hyprctl"; hyprctl = "${pkgs.hyprland}/bin/hyprctl";
xargs = "${pkgs.findutils}/bin/xargs"; xargs = "${pkgs.findutils}/bin/xargs";
menu = "${config.programs.menu.package}${config.programs.menu.dmenuCommand}"; menu = config.programs.menu.dmenuCommand;
runmenu = "${config.programs.menu.package}/bin/wofi --show drun"; runmenu = config.programs.menu.drunCommand;
fileman = "${pkgs.pcmanfm}/bin/pcmanfm"; fileman = "${pkgs.pcmanfm}/bin/pcmanfm";
gawk = "${pkgs.gawk}/bin/awk"; gawk = "${pkgs.gawk}/bin/awk";
hyprpicker = "${pkgs.hyprpicker}/bin/hyprpicker"; hyprpicker = "${pkgs.hyprpicker}/bin/hyprpicker";

2
lib/mkconf.nix
View file

@ -30,7 +30,9 @@ with inputs;
} }
]; ];
}; };
programs.hyprland.package = hyprland.packages."${system}".hyprland;
nixpkgs.config.packageOverrides = pkgs: { nixpkgs.config.packageOverrides = pkgs: {
inherit (hyprland.packages.${system}) xdg-desktop-portal-hyprland hyprland hyprland-protocols;
hycov = hycov.packages.${system}.hycov; hycov = hycov.packages.${system}.hycov;
brave = (import stable-nixpkgs {inherit system;}).brave; brave = (import stable-nixpkgs {inherit system;}).brave;
}; };