feat: update flake

This commit is contained in:
DACHXY 2025-02-20 00:35:33 +08:00
parent 62c4f2ccb7
commit b66238c0c4
11 changed files with 280 additions and 156 deletions

View file

@ -34,7 +34,6 @@ in
source = "${configDir}/ghostty";
};
".face".source = "${configDir}/.face";
".config/fish/functions".source = "${configDir}/fish/functions";
".config/yazi" = {
recursive = true;
source = "${configDir}/yazi";

View file

@ -11,10 +11,6 @@ let
# freezeShot = "--freeze";
freezeShot = "";
resizeStep = builtins.toString 20;
brightnessStep = builtins.toString 10;
volumeStep = builtins.toString 2;
in
[
''${mainMod}, F, exec, ${browser}''
@ -56,21 +52,12 @@ in
''${mainMod}, mouse_down, workspace, e-1''
''${mainMod}, mouse_up, workspace, e+1''
''${mainMod} CTRL, l, resizeactive, ${resizeStep} 0''
''${mainMod} CTRL, h, resizeactive, -${resizeStep} 0''
''${mainMod} CTRL, k, resizeactive, 0 -${resizeStep}''
''${mainMod} CTRL, j, resizeactive, 0 ${resizeStep}''
''${mainMod} SHIFT, l, movewindow, r''
''${mainMod} SHIFT, h, movewindow, l''
''${mainMod} SHIFT, k, movewindow, u''
''${mainMod} SHIFT, j, movewindow, d''
# Media
'',XF86AudioRaiseVolume, exec, wpctl set-mute @DEFAULT_SINK@ 0 && wpctl set-volume @DEFAULT_SINK@ ${volumeStep}%+''
'',XF86AudioLowerVolume, exec, wpctl set-mute @DEFAULT_SINK@ 0 && wpctl set-volume @DEFAULT_SINK@ ${volumeStep}%-''
'',XF86MonBrightnessDown, exec, brightnessctl set ${brightnessStep}%-''
'',XF86MonBrightnessUp, exec, brightnessctl set ${brightnessStep}%+''
'',XF86AudioPrev, exec, playerctl previous''
'',XF86AudioNext, exec, playerctl next''
''${mainMod} CTRL, COMMA, exec, playerctl previous''
@ -81,8 +68,8 @@ in
# ==== Plugins ==== #
# Overview
# ''${mainMod}, o, hyprexpo:expo, toggle''
# ''${mainMod}, TAB, hyprexpo:expo, toggle''
''${mainMod}, o, hyprtasking:toggle, cursor''
''${mainMod}, TAB, hyprtasking:toggle, all''
]
++ (
# workspaces

16
home/user/hypr/binde.nix Normal file
View file

@ -0,0 +1,16 @@
{ mainMod }:
let
resizeStep = builtins.toString 20;
brightnessStep = builtins.toString 10;
volumeStep = builtins.toString 2;
in
[
'',XF86AudioRaiseVolume, exec, wpctl set-mute @DEFAULT_SINK@ 0 && wpctl set-volume @DEFAULT_SINK@ ${volumeStep}%+''
'',XF86AudioLowerVolume, exec, wpctl set-mute @DEFAULT_SINK@ 0 && wpctl set-volume @DEFAULT_SINK@ ${volumeStep}%-''
'',XF86MonBrightnessDown, exec, brightnessctl set ${brightnessStep}%-''
'',XF86MonBrightnessUp, exec, brightnessctl set ${brightnessStep}%+''
''${mainMod} CTRL, l, resizeactive, ${resizeStep} 0''
''${mainMod} CTRL, h, resizeactive, -${resizeStep} 0''
''${mainMod} CTRL, k, resizeactive, 0 -${resizeStep}''
''${mainMod} CTRL, j, resizeactive, 0 ${resizeStep}''
]

View file

@ -1,13 +1,22 @@
{
hyprexpo = {
columns = 3;
gap_size = 5;
bg_col = "rgb(111111)";
workspace_method = "center current"; # [center/first] [workspace] e.g. first 1 or center m+1
enable_gesture = true; # laptop touchpad
gesture_fingers = 3; # 3 or 4
gesture_distance = 300; # how far is the "max"
gesture_positive = true; # positive = swipe down. Negative = swipe up.
hyprtasking = {
layout = "grid";
bg_color = "0xffebdbb2";
gap_size = 20;
gestures = {
enabled = true;
open_fingers = 3;
open_distance = 300;
open_positive = true;
};
linear = {
height = 400;
scroll_speed = 1.1;
blur = 0;
};
};
hyprwinrap = {

View file

@ -30,7 +30,7 @@ let
getCurrentSong = pkgs.writeShellScriptBin "getSong" ''
song_info=$(playerctl metadata --format '{{title}} 󰎆 {{artist}}')
echo "$song_info"
echo "$song_info"
'';
ewwWayland = pkgs.eww.overrideAttrs (oldAttrs: {
@ -65,12 +65,11 @@ in
plugins =
(with inputs.hyprland-plugins.packages.${system}; [
xtra-dispatchers
hyprexpo
hyprwinwrap
])
++ [
inputs.hyprgrass.packages.${system}.default
# inputs.hyprtasking.packages.${system}.hyprtasking
inputs.hyprtasking.packages.${system}.hyprtasking
];
settings =
@ -80,6 +79,7 @@ in
};
bind = import ./hypr/bind.nix { inherit mainMod nvidia-offload-enabled; };
bindm = import ./hypr/bindm.nix { inherit mainMod; };
binde = import ./hypr/binde.nix { inherit mainMod; };
monitor = import ./hypr/monitor.nix;
plugin = plugins;
exec-once = ''${startScript}'';

View file

@ -1,11 +1,25 @@
{
lib,
pkgs,
unstable,
device-name,
username,
inputs,
...
}:
let
lazyVim = (
unstable.vimPlugins.LazyVim.overrideAttrs (previous: {
version = "2025-02-15";
src = pkgs.fetchFromGitHub {
owner = "LazyVim";
repo = "LazyVim";
rev = "main";
sha256 = "sha256-dF2clJlNkaGoQ15TaZBswuuUJmSf0OK2vgV4XCsYwv4=";
};
})
);
in
{
home.packages = with pkgs; [
gh
@ -62,7 +76,8 @@
let
plugins = with pkgs.vimPlugins; [
# LazyVim
LazyVim
lazyVim
bufferline-nvim
cmp-buffer
cmp-nvim-lsp
@ -174,6 +189,7 @@
lazyPath = pkgs.linkFarm "lazy-plugins" (builtins.map mkEntryFromDrv plugins);
in
# lua
''
require("lazy").setup({
defaults = {

View file

@ -33,7 +33,7 @@ in
yazi = {
enable = true;
package = inputs.yazi.packages.${system}.default;
enableFishIntegration = true;
enableFishIntegration = false;
};
obs-studio = {