From 49aa311802bfa521a7018472405a036254fa9a08 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 31 May 2024 06:27:28 +0300 Subject: [PATCH] some alejandra formatting --- .envrc | 2 +- home/home.nix | 2 + pkgs/hyprland/anyrun/default.nix | 6 +-- pkgs/hyprland/default.nix | 3 +- pkgs/hyprland/hypr/default.nix | 20 ++++++-- pkgs/yazi/default.nix | 82 ++++++++++++++++---------------- 6 files changed, 63 insertions(+), 52 deletions(-) diff --git a/.envrc b/.envrc index 8392d15..2687aa5 100644 --- a/.envrc +++ b/.envrc @@ -1 +1 @@ -use flake \ No newline at end of file +gitleaks detect -v \ No newline at end of file diff --git a/home/home.nix b/home/home.nix index 4c1f395..f470b26 100644 --- a/home/home.nix +++ b/home/home.nix @@ -77,6 +77,8 @@ "editor.formatOnSave" = false; "editor.formatOnType" = false; }; + "nixfmt.path" = "${pkgs.alejandra}/bin/alejandra"; #alejandra addon is broken so i just use nixfmt addon with alejandra lol + "nix.formatterPath" = "${pkgs.alejandra}/bin/alejandra"; }; }; diff --git a/pkgs/hyprland/anyrun/default.nix b/pkgs/hyprland/anyrun/default.nix index 4321df9..96a5cce 100644 --- a/pkgs/hyprland/anyrun/default.nix +++ b/pkgs/hyprland/anyrun/default.nix @@ -1,9 +1,5 @@ +{ pkgs, inputs, config, ... }: { - pkgs, - inputs, - config, - ... -}: { imports = [ inputs.home-manager.nixosModules.home-manager ]; diff --git a/pkgs/hyprland/default.nix b/pkgs/hyprland/default.nix index 3b60217..87a7486 100644 --- a/pkgs/hyprland/default.nix +++ b/pkgs/hyprland/default.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{...}: { imports = [ ./hypr ./anyrun diff --git a/pkgs/hyprland/hypr/default.nix b/pkgs/hyprland/hypr/default.nix index d3feea1..c831cf6 100644 --- a/pkgs/hyprland/hypr/default.nix +++ b/pkgs/hyprland/hypr/default.nix @@ -1,5 +1,4 @@ { config, lib, pkgs, inputs, stable, ... }: - { imports = [ inputs.home-manager.nixosModules.home-manager @@ -10,7 +9,22 @@ programs.hyprland.enable = true; programs.hyprland.package = inputs.hyprland.packages.${pkgs.system}.hyprland; users.users.delta.packages = with pkgs; [ - swww stable.waybar stable.swaynotificationcenter cliphist fzf hyprshot slurp grim swaylock hypridle libnotify brightnessctl pamixer python3 grimblast networkmanagerapplet + swww + stable.waybar + stable.swaynotificationcenter + cliphist + fzf + hyprshot + slurp + grim + swaylock + hypridle + libnotify + brightnessctl + pamixer + python3 + grimblast + networkmanagerapplet ]; # environment.systemPackages = [ # inputs.hyprland-contrib.packages.${pkgs.system}.grimblast.override { license = licenses.gpl3; } @@ -51,4 +65,4 @@ # ]; }; }; -} \ No newline at end of file +} diff --git a/pkgs/yazi/default.nix b/pkgs/yazi/default.nix index 3b859c5..7cdc2f9 100644 --- a/pkgs/yazi/default.nix +++ b/pkgs/yazi/default.nix @@ -1,11 +1,13 @@ -{ pkgs, lib, ... }: - { + pkgs, + lib, + ... +}: { programs.yazi = { enable = true; # enableFishIntegration = true; }; - home.file.".config/yazi/yazi.toml".text = '' + home.file.".config/yazi/yazi.toml".text = '' [[manager.prepend_keymap]] on = [ "l" ] run = "plugin --sync smart-enter" @@ -24,51 +26,49 @@ ''; home.file.".config/yazi/plugins/smart-enter.yazi/init.lua".text = '' - return { - entry = function() - local h = cx.active.current.hovered - ya.manager_emit(h and h.cha.is_dir and "enter" or "open", { hovered = true }) - end, - } + return { + entry = function() + local h = cx.active.current.hovered + ya.manager_emit(h and h.cha.is_dir and "enter" or "open", { hovered = true }) + end, + } ''; home.file.".config/yazi/plugins/smart-paste.yazi/init.lua".text = '' - return { - entry = function() - local h = cx.active.current.hovered - if h and h.cha.is_dir then - ya.manager_emit("enter", {}) - ya.manager_emit("paste", {}) - ya.manager_emit("leave", {}) - else - ya.manager_emit("paste", {}) - end - end, - } + return { + entry = function() + local h = cx.active.current.hovered + if h and h.cha.is_dir then + ya.manager_emit("enter", {}) + ya.manager_emit("paste", {}) + ya.manager_emit("leave", {}) + else + ya.manager_emit("paste", {}) + end + end, + } ''; home.file.".config/yazi/plugins/max-preview.yazi/init.lua".text = '' - local function entry(st) - if st.old then - Manager.layout, st.old = st.old, nil - else - st.old = Manager.layout - Manager.layout = function(self, area) - self.area = area + local function entry(st) + if st.old then + Manager.layout, st.old = st.old, nil + else + st.old = Manager.layout + Manager.layout = function(self, area) + self.area = area - return ui.Layout() - :direction(ui.Layout.HORIZONTAL) - :constraints({ - ui.Constraint.Percentage(0), - ui.Constraint.Percentage(0), - ui.Constraint.Percentage(100), - }) - :split(area) + return ui.Layout() + :direction(ui.Layout.HORIZONTAL) + :constraints({ + ui.Constraint.Percentage(0), + ui.Constraint.Percentage(0), + ui.Constraint.Percentage(100), + }) + :split(area) + end end + ya.app_emit("resize", {}) end - ya.app_emit("resize", {}) - end - return { entry = entry } + return { entry = entry } ''; - - }