From 77096b6c08443df3710356e3059caa9ce61865aa Mon Sep 17 00:00:00 2001 From: azikx Date: Tue, 15 Oct 2024 22:18:01 +0900 Subject: [PATCH] =?UTF-8?q?update=20=EF=8C=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.nix | 161 +- home/default.nix | 18 +- home/programs/cli/btop/default.nix | 21 +- home/programs/cli/cava/default.nix | 43 +- home/programs/cli/default.nix | 30 +- home/programs/cli/eza/default.nix | 15 +- home/programs/cli/fastfetch/default.nix | 134 +- home/programs/cli/fzf/default.nix | 15 +- home/programs/cli/git/default.nix | 23 +- home/programs/cli/helix/default.nix | 101 +- home/programs/cli/helix/languages.nix | 25 +- home/programs/cli/helix/theme.nix | 265 +- home/programs/cli/joshuto/binds.nix | 150 - home/programs/cli/joshuto/default.nix | 48 - home/programs/cli/joshuto/mime.nix | 172 - home/programs/cli/joshuto/previewer.nix | 16 - home/programs/cli/joshuto/theme.nix | 76 - home/programs/cli/micro/default.nix | 129 +- home/programs/cli/pkgs.nix | 69 +- home/programs/cli/yazi/binds.nix | 148 +- home/programs/cli/yazi/default.nix | 109 +- home/programs/cli/yazi/lua.nix | 191 +- home/programs/cli/yazi/plugins.nix | 133 +- home/programs/cli/yazi/starship.nix | 7 +- home/programs/cli/yazi/theme.nix | 3589 ++++++++++++++--- home/programs/cli/zoxide/default.nix | 15 +- .../custom-pkgs/anicliru/anicli-api.nix | 15 +- .../custom-pkgs/anicliru/anicli-ru.nix | 12 +- .../programs/custom-pkgs/anicliru/chompjs.nix | 10 +- .../programs/custom-pkgs/anicliru/eggella.nix | 7 +- home/programs/custom-pkgs/default.nix | 12 +- home/programs/default.nix | 10 +- home/programs/gui/ayugram/default.nix | 213 +- home/programs/gui/default.nix | 24 +- home/programs/gui/firefox/default.nix | 129 +- home/programs/gui/floorp/default.nix | 127 +- home/programs/gui/floorp/search.nix | 58 +- home/programs/gui/floorp/settings.nix | 17 +- home/programs/gui/floorp/user/chrome.nix | 11 +- home/programs/gui/floorp/user/content.nix | 34 +- home/programs/gui/floorp/user/default.nix | 7 +- home/programs/gui/floorp/user/tcr.nix | 42 +- home/programs/gui/mpv/default.nix | 152 +- home/programs/gui/obs-studio/default.nix | 3 +- home/programs/gui/pkgs.nix | 89 +- home/programs/gui/qbittorrent/default.nix | 5 +- home/programs/gui/qutebrowser/default.nix | 7 +- home/programs/gui/spotify/default.nix | 88 +- home/programs/gui/swayimg/default.nix | 33 +- home/programs/misc/dconf.nix | 17 +- home/programs/misc/default.nix | 14 +- home/programs/misc/env.nix | 3 +- home/programs/misc/nix.nix | 50 +- home/programs/misc/nwg.nix | 25 +- home/programs/misc/xdg.nix | 74 +- home/programs/shells/default.nix | 12 +- home/programs/shells/fish/default.nix | 151 +- home/programs/shells/starship.nix | 131 +- home/themes/default.nix | 10 +- home/themes/gtk.nix | 40 +- home/themes/qt/default.nix | 8 +- home/themes/qt/qt.nix | 8 +- home/themes/qt/qt5ct.nix | 11 +- home/themes/qt/qt6ct.nix | 11 +- home/themes/stylix/paradise.nix | 46 +- home/themes/stylix/stylix.nix | 98 +- home/window-managers/hyprland/binds.nix | 290 +- home/window-managers/hyprland/default.nix | 22 +- home/window-managers/hyprland/plugins.nix | 130 +- home/window-managers/hyprland/rules.nix | 64 +- home/window-managers/hyprland/settings.nix | 240 +- home/window-managers/misc/default.nix | 8 +- home/window-managers/misc/mako/default.nix | 35 +- home/window-managers/misc/waybar/default.nix | 19 +- home/window-managers/misc/waybar/style.nix | 203 +- home/window-managers/terminals/default.nix | 7 +- .../terminals/foot/default.nix | 35 +- .../window-managers/terminals/kitty/binds.nix | 89 +- .../terminals/kitty/colors.nix | 71 +- .../terminals/kitty/default.nix | 80 +- host/default.nix | 8 +- host/misc/autocpu.nix | 3 +- host/misc/battery.nix | 13 +- host/misc/locale.nix | 35 +- host/misc/nh.nix | 15 +- host/misc/nix.nix | 56 +- host/misc/pkgs.nix | 42 +- host/misc/security.nix | 51 +- host/misc/torrserver.nix | 14 +- host/misc/torrserver/default.nix | 43 +- host/misc/user.nix | 23 +- host/misc/zapret.nix | 70 +- host/system/boot.nix | 110 +- host/system/disks.nix | 39 +- host/system/hardware.nix | 46 +- host/system/network.nix | 27 +- host/system/services.nix | 127 +- host/system/sound.nix | 19 +- host/themes/paradise.nix | 40 +- host/themes/stylix.nix | 38 +- 100 files changed, 5711 insertions(+), 3918 deletions(-) delete mode 100644 home/programs/cli/joshuto/binds.nix delete mode 100644 home/programs/cli/joshuto/default.nix delete mode 100644 home/programs/cli/joshuto/mime.nix delete mode 100644 home/programs/cli/joshuto/previewer.nix delete mode 100644 home/programs/cli/joshuto/theme.nix diff --git a/flake.nix b/flake.nix index 644a8fb..487fb0d 100644 --- a/flake.nix +++ b/flake.nix @@ -1,88 +1,87 @@ { - outputs = { nixpkgs, home-manager, ... }@inputs: - let - nxsys = nixpkgs.lib.nixosSystem; - hmsys = home-manager.lib.homeManagerConfiguration; - in - { - nixosConfigurations = { - wysvort = nxsys { - specialArgs = { inherit inputs; }; - modules = [ ./host ]; - }; - }; - - homeConfigurations = { - megamozg = hmsys { - pkgs = nixpkgs.legacyPackages."x86_64-linux"; - extraSpecialArgs = { inherit inputs; }; - modules = [ ./home ]; - }; - }; - }; - - inputs = { - # REPOSITORIES NIXPKGS - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05"; - nur.url = "github:nix-community/NUR"; - - # ONE LINE SOFTWARE - ayugram-desktop.url = "github:kaeeraa/ayugram-desktop/release?submodules=1"; - hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; - nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - flake-parts.url = "github:hercules-ci/flake-parts"; - stylix.url = "github:danth/stylix"; - yazi.url = "github:sxyazi/yazi"; - - # TWO LINE SOFTWARE - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - anyrun = { - url = "github:anyrun-org/anyrun"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nixvim = { - url = "github:nix-community/nixvim"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - spicetify-nix = { - url = "github:Gerg-L/spicetify-nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - firefox-addons = { - url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + outputs = { nixpkgs, home-manager, ... }@inputs: + let + nxsys = nixpkgs.lib.nixosSystem; + hmsys = home-manager.lib.homeManagerConfiguration; + in { + nixosConfigurations = { + wysvort = nxsys { + specialArgs = { inherit inputs; }; + modules = [ ./host ]; + }; + }; + + homeConfigurations = { + megamozg = hmsys { + pkgs = nixpkgs.legacyPackages."x86_64-linux"; + extraSpecialArgs = { inherit inputs; }; + modules = [ ./home ]; + }; + }; + }; + + inputs = { + # REPOSITORIES NIXPKGS + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05"; + nur.url = "github:nix-community/NUR"; + + # ONE LINE SOFTWARE + ayugram-desktop.url = "github:kaeeraa/ayugram-desktop/release?submodules=1"; + hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + flake-parts.url = "github:hercules-ci/flake-parts"; + stylix.url = "github:danth/stylix"; + yazi.url = "github:sxyazi/yazi"; + + # TWO LINE SOFTWARE + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + anyrun = { + url = "github:anyrun-org/anyrun"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nixvim = { + url = "github:nix-community/nixvim"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + spicetify-nix = { + url = "github:Gerg-L/spicetify-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + firefox-addons = { + url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; + inputs.nixpkgs.follows = "nixpkgs"; + }; auto-cpufreq = { url = "github:AdnanHodzic/auto-cpufreq"; inputs.nixpkgs.follows = "nixpkgs"; }; - # HYPRlAND - hyprland-plugins = { - url = "github:hyprwm/hyprland-plugins"; - inputs.hyprland.follows = "hyprland"; - }; - Hyprspace = { - url = "github:KZDKM/Hyprspace"; - inputs.hyprland.follows = "hyprland"; - }; - hyprgrass = { - url = "github:horriblename/hyprgrass"; - inputs.hyprland.follows = "hyprland"; - }; - hyprfocus = { - url = "github:pyt0xic/hyprfocus"; - inputs.hyprland.follows = "hyprland"; - }; - nix-wallpapers = { - type = "github"; - owner = "axax-loll"; - repo = "nix-wallpapers"; - flake = false; - }; - }; + # HYPRlAND + hyprland-plugins = { + url = "github:hyprwm/hyprland-plugins"; + inputs.hyprland.follows = "hyprland"; + }; + Hyprspace = { + url = "github:KZDKM/Hyprspace"; + inputs.hyprland.follows = "hyprland"; + }; + hyprgrass = { + url = "github:horriblename/hyprgrass"; + inputs.hyprland.follows = "hyprland"; + }; + hyprfocus = { + url = "github:pyt0xic/hyprfocus"; + inputs.hyprland.follows = "hyprland"; + }; + nix-wallpapers = { + type = "github"; + owner = "axax-loll"; + repo = "nix-wallpapers"; + flake = false; + }; + }; } diff --git a/home/default.nix b/home/default.nix index 3cc45b9..ed6d8ff 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,16 +1,12 @@ { - imports = [ - ./window-managers - ./programs - ./themes - ]; + imports = [ ./window-managers ./programs ./themes ]; - home = { - username = "megamozg"; - homeDirectory = "/home/megamozg"; - stateVersion = "24.05"; - }; - manual = { + home = { + username = "megamozg"; + homeDirectory = "/home/megamozg"; + stateVersion = "24.05"; + }; + manual = { html.enable = false; json.enable = false; manpages.enable = false; diff --git a/home/programs/cli/btop/default.nix b/home/programs/cli/btop/default.nix index 718cff3..eab50e7 100644 --- a/home/programs/cli/btop/default.nix +++ b/home/programs/cli/btop/default.nix @@ -1,12 +1,11 @@ -{ ... }: -{ - programs.btop = { - enable = true; - settings = { - color_theme = "TTY"; - theme_background = true; - vim_keys = true; - rounded_corners = true; - }; - }; +{ ... }: { + programs.btop = { + enable = true; + settings = { + color_theme = "TTY"; + theme_background = true; + vim_keys = true; + rounded_corners = true; + }; + }; } diff --git a/home/programs/cli/cava/default.nix b/home/programs/cli/cava/default.nix index ac004ca..abbefbe 100644 --- a/home/programs/cli/cava/default.nix +++ b/home/programs/cli/cava/default.nix @@ -1,23 +1,22 @@ -{ config, ... }: -{ - programs.cava = { - enable = true; - settings = { - general = { - # framerate = 24; - # bars = 0; - # bar_width = 1; - # bar_spacing = 1; - }; - color = with config.lib.stylix.colors; { - gradient = 1; - gradient_color_1 = "'#${base0E}'"; - gradient_color_2 = "'#${base0D}'"; - gradient_color_3 = "'#${base0C}'"; - gradient_color_4 = "'#${base0B}'"; - gradient_color_5 = "'#${base0A}'"; - gradient_color_6 = "'#${base09}'"; - }; - }; - }; +{ config, ... }: { + programs.cava = { + enable = true; + settings = { + general = { + # framerate = 24; + # bars = 0; + # bar_width = 1; + # bar_spacing = 1; + }; + color = with config.lib.stylix.colors; { + gradient = 1; + gradient_color_1 = "'#${base0E}'"; + gradient_color_2 = "'#${base0D}'"; + gradient_color_3 = "'#${base0C}'"; + gradient_color_4 = "'#${base0B}'"; + gradient_color_5 = "'#${base0A}'"; + gradient_color_6 = "'#${base09}'"; + }; + }; + }; } diff --git a/home/programs/cli/default.nix b/home/programs/cli/default.nix index 5804bc7..ce44f1c 100644 --- a/home/programs/cli/default.nix +++ b/home/programs/cli/default.nix @@ -1,17 +1,17 @@ { - imports = [ - ./pkgs.nix - - ./eza - ./fzf - ./fastfetch - ./zoxide - ./cava - ./btop - ./micro - ./git - ./helix - ./yazi - ./joshuto - ]; + imports = [ + ./pkgs.nix + + ./eza + ./fzf + ./fastfetch + ./zoxide + ./cava + ./btop + ./micro + ./git + ./helix + ./yazi + ./joshuto + ]; } diff --git a/home/programs/cli/eza/default.nix b/home/programs/cli/eza/default.nix index 2e270cd..05421a7 100644 --- a/home/programs/cli/eza/default.nix +++ b/home/programs/cli/eza/default.nix @@ -1,10 +1,7 @@ -{ ... }: -{ - programs.eza = { - enable = true; - icons = true; - extraOptions = [ - "--group-directories-first" - ]; - }; +{ ... }: { + programs.eza = { + enable = true; + icons = true; + extraOptions = [ "--group-directories-first" ]; + }; } diff --git a/home/programs/cli/fastfetch/default.nix b/home/programs/cli/fastfetch/default.nix index 5e3a005..9e9b153 100644 --- a/home/programs/cli/fastfetch/default.nix +++ b/home/programs/cli/fastfetch/default.nix @@ -1,69 +1,67 @@ -{ - programs.fastfetch = { - enable = true; - settings = { - logo = { - type = "builtin"; - source = "nixos_small"; - padding = { - left = 1; - right = 2; - top = 1; - }; - color = { - "1" = "cyan"; - "2" = "blue"; - }; - }; - display = { - separator = ": "; - color = { - keys = "cyan"; - title = "blue"; - }; - size = { - ndigits = 2; - maxPrefix = "GB"; - }; - }; - modules = [ - { - type = "title"; - color = { - user = "cyan"; - at = "cyan"; - host = "cyan"; - }; - } - { - type = "uptime"; - key = "UPT "; - format = "{2} hours, {3} mins"; - } - { - type = "packages"; - key = "PKG "; - } - { - type = "shell"; - key = "SHL "; - format = "{6} {4}"; - } - { - type = "wm"; - key = "DWM "; - format = "{2} / {3}"; - } - { - type = "memory"; - key = "MEM "; - format = "{} / {}"; - } - { type = "break"; } - { - type = "colors"; - } - ]; - }; - }; +{ ... }: { + programs.fastfetch = { + enable = true; + settings = { + logo = { + type = "builtin"; + source = "nixos_small"; + padding = { + left = 1; + right = 2; + top = 1; + }; + color = { + "1" = "cyan"; + "2" = "blue"; + }; + }; + display = { + separator = ": "; + color = { + keys = "cyan"; + title = "blue"; + }; + size = { + ndigits = 2; + maxPrefix = "GB"; + }; + }; + modules = [ + { + type = "title"; + color = { + user = "cyan"; + at = "cyan"; + host = "cyan"; + }; + } + { + type = "uptime"; + key = "UPT "; + format = "{2} hours, {3} mins"; + } + { + type = "packages"; + key = "PKG "; + } + { + type = "shell"; + key = "SHL "; + format = "{6} {4}"; + } + { + type = "wm"; + key = "DWM "; + format = "{2} / {3}"; + } + { + type = "memory"; + key = "MEM "; + format = "{} / {}"; + } + { type = "break"; } + { type = "colors"; } + ]; + }; + }; } diff --git a/home/programs/cli/fzf/default.nix b/home/programs/cli/fzf/default.nix index 5942580..92f4abb 100644 --- a/home/programs/cli/fzf/default.nix +++ b/home/programs/cli/fzf/default.nix @@ -1,9 +1,8 @@ -{ ... }: -{ - programs.fzf = { - enable = true; - # defaultOptions = [ - # "--margin 1" - # ]; - }; +{ ... }: { + programs.fzf = { + enable = true; + # defaultOptions = [ + # "--margin 1" + # ]; + }; } diff --git a/home/programs/cli/git/default.nix b/home/programs/cli/git/default.nix index c371e6d..c800a7e 100644 --- a/home/programs/cli/git/default.nix +++ b/home/programs/cli/git/default.nix @@ -1,13 +1,12 @@ -{ ... }: -{ - programs.git = { - enable = true; - userName = "azikx"; - userEmail = "irongidra@gmail.com"; - extraConfig = { - color.ui = true; - init.defaultBranch = "main"; - safe.directory = "/home/megamozg/.flake"; - }; - }; +{ ... }: { + programs.git = { + enable = true; + userName = "azikx"; + userEmail = "irongidra@gmail.com"; + extraConfig = { + color.ui = true; + init.defaultBranch = "main"; + safe.directory = "/home/megamozg/.flake"; + }; + }; } diff --git a/home/programs/cli/helix/default.nix b/home/programs/cli/helix/default.nix index dff6e52..8019260 100644 --- a/home/programs/cli/helix/default.nix +++ b/home/programs/cli/helix/default.nix @@ -1,49 +1,54 @@ -{ ... }: -{ - imports = [ ./theme.nix ./languages.nix ]; - programs.helix = { - enable = true; - defaultEditor = true; - settings = { - theme = "themo"; - editor = { - line-number = "relative"; - mouse = true; - cursorline = true; - auto-completion = true; - completion-replace = true; - auto-info = true; - auto-pairs = true; - true-color = true; - color-modes = true; - bufferline = "multiple"; - indent-guides = { - render = true; - character = "»"; - }; - cursor-shape = { - insert = "bar"; - normal = "block"; - select = "underline"; - }; - soft-wrap = { - enable = true; - max-wrap = 25; - wrap-indicator = "┆ "; - }; - statusline = { - left = ["mode" "spinner" "file-name" "read-only-indicator"]; - center = []; - right = ["file-type" "separator" "spacer" "position-percentage" "position" "separator" "total-line-numbers"]; - separator = "|"; - mode.normal = "NORMAL"; - mode.insert = "INSERT"; - mode.select = "SELECT"; - }; - file-picker = { - hidden = false; - }; - }; - }; - }; +{ ... }: { + imports = [ ./theme.nix ./languages.nix ]; + programs.helix = { + enable = true; + defaultEditor = true; + settings = { + theme = "themo"; + editor = { + line-number = "relative"; + mouse = true; + cursorline = true; + auto-completion = true; + completion-replace = true; + auto-info = true; + auto-pairs = true; + true-color = true; + color-modes = true; + bufferline = "multiple"; + indent-guides = { + render = true; + character = "»"; + }; + cursor-shape = { + insert = "bar"; + normal = "block"; + select = "underline"; + }; + soft-wrap = { + enable = true; + max-wrap = 25; + wrap-indicator = "┆ "; + }; + statusline = { + left = [ "mode" "spinner" "file-name" "read-only-indicator" ]; + center = [ ]; + right = [ + "file-type" + "separator" + "spacer" + "position-percentage" + "position" + "separator" + "total-line-numbers" + ]; + separator = "|"; + mode.normal = "NORMAL"; + mode.insert = "INSERT"; + mode.select = "SELECT"; + }; + file-picker = { hidden = false; }; + }; + }; + }; } diff --git a/home/programs/cli/helix/languages.nix b/home/programs/cli/helix/languages.nix index 8268179..196ab1a 100644 --- a/home/programs/cli/helix/languages.nix +++ b/home/programs/cli/helix/languages.nix @@ -1,18 +1,16 @@ -{ pkgs, ... }: -{ +{ pkgs, ... }: { programs.helix.languages = { - language = [ - { - name = "nix"; - language-servers = [ "nixd" "nil" ]; - indent = { tab-width = 2; unit = " "; }; - } - ]; - language-server = { - nixd = { - command = "nixd"; + language = [{ + name = "nix"; + language-servers = [ "nixd" "nil" ]; + indent = { + tab-width = 2; + unit = " "; }; - }; + auto-format = true; + formatter.command = "${pkgs.nixfmt}/bin/nixfmt"; + }]; + language-server = { nixd = { command = "nixd"; }; }; }; # LSP PACKGAES @@ -20,6 +18,7 @@ # NIX LSP nil nixd + nixfmt-rfc-style # MARKDOWN LSP marksman diff --git a/home/programs/cli/helix/theme.nix b/home/programs/cli/helix/theme.nix index 79aebd4..a5adcb5 100644 --- a/home/programs/cli/helix/theme.nix +++ b/home/programs/cli/helix/theme.nix @@ -1,96 +1,171 @@ -{ config, lib, ... }: -{ - programs.helix.themes = with config.lib.stylix.colors; lib.mkForce { - themo = let - BASE00 = "#${base00}"; - BASE01 = "#${base01}"; - BASE02 = "#${base02}"; - BASE03 = "#${base03}"; - BASE04 = "#${base04}"; - BASE05 = "#${base05}"; - BASE06 = "#${base06}"; - BASE07 = "#${base07}"; - BASE08 = "#${base08}"; - BASE09 = "#${base09}"; - BASE0A = "#${base0A}"; - BASE0B = "#${base0B}"; - BASE0C = "#${base0C}"; - BASE0D = "#${base0D}"; - BASE0E = "#${base0E}"; - BASE0F = "#${base0F}"; - in { - "attributes" = BASE09; - "comment" = { fg = BASE03; modifiers = [ "italic" ]; }; - "constant" = BASE09; - "constant.character.escape" = BASE0C; - "constant.numeric" = BASE09; - "constructor" = BASE0D; - "debug" = BASE03; - "diagnostic" = { modifiers = [ "underlined" ]; }; - "diff.delta" = BASE09; - "diff.minus" = BASE08; - "diff.plus" = BASE0B; - "error" = BASE08; - "function" = BASE0D; - "hint" = BASE03; - "info" = BASE0D; - "keyword" = BASE0E; - "label" = BASE0E; - "namespace" = BASE0E; - "operator" = BASE05; - "special" = BASE0D; - "string" = BASE0B; - "type" = BASE0A; - "variable" = BASE08; - "variable.other.member" = BASE0B; - "warning" = BASE09; - - "markup.bold" = { fg = BASE0A; modifiers = [ "bold" ]; }; - "markup.heading" = BASE0D; - "markup.italic" = { fg = BASE0E; modifiers = [ "italic" ]; }; - "markup.link.text" = BASE08; - "markup.link.url" = { fg = BASE09; modifiers = [ "underlined" "italic" ]; }; - "markup.list" = BASE08; - "markup.quote" = BASE0C; - "markup.raw" = BASE0B; - "markup.strikethrough" = { modifiers = [ "crossed_out" ]; }; - - "diagnostic.hint" = { underline = { style = "curl"; }; }; - "diagnostic.info" = { underline = { style = "curl"; }; }; - "diagnostic.warning" = { underline = { style = "curl"; }; }; - "diagnostic.error" = { underline = { style = "curl"; }; }; - - "ui.background" = { bg = BASE00; }; - "ui.bufferline.active" = { fg = BASE00; bg = BASE0E; modifiers = [ "bold" ]; }; - "ui.bufferline" = { fg = BASE04; bg = BASE00; }; - "ui.cursor" = { fg = BASE0A; modifiers = [ "reversed" ]; }; - "ui.cursor.insert" = { fg = BASE0A; modifiers = [ "reversed" ]; }; - "ui.cursorline.primary" = { fg = BASE05; bg = BASE01; }; - "ui.cursor.match" = { fg = BASE0A; modifiers = [ "reversed" ]; }; - "ui.cursor.select" = { fg = BASE0A; modifiers = [ "reversed" ]; }; - "ui.gutter" = { bg = BASE00; }; - "ui.help" = { fg = BASE06; bg = BASE01; }; - "ui.linenr" = { fg = BASE03; bg = BASE00; }; - "ui.linenr.selected" = { fg = BASE04; bg = BASE01; modifiers = [ "bold" ]; }; - "ui.menu" = { fg = BASE05; bg = BASE01; }; - "ui.menu.scroll" = { fg = BASE03; bg = BASE01; }; - "ui.menu.selected" = { fg = BASE01; bg = BASE04; }; - "ui.popup" = { bg = BASE01; }; - "ui.selection" = { bg = BASE02; }; - "ui.selection.primary" = { bg = BASE02; }; - "ui.statusline" = { fg = BASE04; bg = BASE01; }; - "ui.statusline.inactive" = { bg = BASE01; fg = BASE03; modifiers = [ "bold" ]; }; - "ui.statusline.insert" = { fg = BASE00; bg = BASE0B; modifiers = [ "bold" ]; }; - "ui.statusline.normal" = { fg = BASE00; bg = BASE0D; modifiers = [ "bold" ]; }; - "ui.statusline.select" = { fg = BASE00; bg = BASE0F; modifiers = [ "bold" ]; }; - "ui.text" = BASE05; - "ui.text.focus" = BASE05; - "ui.virtual.indent-guide" = { fg = BASE03; }; - "ui.virtual.wrap" = { fg = BASE03; }; - "ui.virtual.inlay-hint" = { fg = BASE03; }; - "ui.virtual.ruler" = { bg = BASE01; }; - "ui.virtual.jump-label" = { fg = BASE0A; modifiers = [ "bold" ]; }; - "ui.window" = { bg = BASE01; }; - }; - }; +{ config, lib, ... }: { + programs.helix.themes = with config.lib.stylix.colors; + lib.mkForce { + themo = let + BASE00 = "#${base00}"; + BASE01 = "#${base01}"; + BASE02 = "#${base02}"; + BASE03 = "#${base03}"; + BASE04 = "#${base04}"; + BASE05 = "#${base05}"; + BASE06 = "#${base06}"; + BASE07 = "#${base07}"; + BASE08 = "#${base08}"; + BASE09 = "#${base09}"; + BASE0A = "#${base0A}"; + BASE0B = "#${base0B}"; + BASE0C = "#${base0C}"; + BASE0D = "#${base0D}"; + BASE0E = "#${base0E}"; + BASE0F = "#${base0F}"; + in { + "attributes" = BASE09; + "comment" = { + fg = BASE03; + modifiers = [ "italic" ]; + }; + "constant" = BASE09; + "constant.character.escape" = BASE0C; + "constant.numeric" = BASE09; + "constructor" = BASE0D; + "debug" = BASE03; + "diagnostic" = { modifiers = [ "underlined" ]; }; + "diff.delta" = BASE09; + "diff.minus" = BASE08; + "diff.plus" = BASE0B; + "error" = BASE08; + "function" = BASE0D; + "hint" = BASE03; + "info" = BASE0D; + "keyword" = BASE0E; + "label" = BASE0E; + "namespace" = BASE0E; + "operator" = BASE05; + "special" = BASE0D; + "string" = BASE0B; + "type" = BASE0A; + "variable" = BASE08; + "variable.other.member" = BASE0B; + "warning" = BASE09; + + "markup.bold" = { + fg = BASE0A; + modifiers = [ "bold" ]; + }; + "markup.heading" = BASE0D; + "markup.italic" = { + fg = BASE0E; + modifiers = [ "italic" ]; + }; + "markup.link.text" = BASE08; + "markup.link.url" = { + fg = BASE09; + modifiers = [ "underlined" "italic" ]; + }; + "markup.list" = BASE08; + "markup.quote" = BASE0C; + "markup.raw" = BASE0B; + "markup.strikethrough" = { modifiers = [ "crossed_out" ]; }; + + "diagnostic.hint" = { underline = { style = "curl"; }; }; + "diagnostic.info" = { underline = { style = "curl"; }; }; + "diagnostic.warning" = { underline = { style = "curl"; }; }; + "diagnostic.error" = { underline = { style = "curl"; }; }; + + "ui.background" = { bg = BASE00; }; + "ui.bufferline.active" = { + fg = BASE00; + bg = BASE0E; + modifiers = [ "bold" ]; + }; + "ui.bufferline" = { + fg = BASE04; + bg = BASE00; + }; + "ui.cursor" = { + fg = BASE0A; + modifiers = [ "reversed" ]; + }; + "ui.cursor.insert" = { + fg = BASE0A; + modifiers = [ "reversed" ]; + }; + "ui.cursorline.primary" = { + fg = BASE05; + bg = BASE01; + }; + "ui.cursor.match" = { + fg = BASE0A; + modifiers = [ "reversed" ]; + }; + "ui.cursor.select" = { + fg = BASE0A; + modifiers = [ "reversed" ]; + }; + "ui.gutter" = { bg = BASE00; }; + "ui.help" = { + fg = BASE06; + bg = BASE01; + }; + "ui.linenr" = { + fg = BASE03; + bg = BASE00; + }; + "ui.linenr.selected" = { + fg = BASE04; + bg = BASE01; + modifiers = [ "bold" ]; + }; + "ui.menu" = { + fg = BASE05; + bg = BASE01; + }; + "ui.menu.scroll" = { + fg = BASE03; + bg = BASE01; + }; + "ui.menu.selected" = { + fg = BASE01; + bg = BASE04; + }; + "ui.popup" = { bg = BASE01; }; + "ui.selection" = { bg = BASE02; }; + "ui.selection.primary" = { bg = BASE02; }; + "ui.statusline" = { + fg = BASE04; + bg = BASE01; + }; + "ui.statusline.inactive" = { + bg = BASE01; + fg = BASE03; + modifiers = [ "bold" ]; + }; + "ui.statusline.insert" = { + fg = BASE00; + bg = BASE0B; + modifiers = [ "bold" ]; + }; + "ui.statusline.normal" = { + fg = BASE00; + bg = BASE0D; + modifiers = [ "bold" ]; + }; + "ui.statusline.select" = { + fg = BASE00; + bg = BASE0F; + modifiers = [ "bold" ]; + }; + "ui.text" = BASE05; + "ui.text.focus" = BASE05; + "ui.virtual.indent-guide" = { fg = BASE03; }; + "ui.virtual.wrap" = { fg = BASE03; }; + "ui.virtual.inlay-hint" = { fg = BASE03; }; + "ui.virtual.ruler" = { bg = BASE01; }; + "ui.virtual.jump-label" = { + fg = BASE0A; + modifiers = [ "bold" ]; + }; + "ui.window" = { bg = BASE01; }; + }; + }; } diff --git a/home/programs/cli/joshuto/binds.nix b/home/programs/cli/joshuto/binds.nix deleted file mode 100644 index 9517510..0000000 --- a/home/programs/cli/joshuto/binds.nix +++ /dev/null @@ -1,150 +0,0 @@ -{ ... }: -{ - programs.joshuto.keymap = { - default_view = { - keymap = [ - { keys = ["escape"]; commands = ["escape"] }; - { keys = ["t"; "a"]; commands = ["new_tab"] }; - { keys = ["t"; "c"]; commands = ["new_tab --cursor"] }; - { keys = ["t"; "A"]; commands = ["new_tab --current"] }; - { keys = ["t"; "q"]; commands = ["close_tab"] }; - { keys = ["q"]; commands = ["close_tab"] }; - { keys = ["ctrl+c"]; commands = ["quit"] }; - { keys = ["Q"]; commands = ["quit --output-current-directory"] }; - - { keys = ["R"]; commands = ["reload_dirlist"] }; - { keys = ["z"; "r"]; commands = ["reload_dirlist"] }; - { keys = ["z"; "z"]; commands = ["zi"] }; - { keys = ["z"; "h"]; commands = ["toggle_hidden"] }; - { keys = ["z"; "f"]; commands = ["flat 2"] }; - { keys = ["z"; "F"]; commands = ["flat 0"] }; - { keys = ["backspace"]; commands = ["toggle_hidden"] }; - { keys = ["t"; "s"]; commands = ["tab_switch 1"] }; - { keys = ["t"; "S"]; commands = ["tab_switch -1"] }; - { keys = ["\t"]; commands = ["tab_switch 1"] }; - { keys = ["backtab"]; commands = ["tab_switch -1"] }; - - { keys = ["alt+1"]; commands = ["tab_switch_index 1"] }; - { keys = ["alt+2"]; commands = ["tab_switch_index 2"] }; - { keys = ["alt+3"]; commands = ["tab_switch_index 3"] }; - { keys = ["alt+4"]; commands = ["tab_switch_index 4"] }; - { keys = ["alt+5"]; commands = ["tab_switch_index 5"] }; - - { keys = ["1"]; commands = ["numbered_command 1"] }; - { keys = ["2"]; commands = ["numbered_command 2"] }; - { keys = ["3"]; commands = ["numbered_command 3"] }; - { keys = ["4"]; commands = ["numbered_command 4"] }; - { keys = ["5"]; commands = ["numbered_command 5"] }; - { keys = ["6"]; commands = ["numbered_command 6"] }; - { keys = ["7"]; commands = ["numbered_command 7"] }; - { keys = ["8"]; commands = ["numbered_command 8"] }; - { keys = ["9"]; commands = ["numbered_command 9"] }; - - # arrow keys - { keys = ["arrow_up"]; commands = ["cursor_move_up"] }; - { keys = ["arrow_down"]; commands = ["cursor_move_down"] }; - { keys = ["arrow_left"]; commands = ["cd .."] }; - { keys = ["arrow_right"]; commands = ["open"] }; - { keys = ["\n"]; commands = ["open"] }; - { keys = ["home"]; commands = ["cursor_move_home"] }; - { keys = ["end"]; commands = ["cursor_move_end"] }; - { keys = ["page_up"]; commands = ["cursor_move_page_up"] }; - { keys = ["page_down"]; commands = ["cursor_move_page_down"] }; - { keys = ["ctrl+u"]; commands = ["cursor_move_page_up 0.5"] }; - { keys = ["ctrl+d"]; commands = ["cursor_move_page_down 0.5"] }; - { keys = ["ctrl+b"]; commands = ["cursor_move_page_up"] }; - { keys = ["ctrl+f"]; commands = ["cursor_move_page_down"] }; - - # vim-like keybindings - { keys = ["j"]; commands = ["cursor_move_down"] }; - { keys = ["k"]; commands = ["cursor_move_up"] }; - { keys = ["h"]; commands = ["z"] }; - { keys = ["l"]; commands = ["open"] }; - { keys = ["g"; "g"]; commands = ["cursor_move_home"] }; - { keys = ["G"]; commands = ["cursor_move_end"] }; - { keys = ["e"]; commands = ["open_with"] }; - - { keys = ["H"]; commands = ["cursor_move_page_home"] }; - { keys = ["L"]; commands = ["cursor_move_page_middle"] }; - { keys = ["M"]; commands = ["cursor_move_page_end"] }; - - { keys = ["["]; commands = ["parent_cursor_move_up"] }; - { keys = ["]"]; commands = ["parent_cursor_move_down"] }; - - { keys = ["c"; "d"]; commands = [":cd "] }; - { keys = ["x"; "x"]; commands = ["cut_files"] }; - { keys = ["c"; "c"]; commands = ["copy_files"] }; - { keys = ["c"; "n"]; commands = ["copy_filename"] }; - { keys = ["c"; "e"]; commands = ["copy_filename_without_extension"] }; - { keys = ["c"; "f"]; commands = ["copy_filepath"] }; - { keys = ["c"; "F"]; commands = ["copy_filepath --all-selected=true"] }; - { keys = ["c"; "p"]; commands = ["copy_dirpath"] }; - - { keys = ["p"; "l"]; commands = ["symlink_files --relative=false"] }; - { keys = ["p"; "L"]; commands = ["symlink_files --relative=true"] }; - - { keys = ["delete"]; commands = ["delete_files"] }; - { keys = ["d"; "d"]; commands = ["delete_files --noconfirm"] }; - { keys = ["d"; "D"]; commands = ["delete_files --noconfirm --permanently"] }; - - { keys = ["v"; "v"]; commands = ["paste_files"] }; - { keys = ["v"; "V"]; commands = ["paste_files --overwrite=true"] }; - - { keys = ["r"; "r"]; commands = ["rename_append"] }; - { keys = ["r"; "R"]; commands = ["rename_prepend"] }; - { keys = ["r"; "c"]; commands = [":rename "] }; - - { keys = ["m"; "f"]; commands = [":touch "] }; - { keys = ["m"; "d"]; commands = [":mkdir "] }; - - { keys = [" "]; commands = ["select --toggle=true"] }; - { keys = ["v"; "a"]; commands = ["select --all=true --toggle=true"] }; - { keys = ["v"; "i"]; commands = ["toggle_visual"] }; - - { keys = ["w"]; commands = ["show_tasks --exit-key=w"] }; - { keys = ["r"; "b"]; commands = ["bulk_rename"] }; - { keys = ["="]; commands = ["set_mode"] }; - - { keys = [":"]; commands = [":"] }; - { keys = [";"]; commands = [":"] }; - - { keys = ["'"]; commands = [":shell "] }; - - { keys = ["/"]; commands = [":search "] }; - { keys = ["|"]; commands = [":search_inc "] }; - { keys = ["\\"]; commands = [":search_glob "] }; - { keys = ["f"; "s"]; commands = ["search_fzf"] }; - { keys = ["f"; "d"]; commands = ["subdir_fzf"] }; - - { keys = ["n"]; commands = ["search_next"] }; - { keys = ["N"]; commands = ["search_prev"] }; - - { keys = ["s"; "r"]; commands = ["sort reverse"] }; - { keys = ["s"; "l"]; commands = ["sort lexical"] }; - { keys = ["s"; "L"]; commands = ["sort lexical --reverse=true"] }; - { keys = ["s"; "m"]; commands = ["sort mtime"] }; - { keys = ["s"; "M"]; commands = ["sort mtime --reverse=true"] }; - { keys = ["s"; "n"]; commands = ["sort natural"] }; - { keys = ["s"; "N"]; commands = ["sort natural --reverse=true"] }; - { keys = ["s"; "s"]; commands = ["sort size"] }; - { keys = ["s"; "S"]; commands = ["sort size --reverse=true"] }; - { keys = ["s"; "e"]; commands = ["sort ext"] }; - { keys = ["s"; "E"]; commands = ["sort ext --reverse=true"] }; - - { keys = ["m"; "s"]; commands = ["linemode size"] }; - { keys = ["m"; "m"]; commands = ["linemode mtime"] }; - { keys = ["m"; "M"]; commands = ["linemode size | mtime"] }; - { keys = ["m"; "u"]; commands = ["linemode user"] }; - { keys = ["m"; "U"]; commands = ["linemode user | group"] }; - { keys = ["m"; "p"]; commands = ["linemode perm"] }; - - { keys = ["g"; "r"]; commands = ["cd /"] }; - { keys = ["g"; "c"]; commands = ["cd ~/.config"] }; - { keys = ["g"; "w"]; commands = ["cd ~/.walls"] }; - { keys = ["g"; "d"]; commands = ["cd ~/Загрузки"] }; - { keys = ["g"; "h"]; commands = ["cd ~/"] }; - { keys = ["?"]; commands = ["help"] }; - ]; - }; - }; -} diff --git a/home/programs/cli/joshuto/default.nix b/home/programs/cli/joshuto/default.nix deleted file mode 100644 index 9bdf5e0..0000000 --- a/home/programs/cli/joshuto/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ pkgs, ... }: -{ - imports = [ - ./theme.nix - ./mime.nix - ./previewer.nix - ]; - programs.joshuto = { - enable = true; - settings = { - numbered_command = false; - mouse_support = true; - focus_on_create = true; - use_trash = true; - watch_files = true; - xdg_open = true; - xdg_open_fork = true; - # case_insensitive_ext = false; - zoxide_update = true; - display = { - mode = "default"; - automatically_count_files = false; - collapse_preview = true; - column_ratio = [1 4 4]; - scroll_offset = 6; - show_borders = false; - show_hidden = false; - show_icons = true; - # line_number_style = "relative"; - tilde_in_titlebar = false; - linemode = "size"; - sort = { - sort_method = "natural"; - case_sensitive = false; - directories_first = true; - reverse = false; - }; - }; - preview = { - max_preview_size = 100000000; - use_xdg_thumbs = true; - xdg_thumb_size = "xlarge"; - preview_script = "~/.config/joshuto/preview_file.sh"; - }; - tab.home_page = "inherit"; - }; - }; -} diff --git a/home/programs/cli/joshuto/mime.nix b/home/programs/cli/joshuto/mime.nix deleted file mode 100644 index ca814c1..0000000 --- a/home/programs/cli/joshuto/mime.nix +++ /dev/null @@ -1,172 +0,0 @@ -{ ... }: -{ - programs.joshuto.mimetype = { - class = { - audio_default = [ - { command = "mpv"; args = [ "--" ]; } - ]; - image_default = [ - { command = "swayimg"; args = [ "-f --" ]; } - ]; - text_default = [ - { command = "hx"; } - { command = "bat"; args = [ "--paging=always" ]; } - ]; - libreoffice_default = [ - { command = "libreoffice"; fork = true; silent = true; } - ]; - }; - - text = { "inherit" = "text_default"; }; - - extensions = { - # OFFICE - odt."inherit" = "libreoffice_default"; - odf."inherit" = "libreoffice_default"; - ods."inherit" = "libreoffice_default"; - odp."inherit" = "libreoffice_default"; - doc."inherit" = "libreoffice_default"; - docx."inherit" = "libreoffice_default"; - xls."inherit" = "libreoffice_default"; - xlsx."inherit" = "libreoffice_default"; - ppt."inherit" = "libreoffice_default"; - pptx."inherit" = "libreoffice_default"; - pdf."inherit" = "libreoffice_default"; - - "vnd.efi.iso.inherit" = [ # ISO - { command = "popsicle-gtk"; fork = true; silent = true; } - ]; - x-bittorrent."inherit" = [ # TORRENT - { command = "transmission-gtk"; fork = true; silent = true; } - ]; - - # ARCHIVES - "7z".app_list = [ - { command = "7z"; args = [ "x" ]; } - { command = "file-roller"; fork = true; silent = true; } - ]; - bz2.app_list = [ - { command = "tar"; args = [ "-xvjf" ]; } - { command = "file-roller"; fork = true; silent = true; } - ]; - gz.app_list = [ - { command = "tar"; args = [ "-xvzf" ]; } - { command = "file-roller"; fork = true; silent = true; } - ]; - tar.app_list = [ - { command = "tar"; args = [ "-xvf" ]; } - { command = "file-roller"; fork = true; silent = true; } - ]; - tgz.app_list = [ - { command = "tar"; args = [ "-xvzf" ]; } - { command = "file-roller"; fork = true; silent = true; } - ]; - rar.app_list = [ - { command = "unrar"; args = [ "x" ]; } - { command = "file-roller"; fork = true; silent = true; } - ]; - xz.app_list = [ - { command = "tar"; args = [ "-xvJf" ]; } - { command = "file-roller"; fork = true; silent = true; } - ]; - zip.app_list = [ - { command = "unzip"; } - { command = "file-roller"; fork = true; silent = true; } - ]; - - ## audio formats - aac."inherit" = "audio_default"; - ac3."inherit" = "audio_default"; - aiff."inherit" = "audio_default"; - ape."inherit" = "audio_default"; - dts."inherit" = "audio_default"; - flac."inherit" = "audio_default"; - m4a."inherit" = "audio_default"; - mp3."inherit" = "audio_default"; - oga."inherit" = "audio_default"; - ogg."inherit" = "audio_default"; - opus."inherit" = "audio_default"; - wav."inherit" = "audio_default"; - wv."inherit" = "audio_default"; - - ## video formats - avi."inherit" = "video_default"; - av1."inherit" = "video_default"; - flv."inherit" = "video_default"; - mkv."inherit" = "video_default"; - m4v."inherit" = "video_default"; - mov."inherit" = "video_default"; - mp4."inherit" = "video_default"; - ts."inherit" = "video_default"; - webm."inherit" = "video_default"; - wmv."inherit" = "video_default"; - - ## text formats - bib."inherit" = "text_default"; - build."inherit" = "text_default"; - c."inherit" = "text_default"; - cfg."inherit" = "text_default"; - cmake."inherit" = "text_default"; - conf."inherit" = "text_default"; - cpp."inherit" = "text_default"; - css."inherit" = "text_default"; - csv."inherit" = "text_default"; - cu."inherit" = "text_default"; - desktop."inherit" = "text_default"; - ebuild."inherit" = "text_default"; - eex."inherit" = "text_default"; - env."inherit" = "text_default"; - ex."inherit" = "text_default"; - exs."inherit" = "text_default"; - go."inherit" = "text_default"; - gpl."inherit" = "text_default"; - h."inherit" = "text_default"; - hpp."inherit" = "text_default"; - hs."inherit" = "text_default"; - ini."inherit" = "text_default"; - ipynb."inherit" = "text_default"; - java."inherit" = "text_default"; - jl."inherit" = "text_default"; - js."inherit" = "text_default"; - json."inherit" = "text_default"; - jsonc."inherit" = "text_default"; - kdl."inherit" = "text_default"; - kt."inherit" = "text_default"; - kvconfig."inherit" = "text_default"; - lock."inherit" = "text_default"; - log."inherit" = "text_default"; - lua."inherit" = "text_default"; - md."inherit" = "text_default"; - micro."inherit" = "text_default"; - ninja."inherit" = "text_default"; - nix."inherit" = "text_default"; - norg."inherit" = "text_default"; - org."inherit" = "text_default"; - po."inherit" = "text_default"; - pot."inherit" = "text_default"; - py."inherit" = "text_default"; - qmd."inherit" = "text_default"; - rasi."inherit" = "text_default"; - rkt."inherit" = "text_default"; - rktd."inherit" = "text_default"; - rproj."inherit" = "text_default"; - rs."inherit" = "text_default"; - rstheme."inherit" = "text_default"; - scm."inherit" = "text_default"; - scss."inherit" = "text_default"; - service."inherit" = "text_default"; - sh."inherit" = "text_default"; - socket."inherit" = "text_default"; - sql."inherit" = "text_default"; - srt."inherit" = "text_default"; - svelte."inherit" = "text_default"; - toml."inherit" = "text_default"; - tsx."inherit" = "text_default"; - txt."inherit" = "text_default"; - vim."inherit" = "text_default"; - xml."inherit" = "text_default"; - yaml."inherit" = "text_default"; - yml."inherit" = "text_default"; - }; - }; -} diff --git a/home/programs/cli/joshuto/previewer.nix b/home/programs/cli/joshuto/previewer.nix deleted file mode 100644 index 6ab715d..0000000 --- a/home/programs/cli/joshuto/previewer.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs, ... }: -{ - xdg.configFile = { - "joshuto/previewer.sh" = { - executable = true; - source = let - previewFile = pkgs.fetchFromGitHub { - "owner" = "kamiyaa"; - "repo" = "joshuto"; - "rev" = "9728c35ef7058bc4919765f720d4f5b9bdb17da1"; - "hash" = "sha256-k5/p9C+zvYCa7dSl6wAKojUsUnAHo7ovVlqTyAwaTn0="; - }; - in "${previewFile}/config/preview_file.sh"; - }; - }; -} diff --git a/home/programs/cli/joshuto/theme.nix b/home/programs/cli/joshuto/theme.nix deleted file mode 100644 index 8facd81..0000000 --- a/home/programs/cli/joshuto/theme.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ ... }: -{ - programs.joshuto.theme = { - tabs.styles = { - active = { - bg = "none"; - fg = "blue"; - bold = true; - }; - inactive = { - bg = "none"; - fg = "gray"; - bold = true; - }; - scroll_front = { - fg = "yellow"; - bold = true; - }; - scroll_back = { - fg = "yellow"; - bold = true; - }; - }; - selection = { - fg = "yellow"; - bold = true; - prefix = " "; - }; - visual_mode_selection = { - fg = "light_red"; - bold = true; - prefix = "v "; - }; - regular = { - fg = "white"; - }; - directory = { - fg = "light_blue"; - bold = true; - }; - link = { - fg = "cyan"; - bold = true; - }; - socket = { - fg = "light_magenta"; - bold = true; - }; - executable = { - fg = "light_green"; - bold = true; - }; - link_invalid = { - fg = "red"; - bold = true; - }; - tabs.chars = { - active_prefix = "["; - active_postfix = "]"; - inactive_prefix = " "; - inactive_postfix = ""; - divider = " | "; - scroll_front_prefix = ""; - scroll_front_postfix = ""; - scroll_front_prestring = "« "; - scroll_front_poststring = " "; - scroll_back_prefix = ""; - scroll_back_postfix = ""; - scroll_back_prestring = " "; - scroll_back_poststring = " »"; - padding_prefix = " "; - padding_postfix = " "; - padding_fill = " "; - }; - }; -} diff --git a/home/programs/cli/micro/default.nix b/home/programs/cli/micro/default.nix index 823f9bc..3a3a683 100644 --- a/home/programs/cli/micro/default.nix +++ b/home/programs/cli/micro/default.nix @@ -1,66 +1,65 @@ -{ pkgs, ...}: -{ - programs.micro = { - enable = true; - settings = { - clipboard = "terminal"; - colorscheme = "helios"; - autosu = true; - mkparents = true; - scrollbar = true; - softwrap = true; - status = false; - statusline = false; - statusformatl = "q"; - savehistory = true; - saveundo = true; - }; - }; - xdg.configFile."micro/colorschemes/helios.micro".text = '' - color-link comment "bold white" - color-link constant "cyan" - color-link constant.bool "bold cyan" - color-link constant.bool.true "bold green" - color-link constant.bool.false "bold red" - color-link constant.string "yellow" - color-link constant.string.url "underline blue, white" - #color-link constant.number "constant" - color-link constant.specialChar "bold magenta" - color-link identifier "bold red" - color-link identifier.macro "bold red" - color-link identifier.var "bold blue" - #color-link identifier.class "bold green" - color-link identifier.class "bold white" - color-link statement "bold yellow" - color-link symbol "red" - color-link symbol.brackets "blue" - color-link symbol.tag "bold blue" - color-link symbol.tag.extended "bold green" - color-link preproc "bold cyan" - color-link type "green" - color-link type.keyword "bold green" - color-link special "magenta" - color-link ignore "default" - color-link error "bold ,brightred" - color-link todo "underline black,brightyellow" - color-link hlsearch "white,darkgreen" - color-link indent-char ",brightgreen" - color-link line-number "white" - color-link line-number.scrollbar "green" - color-link statusline "white,blue" - color-link tabbar "white,blue" - color-link current-line-number "red" - color-link current-line-number.scroller "red" - color-link diff-added "green" - color-link diff-modified "yellow" - color-link diff-deleted "red" - color-link gutter-error ",red" - color-link gutter-warning "red" - color-link color-column "cyan" - color-link underlined.url "underline blue, white" - color-link divider "blue" - color-link match-brace "black,cyan" - color-link tab-error "brightred" - color-link trailingws "brightred" - ''; +{ pkgs, ... }: { + programs.micro = { + enable = true; + settings = { + clipboard = "terminal"; + colorscheme = "base16"; + autosu = true; + mkparents = true; + scrollbar = true; + softwrap = true; + status = false; + statusline = false; + statusformatl = "q"; + savehistory = true; + saveundo = true; + }; + }; + xdg.configFile."micro/colorschemes/base16.micro".text = '' + color-link comment "bold white" + color-link constant "cyan" + color-link constant.bool "bold cyan" + color-link constant.bool.true "bold green" + color-link constant.bool.false "bold red" + color-link constant.string "yellow" + color-link constant.string.url "underline blue, white" + #color-link constant.number "constant" + color-link constant.specialChar "bold magenta" + color-link identifier "bold red" + color-link identifier.macro "bold red" + color-link identifier.var "bold blue" + #color-link identifier.class "bold green" + color-link identifier.class "bold white" + color-link statement "bold yellow" + color-link symbol "red" + color-link symbol.brackets "blue" + color-link symbol.tag "bold blue" + color-link symbol.tag.extended "bold green" + color-link preproc "bold cyan" + color-link type "green" + color-link type.keyword "bold green" + color-link special "magenta" + color-link ignore "default" + color-link error "bold ,brightred" + color-link todo "underline black,brightyellow" + color-link hlsearch "white,darkgreen" + color-link indent-char ",brightgreen" + color-link line-number "white" + color-link line-number.scrollbar "green" + color-link statusline "white,blue" + color-link tabbar "white,blue" + color-link current-line-number "red" + color-link current-line-number.scroller "red" + color-link diff-added "green" + color-link diff-modified "yellow" + color-link diff-deleted "red" + color-link gutter-error ",red" + color-link gutter-warning "red" + color-link color-column "cyan" + color-link underlined.url "underline blue, white" + color-link divider "blue" + color-link match-brace "black,cyan" + color-link tab-error "brightred" + color-link trailingws "brightred" + ''; } diff --git a/home/programs/cli/pkgs.nix b/home/programs/cli/pkgs.nix index 8eec787..d64e6b6 100644 --- a/home/programs/cli/pkgs.nix +++ b/home/programs/cli/pkgs.nix @@ -1,41 +1,40 @@ -{ pkgs, yazi, ... }: -{ - home.packages = with pkgs; [ - fff - - bat - fzf - - cava - lutgen - - micro +{ pkgs, ... }: { + home.packages = with pkgs; [ + fff - inxi - zoxide - starship - fastfetch - cpufetch - pulsemixer + bat + fzf - openvpn - nix-tree - nix-prefetch-github - - nvtopPackages.amd - btop + cava + lutgen - bluetuith - confetty - tenki - light + micro - trashy - fuc - zip - atool + inxi + zoxide + starship + fastfetch + cpufetch + pulsemixer - # ferium - # portablemc - ]; + openvpn + nix-tree + nix-prefetch-github + + nvtopPackages.amd + btop + + bluetuith + confetty + tenki + light + + trashy + fuc + zip + atool + + # ferium + # portablemc + ]; } diff --git a/home/programs/cli/yazi/binds.nix b/home/programs/cli/yazi/binds.nix index c51c5f5..8577142 100644 --- a/home/programs/cli/yazi/binds.nix +++ b/home/programs/cli/yazi/binds.nix @@ -1,53 +1,139 @@ -{ ... }: -{ +{ ... }: { programs.yazi.keymap = { manager = { prepend_keymap = [ # MAIN - { on = "q"; run = "close"; } - { on = "l"; run = "plugin --sync smart-enter"; } - { on = "!"; run = "shell '$SHELL' --block --confirm"; } + { + on = "q"; + run = "close"; + } + { + on = "l"; + run = "plugin --sync smart-enter"; + } + { + on = "!"; + run = "shell '$SHELL' --block --confirm"; + } - { on = ""; run = "close"; } - { on = ""; run = "plugin --sync smart-enter"; } - { on = ""; run = "plugin --sync smart-enter"; } + { + on = ""; + run = "close"; + } + { + on = ""; + run = "plugin --sync smart-enter"; + } + { + on = ""; + run = "plugin --sync smart-enter"; + } # VISUAL - { on = [ "v" "m" ]; run = "plugin --sync max-preview"; } - { on = [ "v" "p" ]; run = "plugin --sync hide-preview"; } - { on = [ "v" "v" ]; run = "visual_mode"; } - { on = [ "v" "V" ]; run = "visual_mode --unset"; } - { on = [ "v" "a" ]; run = "select_all --state=true"; } - { on = [ "v" "r" ]; run = "select_all --state=none"; } - { on = [ "v" "h" ]; run = "hidden toggle"; } + { + on = [ "v" "m" ]; + run = "plugin --sync max-preview"; + } + { + on = [ "v" "p" ]; + run = "plugin --sync hide-preview"; + } + { + on = [ "v" "v" ]; + run = "visual_mode"; + } + { + on = [ "v" "V" ]; + run = "visual_mode --unset"; + } + { + on = [ "v" "a" ]; + run = "select_all --state=true"; + } + { + on = [ "v" "r" ]; + run = "select_all --state=none"; + } + { + on = [ "v" "h" ]; + run = "hidden toggle"; + } # DELETION - { on = [ "d" "d" ]; run = "remove"; } - { on = [ "d" "D" ]; run = "remove --permanently"; } - { on = [ "D" "d" ]; run = "remove --force"; } - { on = [ "D" "D" ]; run = "remove --permanently --force"; } + { + on = [ "d" "d" ]; + run = "remove"; + } + { + on = [ "d" "D" ]; + run = "remove --permanently"; + } + { + on = [ "D" "d" ]; + run = "remove --force"; + } + { + on = [ "D" "D" ]; + run = "remove --permanently --force"; + } # CREATE - { on = [ "a" "f" ]; run = "create"; } - { on = [ "a" "d" ]; run = "create --dir"; } + { + on = [ "a" "f" ]; + run = "create"; + } + { + on = [ "a" "d" ]; + run = "create --dir"; + } # RENAME - { on = [ "r" "r" ]; run = "rename"; } - { on = [ "r" "n" ]; run = "rename --empty=stem"; } - { on = [ "r" "e" ]; run = "rename --empty=ext"; } - { on = [ "r" "a" ]; run = "rename --empty=all"; } + { + on = [ "r" "r" ]; + run = "rename"; + } + { + on = [ "r" "n" ]; + run = "rename --empty=stem"; + } + { + on = [ "r" "e" ]; + run = "rename --empty=ext"; + } + { + on = [ "r" "a" ]; + run = "rename --empty=all"; + } # NAVIGATE - { on = [ "c" "d" ]; run = "cd --interactive"; } - { on = [ "g" "f" ]; run = "cd ~/.flake"; } - { on = [ "g" "w" ]; run = "cd ~/.flake/hosts/wyswort"; } - { on = [ "g" "m" ]; run = "cd ~/.flake/home/megamozg"; } + { + on = [ "c" "d" ]; + run = "cd --interactive"; + } + { + on = [ "g" "f" ]; + run = "cd ~/.flake"; + } + { + on = [ "g" "w" ]; + run = "cd ~/.flake/hosts/wyswort"; + } + { + on = [ "g" "m" ]; + run = "cd ~/.flake/home/megamozg"; + } ]; }; completion = { prepend_keymap = [ - { on = ""; run = "arrow 1"; } - { on = ""; run = "arrow -1"; } + { + on = ""; + run = "arrow 1"; + } + { + on = ""; + run = "arrow -1"; + } # { on = "C-l"; run = "lose --submit" "close_input --submit" ; } ]; }; diff --git a/home/programs/cli/yazi/default.nix b/home/programs/cli/yazi/default.nix index eaee164..dba7249 100644 --- a/home/programs/cli/yazi/default.nix +++ b/home/programs/cli/yazi/default.nix @@ -1,19 +1,11 @@ { pkgs, inputs, ... }: -let - ypkg = inputs.yazi.packages.${pkgs.system}.default; -in -{ - imports = [ - ./binds.nix - ./theme.nix - ./lua.nix - ./plugins.nix - ./starship.nix - ]; +let ypkg = inputs.yazi.packages.${pkgs.system}.default; +in { + imports = [ ./binds.nix ./theme.nix ./lua.nix ./plugins.nix ./starship.nix ]; programs.yazi = { - enable = true; - package = ypkg; - settings = { + enable = true; + package = ypkg; + settings = { manager = { ratio = [ 1 4 4 ]; show_hidden = false; @@ -32,45 +24,78 @@ in max_width = 1000; }; opener = { - edit = [ - { run = "hx $@"; block = true; } - ]; - play = [ - { run = "mpv $@"; orphan = true; } - ]; - open = [ - { run = "xdg-open $@"; } - ]; + edit = [{ + run = "hx $@"; + block = true; + }]; + play = [{ + run = "mpv $@"; + orphan = true; + }]; + open = [{ run = "xdg-open $@"; }]; }; open = { rules = [ - { mime = "text/*"; use = "edit"; } - { mime = "video/*"; use = "play"; } - { mime = "audio/*"; use = "play"; } - { mime = "image/*"; use = "open"; } + { + mime = "text/*"; + use = "edit"; + } + { + mime = "video/*"; + use = "play"; + } + { + mime = "audio/*"; + use = "play"; + } + { + mime = "image/*"; + use = "open"; + } ]; }; plugin = { - prepend_previewers = [ - { mime = "application/*zip"; run = "ouch"; } - { mime = "application/x-tar"; run = "ouch"; } - { mime = "application/x-bzip2"; run = "ouch"; } - { mime = "application/x-7z-compressed"; run = "ouch"; } - { mime = "application/x-rar"; run = "ouch"; } - { mime = "application/x-xz"; run = "ouch"; } + prepend_previewers = [ + { + mime = "application/*zip"; + run = "ouch"; + } + { + mime = "application/x-tar"; + run = "ouch"; + } + { + mime = "application/x-bzip2"; + run = "ouch"; + } + { + mime = "application/x-7z-compressed"; + run = "ouch"; + } + { + mime = "application/x-rar"; + run = "ouch"; + } + { + mime = "application/x-xz"; + run = "ouch"; + } - { name = "*.md"; run = "glow"; } + { + name = "*.md"; + run = "glow"; + } ]; }; }; }; home.packages = with pkgs; [ - ffmpegthumbnailer - p7zip - jq - poppler_min - imagemagick - glow - ouch + ffmpegthumbnailer + p7zip + jq + poppler_min + imagemagick + glow + ouch ]; } diff --git a/home/programs/cli/yazi/lua.nix b/home/programs/cli/yazi/lua.nix index e2a496f..ad217f6 100644 --- a/home/programs/cli/yazi/lua.nix +++ b/home/programs/cli/yazi/lua.nix @@ -1,101 +1,100 @@ -{ ... }: -{ - programs.yazi.initLua = '' - require("no-status"):setup() - -- require("starship"):setup() - require("starship"):setup({ config_file = "/home/megamozg/.config/yazi/star.toml" }) +{ ... }: { + programs.yazi.initLua = '' + require("no-status"):setup() + -- require("starship"):setup() + require("starship"):setup({ config_file = "/home/megamozg/.config/yazi/star.toml" }) - -- require("yatline"):setup({ - -- section_separator = { open = "", close = "" }, - -- part_separator = { open = "", close = "" }, - -- inverse_separator = { open = "", close = "" }, - -- - -- style_a = { - -- fg = "black", - -- bg_mode = { - -- normal = "cyan", - -- select = "yellow", - -- un_set = "blue" - -- } - -- }, - -- style_b = { bg = "black", fg = "white" }, - -- style_c = { bg = "black", fg = "white" }, - -- - -- permissions_t_fg = "green", - -- permissions_r_fg = "yellow", - -- permissions_w_fg = "red", - -- permissions_x_fg = "cyan", - -- permissions_s_fg = "darkgray", - -- - -- tab_width = 20, - -- tab_use_inverse = false, - -- - -- selected = { icon = "󰻭", fg = "yellow" }, - -- copied = { icon = "", fg = "green" }, - -- cut = { icon = "", fg = "red" }, - -- - -- total = { icon = "󰮍", fg = "yellow" }, - -- succ = { icon = "", fg = "green" }, - -- fail = { icon = "", fg = "red" }, - -- found = { icon = "󰮕", fg = "blue" }, - -- processed = { icon = "󰐍", fg = "green" }, - -- - -- show_background = true, - -- - -- display_header_line = true, - -- display_status_line = true, - -- - -- header_line = { - -- left = { - -- section_a = { -- EDGE LEFT - -- -- {type = "line", custom = false, name = "tabs", params = {"left"}}, - -- {type = "string", custom = false, name = "tab_path"}, - -- }, - -- section_b = { -- LEFT CENTER - -- }, - -- section_c = { -- RIGHT LEFT - -- } - -- }, - -- right = { - -- section_a = { -- EDGE RIGHT - -- -- {type = "line", custom = false, name = "tabs", params = {"right"}}, - -- }, - -- section_b = { -- CENTER RIGHT - -- }, - -- section_c = { -- LEFT RIGHT - -- } - -- } - -- }, - -- - -- status_line = { - -- left = { - -- section_a = { - -- }, - -- section_b = { - -- }, - -- section_c = { - -- } - -- }, - -- right = { - -- section_a = { - -- }, - -- section_b = { - -- }, - -- section_c = { - -- } - -- } - -- }, - -- }) + -- require("yatline"):setup({ + -- section_separator = { open = "", close = "" }, + -- part_separator = { open = "", close = "" }, + -- inverse_separator = { open = "", close = "" }, + -- + -- style_a = { + -- fg = "black", + -- bg_mode = { + -- normal = "cyan", + -- select = "yellow", + -- un_set = "blue" + -- } + -- }, + -- style_b = { bg = "black", fg = "white" }, + -- style_c = { bg = "black", fg = "white" }, + -- + -- permissions_t_fg = "green", + -- permissions_r_fg = "yellow", + -- permissions_w_fg = "red", + -- permissions_x_fg = "cyan", + -- permissions_s_fg = "darkgray", + -- + -- tab_width = 20, + -- tab_use_inverse = false, + -- + -- selected = { icon = "󰻭", fg = "yellow" }, + -- copied = { icon = "", fg = "green" }, + -- cut = { icon = "", fg = "red" }, + -- + -- total = { icon = "󰮍", fg = "yellow" }, + -- succ = { icon = "", fg = "green" }, + -- fail = { icon = "", fg = "red" }, + -- found = { icon = "󰮕", fg = "blue" }, + -- processed = { icon = "󰐍", fg = "green" }, + -- + -- show_background = true, + -- + -- display_header_line = true, + -- display_status_line = true, + -- + -- header_line = { + -- left = { + -- section_a = { -- EDGE LEFT + -- -- {type = "line", custom = false, name = "tabs", params = {"left"}}, + -- {type = "string", custom = false, name = "tab_path"}, + -- }, + -- section_b = { -- LEFT CENTER + -- }, + -- section_c = { -- RIGHT LEFT + -- } + -- }, + -- right = { + -- section_a = { -- EDGE RIGHT + -- -- {type = "line", custom = false, name = "tabs", params = {"right"}}, + -- }, + -- section_b = { -- CENTER RIGHT + -- }, + -- section_c = { -- LEFT RIGHT + -- } + -- } + -- }, + -- + -- status_line = { + -- left = { + -- section_a = { + -- }, + -- section_b = { + -- }, + -- section_c = { + -- } + -- }, + -- right = { + -- section_a = { + -- }, + -- section_b = { + -- }, + -- section_c = { + -- } + -- } + -- }, + -- }) - require("full-border"):setup { - type = ui.Border.ROUNDED, - } + require("full-border"):setup { + type = ui.Border.ROUNDED, + } - Header:children_add(function() - if ya.target_family() ~= "unix" then - return ui.Line {} - end - return ui.Span(ya.user_name() .. "@" .. ya.host_name() .. ": "):fg("red") - end, 500, Header.LEFT) + Header:children_add(function() + if ya.target_family() ~= "unix" then + return ui.Line {} + end + return ui.Span(ya.user_name() .. "@" .. ya.host_name() .. ": "):fg("red") + end, 500, Header.LEFT) ''; } diff --git a/home/programs/cli/yazi/plugins.nix b/home/programs/cli/yazi/plugins.nix index 961eba8..89c4e2f 100644 --- a/home/programs/cli/yazi/plugins.nix +++ b/home/programs/cli/yazi/plugins.nix @@ -1,77 +1,76 @@ { pkgs, lib, ... }: let - yazi-plugins = pkgs.fetchFromGitHub { - owner = "yazi-rs"; - repo = "plugins"; - rev = "74a837c6eafba59e22dc3d8d8ec630934580c70c"; - hash = "sha256-h+CoRLRyC+fJogfAoOw7twXSRkUotbgnS3gBFvlxNlw="; - }; -in -{ - # PLUGINS FROM REPO - programs.yazi.plugins = { - # BUILTINED - chmod = "${yazi-plugins}/chmod.yazi"; - max-preview = "${yazi-plugins}/max-preview.yazi"; - no-status = "${yazi-plugins}/no-status.yazi"; - hide-preview = "${yazi-plugins}/hide-preview.yazi"; - full-border = "${yazi-plugins}/full-border.yazi"; + yazi-plugins = pkgs.fetchFromGitHub { + owner = "yazi-rs"; + repo = "plugins"; + rev = "74a837c6eafba59e22dc3d8d8ec630934580c70c"; + hash = "sha256-h+CoRLRyC+fJogfAoOw7twXSRkUotbgnS3gBFvlxNlw="; + }; +in { + # PLUGINS FROM REPO + programs.yazi.plugins = { + # BUILTINED + chmod = "${yazi-plugins}/chmod.yazi"; + max-preview = "${yazi-plugins}/max-preview.yazi"; + no-status = "${yazi-plugins}/no-status.yazi"; + hide-preview = "${yazi-plugins}/hide-preview.yazi"; + full-border = "${yazi-plugins}/full-border.yazi"; - # FETCHED - ouch = pkgs.fetchFromGitHub { - owner = "ndtoan96"; - repo = "ouch.yazi"; - rev = "251da6930ca8b7ee0384810086c3bf644caede3e"; - hash = "sha256-yLt9aY6hUIOdBI5bMdCs7VYFJGyD3WIkmPxvWKNCskA="; - }; - glow = pkgs.fetchFromGitHub { - owner = "Reledia"; - repo = "glow.yazi"; - rev = "4e016fa2357e5e7e9b1a4881e1492d73a0a2f2cc"; - hash = "sha256-d73C8s8p85c0xfq8Nfzlnp83JUakMPbviQDFCX0G+qE="; - }; - ffmpeg = pkgs.fetchFromGitHub { - owner = "Tyarel8"; - repo = "video-ffmpeg.yazi"; - rev = "fe26a18f9b32880e10b686df5c4559d9af2bce6b"; - hash = "sha256-PIsetF42mlxDv7hEBgjt4FdryDhWTAF/o0Z3Z1G8HJE="; - }; - relative = pkgs.fetchFromGitHub { - owner = "dedukun"; - repo = "relative-motions.yazi"; - rev = "89d0cb9c84a7bba98d2e7ca4bac706d2458d0c06"; - hash = "sha256-qtjAgH+NS4YFVIwq+x2sC90y4vDSXNI8pGXIZ3FuQMU="; - }; - enter = pkgs.fetchFromGitHub { - owner = "ourongxing"; - repo = "fast-enter.yazi"; - rev = "dd498123cb0696d7fa50b32d2268fb8c2084a4a4"; - hash = "sha256-jjluqFboFXV4yqBMvW7WhO61Urn2FQ/O31PqlaCxB2c="; - }; - starship = pkgs.fetchFromGitHub { - owner = "Rolv-Apneseth"; - repo = "starship.yazi"; - rev = "77a65f5a367f833ad5e6687261494044006de9c3"; - hash = "sha256-sAB0958lLNqqwkpucRsUqLHFV/PJYoJL2lHFtfHDZF8="; - }; - yatline = pkgs.fetchFromGitHub { - owner = "imsi32"; - repo = "yatline.yazi"; - rev = "7b56434864d6a0b5d547fed2339b99346a018522"; - hash = "sha256-4qxBAXFyPBQhSU24xL7fzhgM5e8Cq7BigEp4GPxSjD4="; - }; - }; + # FETCHED + ouch = pkgs.fetchFromGitHub { + owner = "ndtoan96"; + repo = "ouch.yazi"; + rev = "251da6930ca8b7ee0384810086c3bf644caede3e"; + hash = "sha256-yLt9aY6hUIOdBI5bMdCs7VYFJGyD3WIkmPxvWKNCskA="; + }; + glow = pkgs.fetchFromGitHub { + owner = "Reledia"; + repo = "glow.yazi"; + rev = "4e016fa2357e5e7e9b1a4881e1492d73a0a2f2cc"; + hash = "sha256-d73C8s8p85c0xfq8Nfzlnp83JUakMPbviQDFCX0G+qE="; + }; + ffmpeg = pkgs.fetchFromGitHub { + owner = "Tyarel8"; + repo = "video-ffmpeg.yazi"; + rev = "fe26a18f9b32880e10b686df5c4559d9af2bce6b"; + hash = "sha256-PIsetF42mlxDv7hEBgjt4FdryDhWTAF/o0Z3Z1G8HJE="; + }; + relative = pkgs.fetchFromGitHub { + owner = "dedukun"; + repo = "relative-motions.yazi"; + rev = "89d0cb9c84a7bba98d2e7ca4bac706d2458d0c06"; + hash = "sha256-qtjAgH+NS4YFVIwq+x2sC90y4vDSXNI8pGXIZ3FuQMU="; + }; + enter = pkgs.fetchFromGitHub { + owner = "ourongxing"; + repo = "fast-enter.yazi"; + rev = "dd498123cb0696d7fa50b32d2268fb8c2084a4a4"; + hash = "sha256-jjluqFboFXV4yqBMvW7WhO61Urn2FQ/O31PqlaCxB2c="; + }; + starship = pkgs.fetchFromGitHub { + owner = "Rolv-Apneseth"; + repo = "starship.yazi"; + rev = "77a65f5a367f833ad5e6687261494044006de9c3"; + hash = "sha256-sAB0958lLNqqwkpucRsUqLHFV/PJYoJL2lHFtfHDZF8="; + }; + yatline = pkgs.fetchFromGitHub { + owner = "imsi32"; + repo = "yatline.yazi"; + rev = "7b56434864d6a0b5d547fed2339b99346a018522"; + hash = "sha256-4qxBAXFyPBQhSU24xL7fzhgM5e8Cq7BigEp4GPxSjD4="; + }; + }; - # CUSTOM PLUGINS + # CUSTOM PLUGINS xdg.configFile = { # SMART ENTER "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, + } ''; }; } diff --git a/home/programs/cli/yazi/starship.nix b/home/programs/cli/yazi/starship.nix index 9cdde1e..bde74a9 100644 --- a/home/programs/cli/yazi/starship.nix +++ b/home/programs/cli/yazi/starship.nix @@ -1,5 +1,4 @@ -{ config, ... }: -{ +{ config, ... }: { xdg.configFile = with config.lib.stylix.colors; { "yazi/star.toml".text = '' # format = """ @@ -14,7 +13,7 @@ $git_status\ $git_metrics\ """ - + [directory] style = "bold fg:green" format = "in [$path ]($style)" @@ -32,7 +31,7 @@ [git_metrics] added_style = "bold fg:blue" deleted_style = "bold fg:red" - + [directory.substitutions] "Documents" = "󰈙 " "Downloads" = " " diff --git a/home/programs/cli/yazi/theme.nix b/home/programs/cli/yazi/theme.nix index dc3d56d..e6f3b82 100644 --- a/home/programs/cli/yazi/theme.nix +++ b/home/programs/cli/yazi/theme.nix @@ -1,620 +1,2979 @@ -{ lib, config, ... }: -{ - programs.yazi.theme = with config.lib.stylix.colors; lib.mkForce { - manager = { - cwd = { fg = "#${base0B}"; }; - - hovered = { fg = "#${base00}"; bg = "#${base0D}"; bold = true; }; - preview_hovered = { underline = false; }; +{ lib, config, ... }: { + programs.yazi.theme = with config.lib.stylix.colors; + lib.mkForce { + manager = { + cwd = { fg = "#${base0B}"; }; - tab_active = { fg = "#${base01}"; bg = "#${base0E}"; }; - tab_inactive = { fg = "#${base06}"; bg = "#${base00}"; }; - tab_width = 1; + hovered = { + fg = "#${base00}"; + bg = "#${base0D}"; + bold = true; + }; + preview_hovered = { underline = false; }; - border_style = { fg = "#${base00}"; }; + tab_active = { + fg = "#${base01}"; + bg = "#${base0E}"; + }; + tab_inactive = { + fg = "#${base06}"; + bg = "#${base00}"; + }; + tab_width = 1; - marker_selected = { bg = "#${base0C}"; fg = "#${base00}"; bold = true; }; - marker_copied = { bg = "#${base0B}"; fg = "#${base00}"; bold = true; }; - marker_cut = { bg = "#${base0A}"; fg = "#${base00}"; bold = true; }; + border_style = { fg = "#${base00}"; }; + + marker_selected = { + bg = "#${base0C}"; + fg = "#${base00}"; + bold = true; + }; + marker_copied = { + bg = "#${base0B}"; + fg = "#${base00}"; + bold = true; + }; + marker_cut = { + bg = "#${base0A}"; + fg = "#${base00}"; + bold = true; + }; + }; + which = { + cols = 3; + mask = { bg = "#${base01}"; }; + }; + filetype = { + rules = [ + { + mime = "{audio,video}/*"; + fg = "#${base0C}"; + } + { + name = "*"; + fg = "#${base06}"; + } + { + name = "*/"; + fg = "#${base06}"; + } + ]; + }; + icon = { + exts = [ + { + name = "3gp"; + text = ""; + fg = "#${base06}"; + } + { + name = "3mf"; + text = "󰆧"; + fg = "#${base06}"; + } + { + name = "7z"; + text = ""; + fg = "#${base06}"; + } + { + name = "a"; + text = ""; + fg = "#${base06}"; + } + { + name = "aac"; + text = ""; + fg = "#${base06}"; + } + { + name = "ai"; + text = ""; + fg = "#${base06}"; + } + { + name = "aif"; + text = ""; + fg = "#${base06}"; + } + { + name = "aiff"; + text = ""; + fg = "#${base06}"; + } + { + name = "android"; + text = ""; + fg = "#${base06}"; + } + { + name = "ape"; + text = ""; + fg = "#${base06}"; + } + { + name = "apk"; + text = ""; + fg = "#${base06}"; + } + { + name = "app"; + text = ""; + fg = "#${base06}"; + } + { + name = "applescript"; + text = ""; + fg = "#${base06}"; + } + { + name = "asc"; + text = "󰦝"; + fg = "#${base06}"; + } + { + name = "ass"; + text = "󰨖"; + fg = "#${base06}"; + } + { + name = "astro"; + text = ""; + fg = "#${base06}"; + } + { + name = "awk"; + text = ""; + fg = "#${base06}"; + } + { + name = "azcli"; + text = ""; + fg = "#${base06}"; + } + { + name = "bak"; + text = "󰁯"; + fg = "#${base06}"; + } + { + name = "bash"; + text = ""; + fg = "#${base06}"; + } + { + name = "bat"; + text = ""; + fg = "#${base06}"; + } + { + name = "bazel"; + text = ""; + fg = "#${base06}"; + } + { + name = "bib"; + text = "󱉟"; + fg = "#${base06}"; + } + { + name = "bicep"; + text = ""; + fg = "#${base06}"; + } + { + name = "bicepparam"; + text = ""; + fg = "#${base06}"; + } + { + name = "bin"; + text = ""; + fg = "#${base06}"; + } + { + name = "blade.php"; + text = ""; + fg = "#${base06}"; + } + { + name = "blend"; + text = "󰂫"; + fg = "#${base06}"; + } + { + name = "blp"; + text = "󰺾"; + fg = "#${base06}"; + } + { + name = "bmp"; + text = ""; + fg = "#${base06}"; + } + { + name = "brep"; + text = "󰻫"; + fg = "#${base06}"; + } + { + name = "bz"; + text = ""; + fg = "#${base06}"; + } + { + name = "bz2"; + text = ""; + fg = "#${base06}"; + } + { + name = "bz3"; + text = ""; + fg = "#${base06}"; + } + { + name = "bzl"; + text = ""; + fg = "#${base06}"; + } + { + name = "c"; + text = ""; + fg = "#${base06}"; + } + { + name = "c++"; + text = ""; + fg = "#${base06}"; + } + { + name = "cache"; + text = ""; + fg = "#${base06}"; + } + { + name = "cast"; + text = ""; + fg = "#${base06}"; + } + { + name = "cbl"; + text = "⚙"; + fg = "#${base06}"; + } + { + name = "cc"; + text = ""; + fg = "#${base06}"; + } + { + name = "ccm"; + text = ""; + fg = "#${base06}"; + } + { + name = "cfg"; + text = ""; + fg = "#${base06}"; + } + { + name = "cjs"; + text = ""; + fg = "#${base06}"; + } + { + name = "clj"; + text = ""; + fg = "#${base06}"; + } + { + name = "cljc"; + text = ""; + fg = "#${base06}"; + } + { + name = "cljd"; + text = ""; + fg = "#${base06}"; + } + { + name = "cljs"; + text = ""; + fg = "#${base06}"; + } + { + name = "cmake"; + text = ""; + fg = "#${base06}"; + } + { + name = "cob"; + text = "⚙"; + fg = "#${base06}"; + } + { + name = "cobol"; + text = "⚙"; + fg = "#${base06}"; + } + { + name = "coffee"; + text = ""; + fg = "#${base06}"; + } + { + name = "conf"; + text = ""; + fg = "#${base06}"; + } + { + name = "config.ru"; + text = ""; + fg = "#${base06}"; + } + { + name = "cp"; + text = ""; + fg = "#${base06}"; + } + { + name = "cpp"; + text = ""; + fg = "#${base06}"; + } + { + name = "cppm"; + text = ""; + fg = "#${base06}"; + } + { + name = "cpy"; + text = "⚙"; + fg = "#${base06}"; + } + { + name = "cr"; + text = ""; + fg = "#${base06}"; + } + { + name = "crdownload"; + text = ""; + fg = "#${base06}"; + } + { + name = "cs"; + text = "󰌛"; + fg = "#${base06}"; + } + { + name = "csh"; + text = ""; + fg = "#${base06}"; + } + { + name = "cshtml"; + text = "󱦗"; + fg = "#${base06}"; + } + { + name = "cson"; + text = ""; + fg = "#${base06}"; + } + { + name = "csproj"; + text = "󰪮"; + fg = "#${base06}"; + } + { + name = "css"; + text = ""; + fg = "#${base06}"; + } + { + name = "csv"; + text = ""; + fg = "#${base06}"; + } + { + name = "cts"; + text = ""; + fg = "#${base06}"; + } + { + name = "cu"; + text = ""; + fg = "#${base06}"; + } + { + name = "cue"; + text = "󰲹"; + fg = "#${base06}"; + } + { + name = "cuh"; + text = ""; + fg = "#${base06}"; + } + { + name = "cxx"; + text = ""; + fg = "#${base06}"; + } + { + name = "cxxm"; + text = ""; + fg = "#${base06}"; + } + { + name = "d"; + text = ""; + fg = "#${base06}"; + } + { + name = "d.ts"; + text = ""; + fg = "#${base06}"; + } + { + name = "dart"; + text = ""; + fg = "#${base06}"; + } + { + name = "db"; + text = ""; + fg = "#${base06}"; + } + { + name = "dconf"; + text = ""; + fg = "#${base06}"; + } + { + name = "desktop"; + text = ""; + fg = "#${base06}"; + } + { + name = "diff"; + text = ""; + fg = "#${base06}"; + } + { + name = "dll"; + text = ""; + fg = "#${base06}"; + } + { + name = "doc"; + text = "󰈬"; + fg = "#${base06}"; + } + { + name = "Dockerfile"; + text = "󰡨"; + fg = "#${base06}"; + } + { + name = "docx"; + text = "󰈬"; + fg = "#${base06}"; + } + { + name = "dot"; + text = "󱁉"; + fg = "#${base06}"; + } + { + name = "download"; + text = ""; + fg = "#${base06}"; + } + { + name = "drl"; + text = ""; + fg = "#${base06}"; + } + { + name = "dropbox"; + text = ""; + fg = "#${base06}"; + } + { + name = "dump"; + text = ""; + fg = "#${base06}"; + } + { + name = "dwg"; + text = "󰻫"; + fg = "#${base06}"; + } + { + name = "dxf"; + text = "󰻫"; + fg = "#${base06}"; + } + { + name = "ebook"; + text = ""; + fg = "#${base06}"; + } + { + name = "edn"; + text = ""; + fg = "#${base06}"; + } + { + name = "eex"; + text = ""; + fg = "#${base06}"; + } + { + name = "ejs"; + text = ""; + fg = "#${base06}"; + } + { + name = "el"; + text = ""; + fg = "#${base06}"; + } + { + name = "elc"; + text = ""; + fg = "#${base06}"; + } + { + name = "elf"; + text = ""; + fg = "#${base06}"; + } + { + name = "elm"; + text = ""; + fg = "#${base06}"; + } + { + name = "eln"; + text = ""; + fg = "#${base06}"; + } + { + name = "env"; + text = ""; + fg = "#${base06}"; + } + { + name = "eot"; + text = ""; + fg = "#${base06}"; + } + { + name = "epp"; + text = ""; + fg = "#${base06}"; + } + { + name = "epub"; + text = ""; + fg = "#${base06}"; + } + { + name = "erb"; + text = ""; + fg = "#${base06}"; + } + { + name = "erl"; + text = ""; + fg = "#${base06}"; + } + { + name = "ex"; + text = ""; + fg = "#${base06}"; + } + { + name = "exe"; + text = ""; + fg = "#${base06}"; + } + { + name = "exs"; + text = ""; + fg = "#${base06}"; + } + { + name = "f#"; + text = ""; + fg = "#${base06}"; + } + { + name = "f3d"; + text = "󰻫"; + fg = "#${base06}"; + } + { + name = "f90"; + text = "󱈚"; + fg = "#${base06}"; + } + { + name = "fbx"; + text = "󰆧"; + fg = "#${base06}"; + } + { + name = "fcbak"; + text = ""; + fg = "#${base06}"; + } + { + name = "fcmacro"; + text = ""; + fg = "#${base06}"; + } + { + name = "fcmat"; + text = ""; + fg = "#${base06}"; + } + { + name = "fcparam"; + text = ""; + fg = "#${base06}"; + } + { + name = "fcscript"; + text = ""; + fg = "#${base06}"; + } + { + name = "fcstd"; + text = ""; + fg = "#${base06}"; + } + { + name = "fcstd1"; + text = ""; + fg = "#${base06}"; + } + { + name = "fctb"; + text = ""; + fg = "#${base06}"; + } + { + name = "fctl"; + text = ""; + fg = "#${base06}"; + } + { + name = "fdmdownload"; + text = ""; + fg = "#${base06}"; + } + { + name = "fish"; + text = ""; + fg = "#${base06}"; + } + { + name = "flac"; + text = ""; + fg = "#${base06}"; + } + { + name = "flc"; + text = ""; + fg = "#${base06}"; + } + { + name = "flf"; + text = ""; + fg = "#${base06}"; + } + { + name = "fnl"; + text = ""; + fg = "#${base06}"; + } + { + name = "fs"; + text = ""; + fg = "#${base06}"; + } + { + name = "fsi"; + text = ""; + fg = "#${base06}"; + } + { + name = "fsscript"; + text = ""; + fg = "#${base06}"; + } + { + name = "fsx"; + text = ""; + fg = "#${base06}"; + } + { + name = "gcode"; + text = "󰐫"; + fg = "#${base06}"; + } + { + name = "gd"; + text = ""; + fg = "#${base06}"; + } + { + name = "gemspec"; + text = ""; + fg = "#${base06}"; + } + { + name = "gif"; + text = ""; + fg = "#${base06}"; + } + { + name = "git"; + text = ""; + fg = "#${base06}"; + } + { + name = "glb"; + text = ""; + fg = "#${base06}"; + } + { + name = "gnumakefile"; + text = ""; + fg = "#${base06}"; + } + { + name = "go"; + text = ""; + fg = "#${base06}"; + } + { + name = "godot"; + text = ""; + fg = "#${base06}"; + } + { + name = "gql"; + text = ""; + fg = "#${base06}"; + } + { + name = "graphql"; + text = ""; + fg = "#${base06}"; + } + { + name = "gresource"; + text = ""; + fg = "#${base06}"; + } + { + name = "gv"; + text = "󱁉"; + fg = "#${base06}"; + } + { + name = "gz"; + text = ""; + fg = "#${base06}"; + } + { + name = "h"; + text = ""; + fg = "#${base06}"; + } + { + name = "haml"; + text = ""; + fg = "#${base06}"; + } + { + name = "hbs"; + text = ""; + fg = "#${base06}"; + } + { + name = "heex"; + text = ""; + fg = "#${base06}"; + } + { + name = "hex"; + text = ""; + fg = "#${base06}"; + } + { + name = "hh"; + text = ""; + fg = "#${base06}"; + } + { + name = "hpp"; + text = ""; + fg = "#${base06}"; + } + { + name = "hrl"; + text = ""; + fg = "#${base06}"; + } + { + name = "hs"; + text = ""; + fg = "#${base06}"; + } + { + name = "htm"; + text = ""; + fg = "#${base06}"; + } + { + name = "html"; + text = ""; + fg = "#${base06}"; + } + { + name = "huff"; + text = "󰡘"; + fg = "#${base06}"; + } + { + name = "hurl"; + text = ""; + fg = "#${base06}"; + } + { + name = "hx"; + text = ""; + fg = "#${base06}"; + } + { + name = "hxx"; + text = ""; + fg = "#${base06}"; + } + { + name = "ical"; + text = ""; + fg = "#${base06}"; + } + { + name = "icalendar"; + text = ""; + fg = "#${base06}"; + } + { + name = "ico"; + text = ""; + fg = "#${base06}"; + } + { + name = "ics"; + text = ""; + fg = "#${base06}"; + } + { + name = "ifb"; + text = ""; + fg = "#${base06}"; + } + { + name = "ifc"; + text = "󰻫"; + fg = "#${base06}"; + } + { + name = "ige"; + text = "󰻫"; + fg = "#${base06}"; + } + { + name = "iges"; + text = "󰻫"; + fg = "#${base06}"; + } + { + name = "igs"; + text = "󰻫"; + fg = "#${base06}"; + } + { + name = "image"; + text = ""; + fg = "#${base06}"; + } + { + name = "img"; + text = ""; + fg = "#${base06}"; + } + { + name = "import"; + text = ""; + fg = "#${base06}"; + } + { + name = "info"; + text = ""; + fg = "#${base06}"; + } + { + name = "ini"; + text = ""; + fg = "#${base06}"; + } + { + name = "ino"; + text = ""; + fg = "#${base06}"; + } + { + name = "ipynb"; + text = ""; + fg = "#${base06}"; + } + { + name = "iso"; + text = ""; + fg = "#${base06}"; + } + { + name = "ixx"; + text = ""; + fg = "#${base06}"; + } + { + name = "java"; + text = ""; + fg = "#${base06}"; + } + { + name = "jl"; + text = ""; + fg = "#${base06}"; + } + { + name = "jpeg"; + text = ""; + fg = "#${base06}"; + } + { + name = "jpg"; + text = ""; + fg = "#${base06}"; + } + { + name = "js"; + text = ""; + fg = "#${base06}"; + } + { + name = "json"; + text = ""; + fg = "#${base06}"; + } + { + name = "json5"; + text = ""; + fg = "#${base06}"; + } + { + name = "jsonc"; + text = ""; + fg = "#${base06}"; + } + { + name = "jsx"; + text = ""; + fg = "#${base06}"; + } + { + name = "jwmrc"; + text = ""; + fg = "#${base06}"; + } + { + name = "jxl"; + text = ""; + fg = "#${base06}"; + } + { + name = "kbx"; + text = "󰯄"; + fg = "#${base06}"; + } + { + name = "kdb"; + text = ""; + fg = "#${base06}"; + } + { + name = "kdbx"; + text = ""; + fg = "#${base06}"; + } + { + name = "kdenlive"; + text = ""; + fg = "#${base06}"; + } + { + name = "kdenlivetitle"; + text = ""; + fg = "#${base06}"; + } + { + name = "kicad_dru"; + text = ""; + fg = "#${base06}"; + } + { + name = "kicad_mod"; + text = ""; + fg = "#${base06}"; + } + { + name = "kicad_pcb"; + text = ""; + fg = "#${base06}"; + } + { + name = "kicad_prl"; + text = ""; + fg = "#${base06}"; + } + { + name = "kicad_pro"; + text = ""; + fg = "#${base06}"; + } + { + name = "kicad_sch"; + text = ""; + fg = "#${base06}"; + } + { + name = "kicad_sym"; + text = ""; + fg = "#${base06}"; + } + { + name = "kicad_wks"; + text = ""; + fg = "#${base06}"; + } + { + name = "ko"; + text = ""; + fg = "#${base06}"; + } + { + name = "kpp"; + text = ""; + fg = "#${base06}"; + } + { + name = "kra"; + text = ""; + fg = "#${base06}"; + } + { + name = "krz"; + text = ""; + fg = "#${base06}"; + } + { + name = "ksh"; + text = ""; + fg = "#${base06}"; + } + { + name = "kt"; + text = ""; + fg = "#${base06}"; + } + { + name = "kts"; + text = ""; + fg = "#${base06}"; + } + { + name = "lck"; + text = ""; + fg = "#${base06}"; + } + { + name = "leex"; + text = ""; + fg = "#${base06}"; + } + { + name = "less"; + text = ""; + fg = "#${base06}"; + } + { + name = "lff"; + text = ""; + fg = "#${base06}"; + } + { + name = "lhs"; + text = ""; + fg = "#${base06}"; + } + { + name = "lib"; + text = ""; + fg = "#${base06}"; + } + { + name = "license"; + text = ""; + fg = "#${base06}"; + } + { + name = "liquid"; + text = ""; + fg = "#${base06}"; + } + { + name = "lock"; + text = ""; + fg = "#${base06}"; + } + { + name = "log"; + text = "󰌱"; + fg = "#${base06}"; + } + { + name = "lrc"; + text = "󰨖"; + fg = "#${base06}"; + } + { + name = "lua"; + text = ""; + fg = "#${base06}"; + } + { + name = "luac"; + text = ""; + fg = "#${base06}"; + } + { + name = "luau"; + text = ""; + fg = "#${base06}"; + } + { + name = "m"; + text = ""; + fg = "#${base06}"; + } + { + name = "m3u"; + text = "󰲹"; + fg = "#${base06}"; + } + { + name = "m3u8"; + text = "󰲹"; + fg = "#${base06}"; + } + { + name = "m4a"; + text = ""; + fg = "#${base06}"; + } + { + name = "m4v"; + text = ""; + fg = "#${base06}"; + } + { + name = "magnet"; + text = ""; + fg = "#${base06}"; + } + { + name = "makefile"; + text = ""; + fg = "#${base06}"; + } + { + name = "markdown"; + text = ""; + fg = "#${base06}"; + } + { + name = "material"; + text = "󰔉"; + fg = "#${base06}"; + } + { + name = "md"; + text = ""; + fg = "#${base06}"; + } + { + name = "md5"; + text = "󰕥"; + fg = "#${base06}"; + } + { + name = "mdx"; + text = ""; + fg = "#${base06}"; + } + { + name = "mint"; + text = "󰌪"; + fg = "#${base06}"; + } + { + name = "mjs"; + text = ""; + fg = "#${base06}"; + } + { + name = "mk"; + text = ""; + fg = "#${base06}"; + } + { + name = "mkv"; + text = ""; + fg = "#${base06}"; + } + { + name = "ml"; + text = ""; + fg = "#${base06}"; + } + { + name = "mli"; + text = ""; + fg = "#${base06}"; + } + { + name = "mm"; + text = ""; + fg = "#${base06}"; + } + { + name = "mo"; + text = "∞"; + fg = "#${base06}"; + } + { + name = "mobi"; + text = ""; + fg = "#${base06}"; + } + { + name = "mov"; + text = ""; + fg = "#${base06}"; + } + { + name = "mp3"; + text = ""; + fg = "#${base06}"; + } + { + name = "mp4"; + text = ""; + fg = "#${base06}"; + } + { + name = "mpp"; + text = ""; + fg = "#${base06}"; + } + { + name = "msf"; + text = ""; + fg = "#${base06}"; + } + { + name = "mts"; + text = ""; + fg = "#${base06}"; + } + { + name = "mustache"; + text = ""; + fg = "#${base06}"; + } + { + name = "nfo"; + text = ""; + fg = "#${base06}"; + } + { + name = "nim"; + text = ""; + fg = "#${base06}"; + } + { + name = "nix"; + text = ""; + fg = "#${base06}"; + } + { + name = "nswag"; + text = ""; + fg = "#${base06}"; + } + { + name = "nu"; + text = ">"; + fg = "#${base06}"; + } + { + name = "o"; + text = ""; + fg = "#${base06}"; + } + { + name = "obj"; + text = "󰆧"; + fg = "#${base06}"; + } + { + name = "ogg"; + text = ""; + fg = "#${base06}"; + } + { + name = "opus"; + text = ""; + fg = "#${base06}"; + } + { + name = "org"; + text = ""; + fg = "#${base06}"; + } + { + name = "otf"; + text = ""; + fg = "#${base06}"; + } + { + name = "out"; + text = ""; + fg = "#${base06}"; + } + { + name = "part"; + text = ""; + fg = "#${base06}"; + } + { + name = "patch"; + text = ""; + fg = "#${base06}"; + } + { + name = "pck"; + text = ""; + fg = "#${base06}"; + } + { + name = "pcm"; + text = ""; + fg = "#${base06}"; + } + { + name = "pdf"; + text = ""; + fg = "#${base06}"; + } + { + name = "php"; + text = ""; + fg = "#${base06}"; + } + { + name = "pl"; + text = ""; + fg = "#${base06}"; + } + { + name = "pls"; + text = "󰲹"; + fg = "#${base06}"; + } + { + name = "ply"; + text = "󰆧"; + fg = "#${base06}"; + } + { + name = "pm"; + text = ""; + fg = "#${base06}"; + } + { + name = "png"; + text = ""; + fg = "#${base06}"; + } + { + name = "po"; + text = ""; + fg = "#${base06}"; + } + { + name = "pot"; + text = ""; + fg = "#${base06}"; + } + { + name = "pp"; + text = ""; + fg = "#${base06}"; + } + { + name = "ppt"; + text = "󰈧"; + fg = "#${base06}"; + } + { + name = "prisma"; + text = ""; + fg = "#${base06}"; + } + { + name = "pro"; + text = ""; + fg = "#${base06}"; + } + { + name = "ps1"; + text = "󰨊"; + fg = "#${base06}"; + } + { + name = "psb"; + text = ""; + fg = "#${base06}"; + } + { + name = "psd"; + text = ""; + fg = "#${base06}"; + } + { + name = "psd1"; + text = "󰨊"; + fg = "#${base06}"; + } + { + name = "psm1"; + text = "󰨊"; + fg = "#${base06}"; + } + { + name = "pub"; + text = "󰷖"; + fg = "#${base06}"; + } + { + name = "pxd"; + text = ""; + fg = "#${base06}"; + } + { + name = "pxi"; + text = ""; + fg = "#${base06}"; + } + { + name = "py"; + text = ""; + fg = "#${base06}"; + } + { + name = "pyc"; + text = ""; + fg = "#${base06}"; + } + { + name = "pyd"; + text = ""; + fg = "#${base06}"; + } + { + name = "pyi"; + text = ""; + fg = "#${base06}"; + } + { + name = "pyo"; + text = ""; + fg = "#${base06}"; + } + { + name = "pyx"; + text = ""; + fg = "#${base06}"; + } + { + name = "qm"; + text = ""; + fg = "#${base06}"; + } + { + name = "qml"; + text = ""; + fg = "#${base06}"; + } + { + name = "qrc"; + text = ""; + fg = "#${base06}"; + } + { + name = "qss"; + text = ""; + fg = "#${base06}"; + } + { + name = "query"; + text = ""; + fg = "#${base06}"; + } + { + name = "r"; + text = "󰟔"; + fg = "#${base06}"; + } + { + name = "rake"; + text = ""; + fg = "#${base06}"; + } + { + name = "rar"; + text = ""; + fg = "#${base06}"; + } + { + name = "razor"; + text = "󱦘"; + fg = "#${base06}"; + } + { + name = "rb"; + text = ""; + fg = "#${base06}"; + } + { + name = "res"; + text = ""; + fg = "#${base06}"; + } + { + name = "resi"; + text = ""; + fg = "#${base06}"; + } + { + name = "rlib"; + text = ""; + fg = "#${base06}"; + } + { + name = "rmd"; + text = ""; + fg = "#${base06}"; + } + { + name = "rproj"; + text = "󰗆"; + fg = "#${base06}"; + } + { + name = "rs"; + text = ""; + fg = "#${base06}"; + } + { + name = "rss"; + text = ""; + fg = "#${base06}"; + } + { + name = "sass"; + text = ""; + fg = "#${base06}"; + } + { + name = "sbt"; + text = ""; + fg = "#${base06}"; + } + { + name = "sc"; + text = ""; + fg = "#${base06}"; + } + { + name = "scad"; + text = ""; + fg = "#${base06}"; + } + { + name = "scala"; + text = ""; + fg = "#${base06}"; + } + { + name = "scm"; + text = "󰘧"; + fg = "#${base06}"; + } + { + name = "scss"; + text = ""; + fg = "#${base06}"; + } + { + name = "sh"; + text = ""; + fg = "#${base06}"; + } + { + name = "sha1"; + text = "󰕥"; + fg = "#${base06}"; + } + { + name = "sha224"; + text = "󰕥"; + fg = "#${base06}"; + } + { + name = "sha256"; + text = "󰕥"; + fg = "#${base06}"; + } + { + name = "sha384"; + text = "󰕥"; + fg = "#${base06}"; + } + { + name = "sha512"; + text = "󰕥"; + fg = "#${base06}"; + } + { + name = "sig"; + text = "λ"; + fg = "#${base06}"; + } + { + name = "signature"; + text = "λ"; + fg = "#${base06}"; + } + { + name = "skp"; + text = "󰻫"; + fg = "#${base06}"; + } + { + name = "sldasm"; + text = "󰻫"; + fg = "#${base06}"; + } + { + name = "sldprt"; + text = "󰻫"; + fg = "#${base06}"; + } + { + name = "slim"; + text = ""; + fg = "#${base06}"; + } + { + name = "sln"; + text = ""; + fg = "#${base06}"; + } + { + name = "slvs"; + text = "󰻫"; + fg = "#${base06}"; + } + { + name = "sml"; + text = "λ"; + fg = "#${base06}"; + } + { + name = "so"; + text = ""; + fg = "#${base06}"; + } + { + name = "sol"; + text = ""; + fg = "#${base06}"; + } + { + name = "spec.js"; + text = ""; + fg = "#${base06}"; + } + { + name = "spec.jsx"; + text = ""; + fg = "#${base06}"; + } + { + name = "spec.ts"; + text = ""; + fg = "#${base06}"; + } + { + name = "spec.tsx"; + text = ""; + fg = "#${base06}"; + } + { + name = "sql"; + text = ""; + fg = "#${base06}"; + } + { + name = "sqlite"; + text = ""; + fg = "#${base06}"; + } + { + name = "sqlite3"; + text = ""; + fg = "#${base06}"; + } + { + name = "srt"; + text = "󰨖"; + fg = "#${base06}"; + } + { + name = "ssa"; + text = "󰨖"; + fg = "#${base06}"; + } + { + name = "ste"; + text = "󰻫"; + fg = "#${base06}"; + } + { + name = "step"; + text = "󰻫"; + fg = "#${base06}"; + } + { + name = "stl"; + text = "󰆧"; + fg = "#${base06}"; + } + { + name = "stp"; + text = "󰻫"; + fg = "#${base06}"; + } + { + name = "strings"; + text = ""; + fg = "#${base06}"; + } + { + name = "styl"; + text = ""; + fg = "#${base06}"; + } + { + name = "sub"; + text = "󰨖"; + fg = "#${base06}"; + } + { + name = "sublime"; + text = ""; + fg = "#${base06}"; + } + { + name = "suo"; + text = ""; + fg = "#${base06}"; + } + { + name = "sv"; + text = "󰍛"; + fg = "#${base06}"; + } + { + name = "svelte"; + text = ""; + fg = "#${base06}"; + } + { + name = "svg"; + text = "󰜡"; + fg = "#${base06}"; + } + { + name = "svh"; + text = "󰍛"; + fg = "#${base06}"; + } + { + name = "swift"; + text = ""; + fg = "#${base06}"; + } + { + name = "t"; + text = ""; + fg = "#${base06}"; + } + { + name = "tbc"; + text = "󰛓"; + fg = "#${base06}"; + } + { + name = "tcl"; + text = "󰛓"; + fg = "#${base06}"; + } + { + name = "templ"; + text = ""; + fg = "#${base06}"; + } + { + name = "terminal"; + text = ""; + fg = "#${base06}"; + } + { + name = "test.js"; + text = ""; + fg = "#${base06}"; + } + { + name = "test.jsx"; + text = ""; + fg = "#${base06}"; + } + { + name = "test.ts"; + text = ""; + fg = "#${base06}"; + } + { + name = "test.tsx"; + text = ""; + fg = "#${base06}"; + } + { + name = "tex"; + text = ""; + fg = "#${base06}"; + } + { + name = "tf"; + text = ""; + fg = "#${base06}"; + } + { + name = "tfvars"; + text = ""; + fg = "#${base06}"; + } + { + name = "tgz"; + text = ""; + fg = "#${base06}"; + } + { + name = "tmux"; + text = ""; + fg = "#${base06}"; + } + { + name = "toml"; + text = ""; + fg = "#${base06}"; + } + { + name = "torrent"; + text = ""; + fg = "#${base06}"; + } + { + name = "tres"; + text = ""; + fg = "#${base06}"; + } + { + name = "ts"; + text = ""; + fg = "#${base06}"; + } + { + name = "tscn"; + text = ""; + fg = "#${base06}"; + } + { + name = "tsconfig"; + text = ""; + fg = "#${base06}"; + } + { + name = "tsx"; + text = ""; + fg = "#${base06}"; + } + { + name = "ttf"; + text = ""; + fg = "#${base06}"; + } + { + name = "twig"; + text = ""; + fg = "#${base06}"; + } + { + name = "txt"; + text = "󰈙"; + fg = "#${base06}"; + } + { + name = "txz"; + text = ""; + fg = "#${base06}"; + } + { + name = "typoscript"; + text = ""; + fg = "#${base06}"; + } + { + name = "ui"; + text = ""; + fg = "#${base06}"; + } + { + name = "v"; + text = "󰍛"; + fg = "#${base06}"; + } + { + name = "vala"; + text = ""; + fg = "#${base06}"; + } + { + name = "vh"; + text = "󰍛"; + fg = "#${base06}"; + } + { + name = "vhd"; + text = "󰍛"; + fg = "#${base06}"; + } + { + name = "vhdl"; + text = "󰍛"; + fg = "#${base06}"; + } + { + name = "vim"; + text = ""; + fg = "#${base06}"; + } + { + name = "vsh"; + text = ""; + fg = "#${base06}"; + } + { + name = "vsix"; + text = ""; + fg = "#${base06}"; + } + { + name = "vue"; + text = ""; + fg = "#${base06}"; + } + { + name = "wasm"; + text = ""; + fg = "#${base06}"; + } + { + name = "wav"; + text = ""; + fg = "#${base06}"; + } + { + name = "webm"; + text = ""; + fg = "#${base06}"; + } + { + name = "webmanifest"; + text = ""; + fg = "#${base06}"; + } + { + name = "webp"; + text = ""; + fg = "#${base06}"; + } + { + name = "webpack"; + text = "󰜫"; + fg = "#${base06}"; + } + { + name = "wma"; + text = ""; + fg = "#${base06}"; + } + { + name = "woff"; + text = ""; + fg = "#${base06}"; + } + { + name = "woff2"; + text = ""; + fg = "#${base06}"; + } + { + name = "wrl"; + text = "󰆧"; + fg = "#${base06}"; + } + { + name = "wrz"; + text = "󰆧"; + fg = "#${base06}"; + } + { + name = "x"; + text = ""; + fg = "#${base06}"; + } + { + name = "xaml"; + text = "󰙳"; + fg = "#${base06}"; + } + { + name = "xcf"; + text = ""; + fg = "#${base06}"; + } + { + name = "xcplayground"; + text = ""; + fg = "#${base06}"; + } + { + name = "xcstrings"; + text = ""; + fg = "#${base06}"; + } + { + name = "xls"; + text = "󰈛"; + fg = "#${base06}"; + } + { + name = "xlsx"; + text = "󰈛"; + fg = "#${base06}"; + } + { + name = "xm"; + text = ""; + fg = "#${base06}"; + } + { + name = "xml"; + text = "󰗀"; + fg = "#${base06}"; + } + { + name = "xpi"; + text = ""; + fg = "#${base06}"; + } + { + name = "xul"; + text = ""; + fg = "#${base06}"; + } + { + name = "xz"; + text = ""; + fg = "#${base06}"; + } + { + name = "yaml"; + text = ""; + fg = "#${base06}"; + } + { + name = "yml"; + text = ""; + fg = "#${base06}"; + } + { + name = "zig"; + text = ""; + fg = "#${base06}"; + } + { + name = "zip"; + text = ""; + fg = "#${base06}"; + } + { + name = "zsh"; + text = ""; + fg = "#${base06}"; + } + { + name = "zst"; + text = ""; + fg = "#${base06}"; + } + ]; + files = [ + { + name = "gulpfile.js"; + text = ""; + fg = "#${base06}"; + } + { + name = ".babelrc"; + text = ""; + fg = "#${base06}"; + } + { + name = "copying.lesser"; + text = ""; + fg = "#${base06}"; + } + { + name = ".npmrc"; + text = ""; + fg = "#${base06}"; + } + { + name = "docker-compose.yml"; + text = "󰡨"; + fg = "#${base06}"; + } + { + name = "svelte.config.js"; + text = ""; + fg = "#${base06}"; + } + { + name = "copying"; + text = ""; + fg = "#${base06}"; + } + { + name = "prettier.config.ts"; + text = ""; + fg = "#${base06}"; + } + { + name = "gruntfile.babel.js"; + text = ""; + fg = "#${base06}"; + } + { + name = ".SRCINFO"; + text = "󰣇"; + fg = "#${base06}"; + } + { + name = ".xinitrc"; + text = ""; + fg = "#${base06}"; + } + { + name = "docker-compose.yaml"; + text = "󰡨"; + fg = "#${base06}"; + } + { + name = "nuxt.config.ts"; + text = "󱄆"; + fg = "#${base06}"; + } + { + name = "build"; + text = ""; + fg = "#${base06}"; + } + { + name = ".editorconfig"; + text = ""; + fg = "#${base06}"; + } + { + name = "nuxt.config.mjs"; + text = "󱄆"; + fg = "#${base06}"; + } + { + name = ".gitlab-ci.yml"; + text = ""; + fg = "#${base06}"; + } + { + name = "PKGBUILD"; + text = ""; + fg = "#${base06}"; + } + { + name = ".bash_profile"; + text = ""; + fg = "#${base06}"; + } + { + name = ".bashrc"; + text = ""; + fg = "#${base06}"; + } + { + name = "compose.yml"; + text = "󰡨"; + fg = "#${base06}"; + } + { + name = "eslint.config.cjs"; + text = ""; + fg = "#${base06}"; + } + { + name = "go.mod"; + text = ""; + fg = "#${base06}"; + } + { + name = ".mailmap"; + text = "󰊢"; + fg = "#${base06}"; + } + { + name = "gtkrc"; + text = ""; + fg = "#${base06}"; + } + { + name = "go.work"; + text = ""; + fg = "#${base06}"; + } + { + name = "justfile"; + text = ""; + fg = "#${base06}"; + } + { + name = "kritadisplayrc"; + text = ""; + fg = "#${base06}"; + } + { + name = "commitlint.config.js"; + text = "󰜘"; + fg = "#${base06}"; + } + { + name = ".env"; + text = ""; + fg = "#${base06}"; + } + { + name = "PrusaSlicerGcodeViewer.ini"; + text = ""; + fg = "#${base06}"; + } + { + name = "r"; + text = "󰟔"; + fg = "#${base06}"; + } + { + name = "license"; + text = ""; + fg = "#${base06}"; + } + { + name = ".gitignore"; + text = ""; + fg = "#${base06}"; + } + { + name = "tailwind.config.js"; + text = "󱏿"; + fg = "#${base06}"; + } + { + name = ".prettierrc.yml"; + text = ""; + fg = "#${base06}"; + } + { + name = ".zprofile"; + text = ""; + fg = "#${base06}"; + } + { + name = ".zshenv"; + text = ""; + fg = "#${base06}"; + } + { + name = "xmonad.hs"; + text = ""; + fg = "#${base06}"; + } + { + name = ".eslintignore"; + text = ""; + fg = "#${base06}"; + } + { + name = "tsconfig.json"; + text = ""; + fg = "#${base06}"; + } + { + name = ".prettierrc.json5"; + text = ""; + fg = "#${base06}"; + } + { + name = ".ds_store"; + text = ""; + fg = "#${base06}"; + } + { + name = "gulpfile.coffee"; + text = ""; + fg = "#${base06}"; + } + { + name = "R"; + text = "󰟔"; + fg = "#${base06}"; + } + { + name = ".zshrc"; + text = ""; + fg = "#${base06}"; + } + { + name = ".prettierrc.toml"; + text = ""; + fg = "#${base06}"; + } + { + name = ".gvimrc"; + text = ""; + fg = "#${base06}"; + } + { + name = ".xsession"; + text = ""; + fg = "#${base06}"; + } + { + name = ".justfile"; + text = ""; + fg = "#${base06}"; + } + { + name = ".gitconfig"; + text = ""; + fg = "#${base06}"; + } + { + name = "gradle-wrapper.properties"; + text = ""; + fg = "#${base06}"; + } + { + name = "ionic.config.json"; + text = ""; + fg = "#${base06}"; + } + { + name = "cantorrc"; + text = ""; + fg = "#${base06}"; + } + { + name = ".gleam"; + text = ""; + fg = "#${base06}"; + } + { + name = "package-lock.json"; + text = ""; + fg = "#${base06}"; + } + { + name = "package.json"; + text = ""; + fg = "#${base06}"; + } + { + name = "hyprland.conf"; + text = ""; + fg = "#${base06}"; + } + { + name = "gulpfile.babel.js"; + text = ""; + fg = "#${base06}"; + } + { + name = ".nvmrc"; + text = ""; + fg = "#${base06}"; + } + { + name = ".prettierignore"; + text = ""; + fg = "#${base06}"; + } + { + name = "ext_typoscript_setup.txt"; + text = ""; + fg = "#${base06}"; + } + { + name = "QtProject.conf"; + text = ""; + fg = "#${base06}"; + } + { + name = "avif"; + text = ""; + fg = "#${base06}"; + } + { + name = "mix.lock"; + text = ""; + fg = "#${base06}"; + } + { + name = "build.gradle"; + text = ""; + fg = "#${base06}"; + } + { + name = "gemfile$"; + text = ""; + fg = "#${base06}"; + } + { + name = ".vimrc"; + text = ""; + fg = "#${base06}"; + } + { + name = "i18n.config.ts"; + text = "󰗊"; + fg = "#${base06}"; + } + { + name = "gulpfile.ts"; + text = ""; + fg = "#${base06}"; + } + { + name = "build.zig.zon"; + text = ""; + fg = "#${base06}"; + } + { + name = "checkhealth"; + text = "󰓙"; + fg = "#${base06}"; + } + { + name = "xmobarrc"; + text = ""; + fg = "#${base06}"; + } + { + name = "_vimrc"; + text = ""; + fg = "#${base06}"; + } + { + name = ".luaurc"; + text = ""; + fg = "#${base06}"; + } + { + name = "kdenlive-layoutsrc"; + text = ""; + fg = "#${base06}"; + } + { + name = "gradlew"; + text = ""; + fg = "#${base06}"; + } + { + name = "xsettingsd.conf"; + text = ""; + fg = "#${base06}"; + } + { + name = "vlcrc"; + text = "󰕼"; + fg = "#${base06}"; + } + { + name = "xorg.conf"; + text = ""; + fg = "#${base06}"; + } + { + name = "xmobarrc.hs"; + text = ""; + fg = "#${base06}"; + } + { + name = "workspace"; + text = ""; + fg = "#${base06}"; + } + { + name = ".gitattributes"; + text = ""; + fg = "#${base06}"; + } + { + name = "favicon.ico"; + text = ""; + fg = "#${base06}"; + } + { + name = "go.sum"; + text = ""; + fg = "#${base06}"; + } + { + name = "pom.xml"; + text = ""; + fg = "#${base06}"; + } + { + name = "webpack"; + text = "󰜫"; + fg = "#${base06}"; + } + { + name = "vagrantfile$"; + text = ""; + fg = "#${base06}"; + } + { + name = "unlicense"; + text = ""; + fg = "#${base06}"; + } + { + name = "tmux.conf.local"; + text = ""; + fg = "#${base06}"; + } + { + name = "settings.gradle"; + text = ""; + fg = "#${base06}"; + } + { + name = ".dockerignore"; + text = "󰡨"; + fg = "#${base06}"; + } + { + name = "sym-lib-table"; + text = ""; + fg = "#${base06}"; + } + { + name = "_gvimrc"; + text = ""; + fg = "#${base06}"; + } + { + name = "kdenliverc"; + text = ""; + fg = "#${base06}"; + } + { + name = "kdeglobals"; + text = ""; + fg = "#${base06}"; + } + { + name = ".prettierrc.yaml"; + text = ""; + fg = "#${base06}"; + } + { + name = "rmd"; + text = ""; + fg = "#${base06}"; + } + { + name = "tailwind.config.mjs"; + text = "󱏿"; + fg = "#${base06}"; + } + { + name = "sxhkdrc"; + text = ""; + fg = "#${base06}"; + } + { + name = "robots.txt"; + text = "󰚩"; + fg = "#${base06}"; + } + { + name = "tailwind.config.ts"; + text = "󱏿"; + fg = "#${base06}"; + } + { + name = "prettier.config.mjs"; + text = ""; + fg = "#${base06}"; + } + { + name = "mpv.conf"; + text = ""; + fg = "#${base06}"; + } + { + name = "py.typed"; + text = ""; + fg = "#${base06}"; + } + { + name = "PrusaSlicer.ini"; + text = ""; + fg = "#${base06}"; + } + { + name = "procfile"; + text = ""; + fg = "#${base06}"; + } + { + name = "rakefile"; + text = ""; + fg = "#${base06}"; + } + { + name = "kritarc"; + text = ""; + fg = "#${base06}"; + } + { + name = ".Xresources"; + text = ""; + fg = "#${base06}"; + } + { + name = "prettier.config.js"; + text = ""; + fg = "#${base06}"; + } + { + name = "commitlint.config.ts"; + text = "󰜘"; + fg = "#${base06}"; + } + { + name = "weston.ini"; + text = ""; + fg = "#${base06}"; + } + { + name = "eslint.config.js"; + text = ""; + fg = "#${base06}"; + } + { + name = "cmakelists.txt"; + text = ""; + fg = "#${base06}"; + } + { + name = ".git-blame-ignore-revs"; + text = ""; + fg = "#${base06}"; + } + { + name = "config"; + text = ""; + fg = "#${base06}"; + } + { + name = "nuxt.config.cjs"; + text = "󱄆"; + fg = "#${base06}"; + } + { + name = "node_modules"; + text = ""; + fg = "#${base06}"; + } + { + name = "makefile"; + text = ""; + fg = "#${base06}"; + } + { + name = "lxqt.conf"; + text = ""; + fg = "#${base06}"; + } + { + name = "i18n.config.js"; + text = "󰗊"; + fg = "#${base06}"; + } + { + name = "FreeCAD.conf"; + text = ""; + fg = "#${base06}"; + } + { + name = "prettier.config.cjs"; + text = ""; + fg = "#${base06}"; + } + { + name = "tmux.conf"; + text = ""; + fg = "#${base06}"; + } + { + name = "kalgebrarc"; + text = ""; + fg = "#${base06}"; + } + { + name = "i3status.conf"; + text = ""; + fg = "#${base06}"; + } + { + name = ".settings.json"; + text = ""; + fg = "#${base06}"; + } + { + name = "containerfile"; + text = "󰡨"; + fg = "#${base06}"; + } + { + name = "i3blocks.conf"; + text = ""; + fg = "#${base06}"; + } + { + name = "lxde-rc.xml"; + text = ""; + fg = "#${base06}"; + } + { + name = "gradle.properties"; + text = ""; + fg = "#${base06}"; + } + { + name = "hypridle.conf"; + text = ""; + fg = "#${base06}"; + } + { + name = "gruntfile.ts"; + text = ""; + fg = "#${base06}"; + } + { + name = "gruntfile.js"; + text = ""; + fg = "#${base06}"; + } + { + name = "dockerfile"; + text = "󰡨"; + fg = "#${base06}"; + } + { + name = "groovy"; + text = ""; + fg = "#${base06}"; + } + { + name = "hyprlock.conf"; + text = ""; + fg = "#${base06}"; + } + { + name = ".prettierrc"; + text = ""; + fg = "#${base06}"; + } + { + name = "gnumakefile"; + text = ""; + fg = "#${base06}"; + } + { + name = "commit_editmsg"; + text = ""; + fg = "#${base06}"; + } + { + name = "fp-lib-table"; + text = ""; + fg = "#${base06}"; + } + { + name = "fp-info-cache"; + text = ""; + fg = "#${base06}"; + } + { + name = "eslint.config.ts"; + text = ""; + fg = "#${base06}"; + } + { + name = "nuxt.config.js"; + text = "󱄆"; + fg = "#${base06}"; + } + { + name = "platformio.ini"; + text = ""; + fg = "#${base06}"; + } + { + name = ".nuxtrc"; + text = "󱄆"; + fg = "#${base06}"; + } + { + name = "gruntfile.coffee"; + text = ""; + fg = "#${base06}"; + } + { + name = "eslint.config.mjs"; + text = ""; + fg = "#${base06}"; + } + { + name = "compose.yaml"; + text = "󰡨"; + fg = "#${base06}"; + } + { + name = "bspwmrc"; + text = ""; + fg = "#${base06}"; + } + { + name = "brewfile"; + text = ""; + fg = "#${base06}"; + } + { + name = ".eslintrc"; + text = ""; + fg = "#${base06}"; + } + { + name = ".gtkrc-2.0"; + text = ""; + fg = "#${base06}"; + } + { + name = ".Xauthority"; + text = ""; + fg = "#${base06}"; + } + { + name = ".prettierrc.json"; + text = ""; + fg = "#${base06}"; + } + { + name = ".npmignore"; + text = ""; + fg = "#${base06}"; + } + { + name = ".gitmodules"; + text = ""; + fg = "#${base06}"; + } + ]; + }; }; - which = { - cols = 3; - mask = { bg = "#${base01}"; }; - }; - filetype = { - rules = [ - { mime = "{audio,video}/*"; fg = "#${base0C}"; } - { name = "*"; fg = "#${base06}"; } - { name = "*/"; fg = "#${base06}"; } - ]; - }; - icon = { - exts = [ - { name = "3gp"; text = ""; fg = "#${base06}"; } - { name = "3mf"; text = "󰆧"; fg = "#${base06}"; } - { name = "7z"; text = ""; fg = "#${base06}"; } - { name = "a"; text = ""; fg = "#${base06}"; } - { name = "aac"; text = ""; fg = "#${base06}"; } - { name = "ai"; text = ""; fg = "#${base06}"; } - { name = "aif"; text = ""; fg = "#${base06}"; } - { name = "aiff"; text = ""; fg = "#${base06}"; } - { name = "android"; text = ""; fg = "#${base06}"; } - { name = "ape"; text = ""; fg = "#${base06}"; } - { name = "apk"; text = ""; fg = "#${base06}"; } - { name = "app"; text = ""; fg = "#${base06}"; } - { name = "applescript"; text = ""; fg = "#${base06}"; } - { name = "asc"; text = "󰦝"; fg = "#${base06}"; } - { name = "ass"; text = "󰨖"; fg = "#${base06}"; } - { name = "astro"; text = ""; fg = "#${base06}"; } - { name = "awk"; text = ""; fg = "#${base06}"; } - { name = "azcli"; text = ""; fg = "#${base06}"; } - { name = "bak"; text = "󰁯"; fg = "#${base06}"; } - { name = "bash"; text = ""; fg = "#${base06}"; } - { name = "bat"; text = ""; fg = "#${base06}"; } - { name = "bazel"; text = ""; fg = "#${base06}"; } - { name = "bib"; text = "󱉟"; fg = "#${base06}"; } - { name = "bicep"; text = ""; fg = "#${base06}"; } - { name = "bicepparam"; text = ""; fg = "#${base06}"; } - { name = "bin"; text = ""; fg = "#${base06}"; } - { name = "blade.php"; text = ""; fg = "#${base06}"; } - { name = "blend"; text = "󰂫"; fg = "#${base06}"; } - { name = "blp"; text = "󰺾"; fg = "#${base06}"; } - { name = "bmp"; text = ""; fg = "#${base06}"; } - { name = "brep"; text = "󰻫"; fg = "#${base06}"; } - { name = "bz"; text = ""; fg = "#${base06}"; } - { name = "bz2"; text = ""; fg = "#${base06}"; } - { name = "bz3"; text = ""; fg = "#${base06}"; } - { name = "bzl"; text = ""; fg = "#${base06}"; } - { name = "c"; text = ""; fg = "#${base06}"; } - { name = "c++"; text = ""; fg = "#${base06}"; } - { name = "cache"; text = ""; fg = "#${base06}"; } - { name = "cast"; text = ""; fg = "#${base06}"; } - { name = "cbl"; text = "⚙"; fg = "#${base06}"; } - { name = "cc"; text = ""; fg = "#${base06}"; } - { name = "ccm"; text = ""; fg = "#${base06}"; } - { name = "cfg"; text = ""; fg = "#${base06}"; } - { name = "cjs"; text = ""; fg = "#${base06}"; } - { name = "clj"; text = ""; fg = "#${base06}"; } - { name = "cljc"; text = ""; fg = "#${base06}"; } - { name = "cljd"; text = ""; fg = "#${base06}"; } - { name = "cljs"; text = ""; fg = "#${base06}"; } - { name = "cmake"; text = ""; fg = "#${base06}"; } - { name = "cob"; text = "⚙"; fg = "#${base06}"; } - { name = "cobol"; text = "⚙"; fg = "#${base06}"; } - { name = "coffee"; text = ""; fg = "#${base06}"; } - { name = "conf"; text = ""; fg = "#${base06}"; } - { name = "config.ru"; text = ""; fg = "#${base06}"; } - { name = "cp"; text = ""; fg = "#${base06}"; } - { name = "cpp"; text = ""; fg = "#${base06}"; } - { name = "cppm"; text = ""; fg = "#${base06}"; } - { name = "cpy"; text = "⚙"; fg = "#${base06}"; } - { name = "cr"; text = ""; fg = "#${base06}"; } - { name = "crdownload"; text = ""; fg = "#${base06}"; } - { name = "cs"; text = "󰌛"; fg = "#${base06}"; } - { name = "csh"; text = ""; fg = "#${base06}"; } - { name = "cshtml"; text = "󱦗"; fg = "#${base06}"; } - { name = "cson"; text = ""; fg = "#${base06}"; } - { name = "csproj"; text = "󰪮"; fg = "#${base06}"; } - { name = "css"; text = ""; fg = "#${base06}"; } - { name = "csv"; text = ""; fg = "#${base06}"; } - { name = "cts"; text = ""; fg = "#${base06}"; } - { name = "cu"; text = ""; fg = "#${base06}"; } - { name = "cue"; text = "󰲹"; fg = "#${base06}"; } - { name = "cuh"; text = ""; fg = "#${base06}"; } - { name = "cxx"; text = ""; fg = "#${base06}"; } - { name = "cxxm"; text = ""; fg = "#${base06}"; } - { name = "d"; text = ""; fg = "#${base06}"; } - { name = "d.ts"; text = ""; fg = "#${base06}"; } - { name = "dart"; text = ""; fg = "#${base06}"; } - { name = "db"; text = ""; fg = "#${base06}"; } - { name = "dconf"; text = ""; fg = "#${base06}"; } - { name = "desktop"; text = ""; fg = "#${base06}"; } - { name = "diff"; text = ""; fg = "#${base06}"; } - { name = "dll"; text = ""; fg = "#${base06}"; } - { name = "doc"; text = "󰈬"; fg = "#${base06}"; } - { name = "Dockerfile"; text = "󰡨"; fg = "#${base06}"; } - { name = "docx"; text = "󰈬"; fg = "#${base06}"; } - { name = "dot"; text = "󱁉"; fg = "#${base06}"; } - { name = "download"; text = ""; fg = "#${base06}"; } - { name = "drl"; text = ""; fg = "#${base06}"; } - { name = "dropbox"; text = ""; fg = "#${base06}"; } - { name = "dump"; text = ""; fg = "#${base06}"; } - { name = "dwg"; text = "󰻫"; fg = "#${base06}"; } - { name = "dxf"; text = "󰻫"; fg = "#${base06}"; } - { name = "ebook"; text = ""; fg = "#${base06}"; } - { name = "edn"; text = ""; fg = "#${base06}"; } - { name = "eex"; text = ""; fg = "#${base06}"; } - { name = "ejs"; text = ""; fg = "#${base06}"; } - { name = "el"; text = ""; fg = "#${base06}"; } - { name = "elc"; text = ""; fg = "#${base06}"; } - { name = "elf"; text = ""; fg = "#${base06}"; } - { name = "elm"; text = ""; fg = "#${base06}"; } - { name = "eln"; text = ""; fg = "#${base06}"; } - { name = "env"; text = ""; fg = "#${base06}"; } - { name = "eot"; text = ""; fg = "#${base06}"; } - { name = "epp"; text = ""; fg = "#${base06}"; } - { name = "epub"; text = ""; fg = "#${base06}"; } - { name = "erb"; text = ""; fg = "#${base06}"; } - { name = "erl"; text = ""; fg = "#${base06}"; } - { name = "ex"; text = ""; fg = "#${base06}"; } - { name = "exe"; text = ""; fg = "#${base06}"; } - { name = "exs"; text = ""; fg = "#${base06}"; } - { name = "f#"; text = ""; fg = "#${base06}"; } - { name = "f3d"; text = "󰻫"; fg = "#${base06}"; } - { name = "f90"; text = "󱈚"; fg = "#${base06}"; } - { name = "fbx"; text = "󰆧"; fg = "#${base06}"; } - { name = "fcbak"; text = ""; fg = "#${base06}"; } - { name = "fcmacro"; text = ""; fg = "#${base06}"; } - { name = "fcmat"; text = ""; fg = "#${base06}"; } - { name = "fcparam"; text = ""; fg = "#${base06}"; } - { name = "fcscript"; text = ""; fg = "#${base06}"; } - { name = "fcstd"; text = ""; fg = "#${base06}"; } - { name = "fcstd1"; text = ""; fg = "#${base06}"; } - { name = "fctb"; text = ""; fg = "#${base06}"; } - { name = "fctl"; text = ""; fg = "#${base06}"; } - { name = "fdmdownload"; text = ""; fg = "#${base06}"; } - { name = "fish"; text = ""; fg = "#${base06}"; } - { name = "flac"; text = ""; fg = "#${base06}"; } - { name = "flc"; text = ""; fg = "#${base06}"; } - { name = "flf"; text = ""; fg = "#${base06}"; } - { name = "fnl"; text = ""; fg = "#${base06}"; } - { name = "fs"; text = ""; fg = "#${base06}"; } - { name = "fsi"; text = ""; fg = "#${base06}"; } - { name = "fsscript"; text = ""; fg = "#${base06}"; } - { name = "fsx"; text = ""; fg = "#${base06}"; } - { name = "gcode"; text = "󰐫"; fg = "#${base06}"; } - { name = "gd"; text = ""; fg = "#${base06}"; } - { name = "gemspec"; text = ""; fg = "#${base06}"; } - { name = "gif"; text = ""; fg = "#${base06}"; } - { name = "git"; text = ""; fg = "#${base06}"; } - { name = "glb"; text = ""; fg = "#${base06}"; } - { name = "gnumakefile"; text = ""; fg = "#${base06}"; } - { name = "go"; text = ""; fg = "#${base06}"; } - { name = "godot"; text = ""; fg = "#${base06}"; } - { name = "gql"; text = ""; fg = "#${base06}"; } - { name = "graphql"; text = ""; fg = "#${base06}"; } - { name = "gresource"; text = ""; fg = "#${base06}"; } - { name = "gv"; text = "󱁉"; fg = "#${base06}"; } - { name = "gz"; text = ""; fg = "#${base06}"; } - { name = "h"; text = ""; fg = "#${base06}"; } - { name = "haml"; text = ""; fg = "#${base06}"; } - { name = "hbs"; text = ""; fg = "#${base06}"; } - { name = "heex"; text = ""; fg = "#${base06}"; } - { name = "hex"; text = ""; fg = "#${base06}"; } - { name = "hh"; text = ""; fg = "#${base06}"; } - { name = "hpp"; text = ""; fg = "#${base06}"; } - { name = "hrl"; text = ""; fg = "#${base06}"; } - { name = "hs"; text = ""; fg = "#${base06}"; } - { name = "htm"; text = ""; fg = "#${base06}"; } - { name = "html"; text = ""; fg = "#${base06}"; } - { name = "huff"; text = "󰡘"; fg = "#${base06}"; } - { name = "hurl"; text = ""; fg = "#${base06}"; } - { name = "hx"; text = ""; fg = "#${base06}"; } - { name = "hxx"; text = ""; fg = "#${base06}"; } - { name = "ical"; text = ""; fg = "#${base06}"; } - { name = "icalendar"; text = ""; fg = "#${base06}"; } - { name = "ico"; text = ""; fg = "#${base06}"; } - { name = "ics"; text = ""; fg = "#${base06}"; } - { name = "ifb"; text = ""; fg = "#${base06}"; } - { name = "ifc"; text = "󰻫"; fg = "#${base06}"; } - { name = "ige"; text = "󰻫"; fg = "#${base06}"; } - { name = "iges"; text = "󰻫"; fg = "#${base06}"; } - { name = "igs"; text = "󰻫"; fg = "#${base06}"; } - { name = "image"; text = ""; fg = "#${base06}"; } - { name = "img"; text = ""; fg = "#${base06}"; } - { name = "import"; text = ""; fg = "#${base06}"; } - { name = "info"; text = ""; fg = "#${base06}"; } - { name = "ini"; text = ""; fg = "#${base06}"; } - { name = "ino"; text = ""; fg = "#${base06}"; } - { name = "ipynb"; text = ""; fg = "#${base06}"; } - { name = "iso"; text = ""; fg = "#${base06}"; } - { name = "ixx"; text = ""; fg = "#${base06}"; } - { name = "java"; text = ""; fg = "#${base06}"; } - { name = "jl"; text = ""; fg = "#${base06}"; } - { name = "jpeg"; text = ""; fg = "#${base06}"; } - { name = "jpg"; text = ""; fg = "#${base06}"; } - { name = "js"; text = ""; fg = "#${base06}"; } - { name = "json"; text = ""; fg = "#${base06}"; } - { name = "json5"; text = ""; fg = "#${base06}"; } - { name = "jsonc"; text = ""; fg = "#${base06}"; } - { name = "jsx"; text = ""; fg = "#${base06}"; } - { name = "jwmrc"; text = ""; fg = "#${base06}"; } - { name = "jxl"; text = ""; fg = "#${base06}"; } - { name = "kbx"; text = "󰯄"; fg = "#${base06}"; } - { name = "kdb"; text = ""; fg = "#${base06}"; } - { name = "kdbx"; text = ""; fg = "#${base06}"; } - { name = "kdenlive"; text = ""; fg = "#${base06}"; } - { name = "kdenlivetitle"; text = ""; fg = "#${base06}"; } - { name = "kicad_dru"; text = ""; fg = "#${base06}"; } - { name = "kicad_mod"; text = ""; fg = "#${base06}"; } - { name = "kicad_pcb"; text = ""; fg = "#${base06}"; } - { name = "kicad_prl"; text = ""; fg = "#${base06}"; } - { name = "kicad_pro"; text = ""; fg = "#${base06}"; } - { name = "kicad_sch"; text = ""; fg = "#${base06}"; } - { name = "kicad_sym"; text = ""; fg = "#${base06}"; } - { name = "kicad_wks"; text = ""; fg = "#${base06}"; } - { name = "ko"; text = ""; fg = "#${base06}"; } - { name = "kpp"; text = ""; fg = "#${base06}"; } - { name = "kra"; text = ""; fg = "#${base06}"; } - { name = "krz"; text = ""; fg = "#${base06}"; } - { name = "ksh"; text = ""; fg = "#${base06}"; } - { name = "kt"; text = ""; fg = "#${base06}"; } - { name = "kts"; text = ""; fg = "#${base06}"; } - { name = "lck"; text = ""; fg = "#${base06}"; } - { name = "leex"; text = ""; fg = "#${base06}"; } - { name = "less"; text = ""; fg = "#${base06}"; } - { name = "lff"; text = ""; fg = "#${base06}"; } - { name = "lhs"; text = ""; fg = "#${base06}"; } - { name = "lib"; text = ""; fg = "#${base06}"; } - { name = "license"; text = ""; fg = "#${base06}"; } - { name = "liquid"; text = ""; fg = "#${base06}"; } - { name = "lock"; text = ""; fg = "#${base06}"; } - { name = "log"; text = "󰌱"; fg = "#${base06}"; } - { name = "lrc"; text = "󰨖"; fg = "#${base06}"; } - { name = "lua"; text = ""; fg = "#${base06}"; } - { name = "luac"; text = ""; fg = "#${base06}"; } - { name = "luau"; text = ""; fg = "#${base06}"; } - { name = "m"; text = ""; fg = "#${base06}"; } - { name = "m3u"; text = "󰲹"; fg = "#${base06}"; } - { name = "m3u8"; text = "󰲹"; fg = "#${base06}"; } - { name = "m4a"; text = ""; fg = "#${base06}"; } - { name = "m4v"; text = ""; fg = "#${base06}"; } - { name = "magnet"; text = ""; fg = "#${base06}"; } - { name = "makefile"; text = ""; fg = "#${base06}"; } - { name = "markdown"; text = ""; fg = "#${base06}"; } - { name = "material"; text = "󰔉"; fg = "#${base06}"; } - { name = "md"; text = ""; fg = "#${base06}"; } - { name = "md5"; text = "󰕥"; fg = "#${base06}"; } - { name = "mdx"; text = ""; fg = "#${base06}"; } - { name = "mint"; text = "󰌪"; fg = "#${base06}"; } - { name = "mjs"; text = ""; fg = "#${base06}"; } - { name = "mk"; text = ""; fg = "#${base06}"; } - { name = "mkv"; text = ""; fg = "#${base06}"; } - { name = "ml"; text = ""; fg = "#${base06}"; } - { name = "mli"; text = ""; fg = "#${base06}"; } - { name = "mm"; text = ""; fg = "#${base06}"; } - { name = "mo"; text = "∞"; fg = "#${base06}"; } - { name = "mobi"; text = ""; fg = "#${base06}"; } - { name = "mov"; text = ""; fg = "#${base06}"; } - { name = "mp3"; text = ""; fg = "#${base06}"; } - { name = "mp4"; text = ""; fg = "#${base06}"; } - { name = "mpp"; text = ""; fg = "#${base06}"; } - { name = "msf"; text = ""; fg = "#${base06}"; } - { name = "mts"; text = ""; fg = "#${base06}"; } - { name = "mustache"; text = ""; fg = "#${base06}"; } - { name = "nfo"; text = ""; fg = "#${base06}"; } - { name = "nim"; text = ""; fg = "#${base06}"; } - { name = "nix"; text = ""; fg = "#${base06}"; } - { name = "nswag"; text = ""; fg = "#${base06}"; } - { name = "nu"; text = ">"; fg = "#${base06}"; } - { name = "o"; text = ""; fg = "#${base06}"; } - { name = "obj"; text = "󰆧"; fg = "#${base06}"; } - { name = "ogg"; text = ""; fg = "#${base06}"; } - { name = "opus"; text = ""; fg = "#${base06}"; } - { name = "org"; text = ""; fg = "#${base06}"; } - { name = "otf"; text = ""; fg = "#${base06}"; } - { name = "out"; text = ""; fg = "#${base06}"; } - { name = "part"; text = ""; fg = "#${base06}"; } - { name = "patch"; text = ""; fg = "#${base06}"; } - { name = "pck"; text = ""; fg = "#${base06}"; } - { name = "pcm"; text = ""; fg = "#${base06}"; } - { name = "pdf"; text = ""; fg = "#${base06}"; } - { name = "php"; text = ""; fg = "#${base06}"; } - { name = "pl"; text = ""; fg = "#${base06}"; } - { name = "pls"; text = "󰲹"; fg = "#${base06}"; } - { name = "ply"; text = "󰆧"; fg = "#${base06}"; } - { name = "pm"; text = ""; fg = "#${base06}"; } - { name = "png"; text = ""; fg = "#${base06}"; } - { name = "po"; text = ""; fg = "#${base06}"; } - { name = "pot"; text = ""; fg = "#${base06}"; } - { name = "pp"; text = ""; fg = "#${base06}"; } - { name = "ppt"; text = "󰈧"; fg = "#${base06}"; } - { name = "prisma"; text = ""; fg = "#${base06}"; } - { name = "pro"; text = ""; fg = "#${base06}"; } - { name = "ps1"; text = "󰨊"; fg = "#${base06}"; } - { name = "psb"; text = ""; fg = "#${base06}"; } - { name = "psd"; text = ""; fg = "#${base06}"; } - { name = "psd1"; text = "󰨊"; fg = "#${base06}"; } - { name = "psm1"; text = "󰨊"; fg = "#${base06}"; } - { name = "pub"; text = "󰷖"; fg = "#${base06}"; } - { name = "pxd"; text = ""; fg = "#${base06}"; } - { name = "pxi"; text = ""; fg = "#${base06}"; } - { name = "py"; text = ""; fg = "#${base06}"; } - { name = "pyc"; text = ""; fg = "#${base06}"; } - { name = "pyd"; text = ""; fg = "#${base06}"; } - { name = "pyi"; text = ""; fg = "#${base06}"; } - { name = "pyo"; text = ""; fg = "#${base06}"; } - { name = "pyx"; text = ""; fg = "#${base06}"; } - { name = "qm"; text = ""; fg = "#${base06}"; } - { name = "qml"; text = ""; fg = "#${base06}"; } - { name = "qrc"; text = ""; fg = "#${base06}"; } - { name = "qss"; text = ""; fg = "#${base06}"; } - { name = "query"; text = ""; fg = "#${base06}"; } - { name = "r"; text = "󰟔"; fg = "#${base06}"; } - { name = "rake"; text = ""; fg = "#${base06}"; } - { name = "rar"; text = ""; fg = "#${base06}"; } - { name = "razor"; text = "󱦘"; fg = "#${base06}"; } - { name = "rb"; text = ""; fg = "#${base06}"; } - { name = "res"; text = ""; fg = "#${base06}"; } - { name = "resi"; text = ""; fg = "#${base06}"; } - { name = "rlib"; text = ""; fg = "#${base06}"; } - { name = "rmd"; text = ""; fg = "#${base06}"; } - { name = "rproj"; text = "󰗆"; fg = "#${base06}"; } - { name = "rs"; text = ""; fg = "#${base06}"; } - { name = "rss"; text = ""; fg = "#${base06}"; } - { name = "sass"; text = ""; fg = "#${base06}"; } - { name = "sbt"; text = ""; fg = "#${base06}"; } - { name = "sc"; text = ""; fg = "#${base06}"; } - { name = "scad"; text = ""; fg = "#${base06}"; } - { name = "scala"; text = ""; fg = "#${base06}"; } - { name = "scm"; text = "󰘧"; fg = "#${base06}"; } - { name = "scss"; text = ""; fg = "#${base06}"; } - { name = "sh"; text = ""; fg = "#${base06}"; } - { name = "sha1"; text = "󰕥"; fg = "#${base06}"; } - { name = "sha224"; text = "󰕥"; fg = "#${base06}"; } - { name = "sha256"; text = "󰕥"; fg = "#${base06}"; } - { name = "sha384"; text = "󰕥"; fg = "#${base06}"; } - { name = "sha512"; text = "󰕥"; fg = "#${base06}"; } - { name = "sig"; text = "λ"; fg = "#${base06}"; } - { name = "signature"; text = "λ"; fg = "#${base06}"; } - { name = "skp"; text = "󰻫"; fg = "#${base06}"; } - { name = "sldasm"; text = "󰻫"; fg = "#${base06}"; } - { name = "sldprt"; text = "󰻫"; fg = "#${base06}"; } - { name = "slim"; text = ""; fg = "#${base06}"; } - { name = "sln"; text = ""; fg = "#${base06}"; } - { name = "slvs"; text = "󰻫"; fg = "#${base06}"; } - { name = "sml"; text = "λ"; fg = "#${base06}"; } - { name = "so"; text = ""; fg = "#${base06}"; } - { name = "sol"; text = ""; fg = "#${base06}"; } - { name = "spec.js"; text = ""; fg = "#${base06}"; } - { name = "spec.jsx"; text = ""; fg = "#${base06}"; } - { name = "spec.ts"; text = ""; fg = "#${base06}"; } - { name = "spec.tsx"; text = ""; fg = "#${base06}"; } - { name = "sql"; text = ""; fg = "#${base06}"; } - { name = "sqlite"; text = ""; fg = "#${base06}"; } - { name = "sqlite3"; text = ""; fg = "#${base06}"; } - { name = "srt"; text = "󰨖"; fg = "#${base06}"; } - { name = "ssa"; text = "󰨖"; fg = "#${base06}"; } - { name = "ste"; text = "󰻫"; fg = "#${base06}"; } - { name = "step"; text = "󰻫"; fg = "#${base06}"; } - { name = "stl"; text = "󰆧"; fg = "#${base06}"; } - { name = "stp"; text = "󰻫"; fg = "#${base06}"; } - { name = "strings"; text = ""; fg = "#${base06}"; } - { name = "styl"; text = ""; fg = "#${base06}"; } - { name = "sub"; text = "󰨖"; fg = "#${base06}"; } - { name = "sublime"; text = ""; fg = "#${base06}"; } - { name = "suo"; text = ""; fg = "#${base06}"; } - { name = "sv"; text = "󰍛"; fg = "#${base06}"; } - { name = "svelte"; text = ""; fg = "#${base06}"; } - { name = "svg"; text = "󰜡"; fg = "#${base06}"; } - { name = "svh"; text = "󰍛"; fg = "#${base06}"; } - { name = "swift"; text = ""; fg = "#${base06}"; } - { name = "t"; text = ""; fg = "#${base06}"; } - { name = "tbc"; text = "󰛓"; fg = "#${base06}"; } - { name = "tcl"; text = "󰛓"; fg = "#${base06}"; } - { name = "templ"; text = ""; fg = "#${base06}"; } - { name = "terminal"; text = ""; fg = "#${base06}"; } - { name = "test.js"; text = ""; fg = "#${base06}"; } - { name = "test.jsx"; text = ""; fg = "#${base06}"; } - { name = "test.ts"; text = ""; fg = "#${base06}"; } - { name = "test.tsx"; text = ""; fg = "#${base06}"; } - { name = "tex"; text = ""; fg = "#${base06}"; } - { name = "tf"; text = ""; fg = "#${base06}"; } - { name = "tfvars"; text = ""; fg = "#${base06}"; } - { name = "tgz"; text = ""; fg = "#${base06}"; } - { name = "tmux"; text = ""; fg = "#${base06}"; } - { name = "toml"; text = ""; fg = "#${base06}"; } - { name = "torrent"; text = ""; fg = "#${base06}"; } - { name = "tres"; text = ""; fg = "#${base06}"; } - { name = "ts"; text = ""; fg = "#${base06}"; } - { name = "tscn"; text = ""; fg = "#${base06}"; } - { name = "tsconfig"; text = ""; fg = "#${base06}"; } - { name = "tsx"; text = ""; fg = "#${base06}"; } - { name = "ttf"; text = ""; fg = "#${base06}"; } - { name = "twig"; text = ""; fg = "#${base06}"; } - { name = "txt"; text = "󰈙"; fg = "#${base06}"; } - { name = "txz"; text = ""; fg = "#${base06}"; } - { name = "typoscript"; text = ""; fg = "#${base06}"; } - { name = "ui"; text = ""; fg = "#${base06}"; } - { name = "v"; text = "󰍛"; fg = "#${base06}"; } - { name = "vala"; text = ""; fg = "#${base06}"; } - { name = "vh"; text = "󰍛"; fg = "#${base06}"; } - { name = "vhd"; text = "󰍛"; fg = "#${base06}"; } - { name = "vhdl"; text = "󰍛"; fg = "#${base06}"; } - { name = "vim"; text = ""; fg = "#${base06}"; } - { name = "vsh"; text = ""; fg = "#${base06}"; } - { name = "vsix"; text = ""; fg = "#${base06}"; } - { name = "vue"; text = ""; fg = "#${base06}"; } - { name = "wasm"; text = ""; fg = "#${base06}"; } - { name = "wav"; text = ""; fg = "#${base06}"; } - { name = "webm"; text = ""; fg = "#${base06}"; } - { name = "webmanifest"; text = ""; fg = "#${base06}"; } - { name = "webp"; text = ""; fg = "#${base06}"; } - { name = "webpack"; text = "󰜫"; fg = "#${base06}"; } - { name = "wma"; text = ""; fg = "#${base06}"; } - { name = "woff"; text = ""; fg = "#${base06}"; } - { name = "woff2"; text = ""; fg = "#${base06}"; } - { name = "wrl"; text = "󰆧"; fg = "#${base06}"; } - { name = "wrz"; text = "󰆧"; fg = "#${base06}"; } - { name = "x"; text = ""; fg = "#${base06}"; } - { name = "xaml"; text = "󰙳"; fg = "#${base06}"; } - { name = "xcf"; text = ""; fg = "#${base06}"; } - { name = "xcplayground"; text = ""; fg = "#${base06}"; } - { name = "xcstrings"; text = ""; fg = "#${base06}"; } - { name = "xls"; text = "󰈛"; fg = "#${base06}"; } - { name = "xlsx"; text = "󰈛"; fg = "#${base06}"; } - { name = "xm"; text = ""; fg = "#${base06}"; } - { name = "xml"; text = "󰗀"; fg = "#${base06}"; } - { name = "xpi"; text = ""; fg = "#${base06}"; } - { name = "xul"; text = ""; fg = "#${base06}"; } - { name = "xz"; text = ""; fg = "#${base06}"; } - { name = "yaml"; text = ""; fg = "#${base06}"; } - { name = "yml"; text = ""; fg = "#${base06}"; } - { name = "zig"; text = ""; fg = "#${base06}"; } - { name = "zip"; text = ""; fg = "#${base06}"; } - { name = "zsh"; text = ""; fg = "#${base06}"; } - { name = "zst"; text = ""; fg = "#${base06}"; } - ]; - files = [ - { name = "gulpfile.js"; text = ""; fg = "#${base06}"; } - { name = ".babelrc"; text = ""; fg = "#${base06}"; } - { name = "copying.lesser"; text = ""; fg = "#${base06}"; } - { name = ".npmrc"; text = ""; fg = "#${base06}"; } - { name = "docker-compose.yml"; text = "󰡨"; fg = "#${base06}"; } - { name = "svelte.config.js"; text = ""; fg = "#${base06}"; } - { name = "copying"; text = ""; fg = "#${base06}"; } - { name = "prettier.config.ts"; text = ""; fg = "#${base06}"; } - { name = "gruntfile.babel.js"; text = ""; fg = "#${base06}"; } - { name = ".SRCINFO"; text = "󰣇"; fg = "#${base06}"; } - { name = ".xinitrc"; text = ""; fg = "#${base06}"; } - { name = "docker-compose.yaml"; text = "󰡨"; fg = "#${base06}"; } - { name = "nuxt.config.ts"; text = "󱄆"; fg = "#${base06}"; } - { name = "build"; text = ""; fg = "#${base06}"; } - { name = ".editorconfig"; text = ""; fg = "#${base06}"; } - { name = "nuxt.config.mjs"; text = "󱄆"; fg = "#${base06}"; } - { name = ".gitlab-ci.yml"; text = ""; fg = "#${base06}"; } - { name = "PKGBUILD"; text = ""; fg = "#${base06}"; } - { name = ".bash_profile"; text = ""; fg = "#${base06}"; } - { name = ".bashrc"; text = ""; fg = "#${base06}"; } - { name = "compose.yml"; text = "󰡨"; fg = "#${base06}"; } - { name = "eslint.config.cjs"; text = ""; fg = "#${base06}"; } - { name = "go.mod"; text = ""; fg = "#${base06}"; } - { name = ".mailmap"; text = "󰊢"; fg = "#${base06}"; } - { name = "gtkrc"; text = ""; fg = "#${base06}"; } - { name = "go.work"; text = ""; fg = "#${base06}"; } - { name = "justfile"; text = ""; fg = "#${base06}"; } - { name = "kritadisplayrc"; text = ""; fg = "#${base06}"; } - { name = "commitlint.config.js"; text = "󰜘"; fg = "#${base06}"; } - { name = ".env"; text = ""; fg = "#${base06}"; } - { name = "PrusaSlicerGcodeViewer.ini"; text = ""; fg = "#${base06}"; } - { name = "r"; text = "󰟔"; fg = "#${base06}"; } - { name = "license"; text = ""; fg = "#${base06}"; } - { name = ".gitignore"; text = ""; fg = "#${base06}"; } - { name = "tailwind.config.js"; text = "󱏿"; fg = "#${base06}"; } - { name = ".prettierrc.yml"; text = ""; fg = "#${base06}"; } - { name = ".zprofile"; text = ""; fg = "#${base06}"; } - { name = ".zshenv"; text = ""; fg = "#${base06}"; } - { name = "xmonad.hs"; text = ""; fg = "#${base06}"; } - { name = ".eslintignore"; text = ""; fg = "#${base06}"; } - { name = "tsconfig.json"; text = ""; fg = "#${base06}"; } - { name = ".prettierrc.json5"; text = ""; fg = "#${base06}"; } - { name = ".ds_store"; text = ""; fg = "#${base06}"; } - { name = "gulpfile.coffee"; text = ""; fg = "#${base06}"; } - { name = "R"; text = "󰟔"; fg = "#${base06}"; } - { name = ".zshrc"; text = ""; fg = "#${base06}"; } - { name = ".prettierrc.toml"; text = ""; fg = "#${base06}"; } - { name = ".gvimrc"; text = ""; fg = "#${base06}"; } - { name = ".xsession"; text = ""; fg = "#${base06}"; } - { name = ".justfile"; text = ""; fg = "#${base06}"; } - { name = ".gitconfig"; text = ""; fg = "#${base06}"; } - { name = "gradle-wrapper.properties"; text = ""; fg = "#${base06}"; } - { name = "ionic.config.json"; text = ""; fg = "#${base06}"; } - { name = "cantorrc"; text = ""; fg = "#${base06}"; } - { name = ".gleam"; text = ""; fg = "#${base06}"; } - { name = "package-lock.json"; text = ""; fg = "#${base06}"; } - { name = "package.json"; text = ""; fg = "#${base06}"; } - { name = "hyprland.conf"; text = ""; fg = "#${base06}"; } - { name = "gulpfile.babel.js"; text = ""; fg = "#${base06}"; } - { name = ".nvmrc"; text = ""; fg = "#${base06}"; } - { name = ".prettierignore"; text = ""; fg = "#${base06}"; } - { name = "ext_typoscript_setup.txt"; text = ""; fg = "#${base06}"; } - { name = "QtProject.conf"; text = ""; fg = "#${base06}"; } - { name = "avif"; text = ""; fg = "#${base06}"; } - { name = "mix.lock"; text = ""; fg = "#${base06}"; } - { name = "build.gradle"; text = ""; fg = "#${base06}"; } - { name = "gemfile$"; text = ""; fg = "#${base06}"; } - { name = ".vimrc"; text = ""; fg = "#${base06}"; } - { name = "i18n.config.ts"; text = "󰗊"; fg = "#${base06}"; } - { name = "gulpfile.ts"; text = ""; fg = "#${base06}"; } - { name = "build.zig.zon"; text = ""; fg = "#${base06}"; } - { name = "checkhealth"; text = "󰓙"; fg = "#${base06}"; } - { name = "xmobarrc"; text = ""; fg = "#${base06}"; } - { name = "_vimrc"; text = ""; fg = "#${base06}"; } - { name = ".luaurc"; text = ""; fg = "#${base06}"; } - { name = "kdenlive-layoutsrc"; text = ""; fg = "#${base06}"; } - { name = "gradlew"; text = ""; fg = "#${base06}"; } - { name = "xsettingsd.conf"; text = ""; fg = "#${base06}"; } - { name = "vlcrc"; text = "󰕼"; fg = "#${base06}"; } - { name = "xorg.conf"; text = ""; fg = "#${base06}"; } - { name = "xmobarrc.hs"; text = ""; fg = "#${base06}"; } - { name = "workspace"; text = ""; fg = "#${base06}"; } - { name = ".gitattributes"; text = ""; fg = "#${base06}"; } - { name = "favicon.ico"; text = ""; fg = "#${base06}"; } - { name = "go.sum"; text = ""; fg = "#${base06}"; } - { name = "pom.xml"; text = ""; fg = "#${base06}"; } - { name = "webpack"; text = "󰜫"; fg = "#${base06}"; } - { name = "vagrantfile$"; text = ""; fg = "#${base06}"; } - { name = "unlicense"; text = ""; fg = "#${base06}"; } - { name = "tmux.conf.local"; text = ""; fg = "#${base06}"; } - { name = "settings.gradle"; text = ""; fg = "#${base06}"; } - { name = ".dockerignore"; text = "󰡨"; fg = "#${base06}"; } - { name = "sym-lib-table"; text = ""; fg = "#${base06}"; } - { name = "_gvimrc"; text = ""; fg = "#${base06}"; } - { name = "kdenliverc"; text = ""; fg = "#${base06}"; } - { name = "kdeglobals"; text = ""; fg = "#${base06}"; } - { name = ".prettierrc.yaml"; text = ""; fg = "#${base06}"; } - { name = "rmd"; text = ""; fg = "#${base06}"; } - { name = "tailwind.config.mjs"; text = "󱏿"; fg = "#${base06}"; } - { name = "sxhkdrc"; text = ""; fg = "#${base06}"; } - { name = "robots.txt"; text = "󰚩"; fg = "#${base06}"; } - { name = "tailwind.config.ts"; text = "󱏿"; fg = "#${base06}"; } - { name = "prettier.config.mjs"; text = ""; fg = "#${base06}"; } - { name = "mpv.conf"; text = ""; fg = "#${base06}"; } - { name = "py.typed"; text = ""; fg = "#${base06}"; } - { name = "PrusaSlicer.ini"; text = ""; fg = "#${base06}"; } - { name = "procfile"; text = ""; fg = "#${base06}"; } - { name = "rakefile"; text = ""; fg = "#${base06}"; } - { name = "kritarc"; text = ""; fg = "#${base06}"; } - { name = ".Xresources"; text = ""; fg = "#${base06}"; } - { name = "prettier.config.js"; text = ""; fg = "#${base06}"; } - { name = "commitlint.config.ts"; text = "󰜘"; fg = "#${base06}"; } - { name = "weston.ini"; text = ""; fg = "#${base06}"; } - { name = "eslint.config.js"; text = ""; fg = "#${base06}"; } - { name = "cmakelists.txt"; text = ""; fg = "#${base06}"; } - { name = ".git-blame-ignore-revs"; text = ""; fg = "#${base06}"; } - { name = "config"; text = ""; fg = "#${base06}"; } - { name = "nuxt.config.cjs"; text = "󱄆"; fg = "#${base06}"; } - { name = "node_modules"; text = ""; fg = "#${base06}"; } - { name = "makefile"; text = ""; fg = "#${base06}"; } - { name = "lxqt.conf"; text = ""; fg = "#${base06}"; } - { name = "i18n.config.js"; text = "󰗊"; fg = "#${base06}"; } - { name = "FreeCAD.conf"; text = ""; fg = "#${base06}"; } - { name = "prettier.config.cjs"; text = ""; fg = "#${base06}"; } - { name = "tmux.conf"; text = ""; fg = "#${base06}"; } - { name = "kalgebrarc"; text = ""; fg = "#${base06}"; } - { name = "i3status.conf"; text = ""; fg = "#${base06}"; } - { name = ".settings.json"; text = ""; fg = "#${base06}"; } - { name = "containerfile"; text = "󰡨"; fg = "#${base06}"; } - { name = "i3blocks.conf"; text = ""; fg = "#${base06}"; } - { name = "lxde-rc.xml"; text = ""; fg = "#${base06}"; } - { name = "gradle.properties"; text = ""; fg = "#${base06}"; } - { name = "hypridle.conf"; text = ""; fg = "#${base06}"; } - { name = "gruntfile.ts"; text = ""; fg = "#${base06}"; } - { name = "gruntfile.js"; text = ""; fg = "#${base06}"; } - { name = "dockerfile"; text = "󰡨"; fg = "#${base06}"; } - { name = "groovy"; text = ""; fg = "#${base06}"; } - { name = "hyprlock.conf"; text = ""; fg = "#${base06}"; } - { name = ".prettierrc"; text = ""; fg = "#${base06}"; } - { name = "gnumakefile"; text = ""; fg = "#${base06}"; } - { name = "commit_editmsg"; text = ""; fg = "#${base06}"; } - { name = "fp-lib-table"; text = ""; fg = "#${base06}"; } - { name = "fp-info-cache"; text = ""; fg = "#${base06}"; } - { name = "eslint.config.ts"; text = ""; fg = "#${base06}"; } - { name = "nuxt.config.js"; text = "󱄆"; fg = "#${base06}"; } - { name = "platformio.ini"; text = ""; fg = "#${base06}"; } - { name = ".nuxtrc"; text = "󱄆"; fg = "#${base06}"; } - { name = "gruntfile.coffee"; text = ""; fg = "#${base06}"; } - { name = "eslint.config.mjs"; text = ""; fg = "#${base06}"; } - { name = "compose.yaml"; text = "󰡨"; fg = "#${base06}"; } - { name = "bspwmrc"; text = ""; fg = "#${base06}"; } - { name = "brewfile"; text = ""; fg = "#${base06}"; } - { name = ".eslintrc"; text = ""; fg = "#${base06}"; } - { name = ".gtkrc-2.0"; text = ""; fg = "#${base06}"; } - { name = ".Xauthority"; text = ""; fg = "#${base06}"; } - { name = ".prettierrc.json"; text = ""; fg = "#${base06}"; } - { name = ".npmignore"; text = ""; fg = "#${base06}"; } - { name = ".gitmodules"; text = ""; fg = "#${base06}"; } - ]; - }; - }; } diff --git a/home/programs/cli/zoxide/default.nix b/home/programs/cli/zoxide/default.nix index 0412fd9..6a61eb3 100644 --- a/home/programs/cli/zoxide/default.nix +++ b/home/programs/cli/zoxide/default.nix @@ -1,9 +1,8 @@ -{ pkgs, ... }: -{ - programs.zoxide = { - enable = true; - enableFishIntegration = true; - enableZshIntegration = true; - options = [ "--cmd cd" ]; - }; +{ pkgs, ... }: { + programs.zoxide = { + enable = true; + enableFishIntegration = true; + enableZshIntegration = true; + options = [ "--cmd cd" ]; + }; } diff --git a/home/programs/custom-pkgs/anicliru/anicli-api.nix b/home/programs/custom-pkgs/anicliru/anicli-api.nix index 51f675b..b4dab3b 100644 --- a/home/programs/custom-pkgs/anicliru/anicli-api.nix +++ b/home/programs/custom-pkgs/anicliru/anicli-api.nix @@ -1,6 +1,6 @@ { lib, fetchPypi, python3Packages, python3 }: -python3Packages.buildPythonApplication rec{ +python3Packages.buildPythonApplication rec { pname = "anicli_api"; version = "0.6.11"; pyproject = true; @@ -11,20 +11,19 @@ python3Packages.buildPythonApplication rec{ hash = "sha256-1jfPl+Vh7c4zWjQJ/qdvFOhXBvVTX4iqShxoMtbN6j4="; }; - build-system = with python3Packages; [ - poetry-core - ]; + build-system = with python3Packages; [ poetry-core ]; dependencies = with python3Packages; [ - ( python3.withPackages ( ps: with ps; [ httpx ] ++ httpx.optional-dependencies.http2 ) ) - ( pkgs.callPackage ./chompjs.nix { } ) + (python3.withPackages + (ps: with ps; [ httpx ] ++ httpx.optional-dependencies.http2)) + (pkgs.callPackage ./chompjs.nix { }) attrs parsel tqdm ]; - + dontCheckRuntimeDeps = true; - + meta = with lib; { description = "anicli-api"; homepage = "https://github.com/vypivshiy/anicli-api"; # DEAD diff --git a/home/programs/custom-pkgs/anicliru/anicli-ru.nix b/home/programs/custom-pkgs/anicliru/anicli-ru.nix index 4c038e6..cf84623 100644 --- a/home/programs/custom-pkgs/anicliru/anicli-ru.nix +++ b/home/programs/custom-pkgs/anicliru/anicli-ru.nix @@ -1,6 +1,6 @@ -{ lib, pkgs , fetchPypi, python3Packages }: +{ lib, pkgs, fetchPypi, python3Packages }: -python3Packages.buildPythonApplication rec{ +python3Packages.buildPythonApplication rec { pname = "ani-cli-ru"; version = "5.0.12"; pyproject = true; @@ -11,10 +11,7 @@ python3Packages.buildPythonApplication rec{ hash = "sha256-s8uI0ch+SPqthHy+d0jcB6o5/Zqx89JHM68Q00nwCFA="; }; - build-system = with python3Packages; [ - hatchling - setuptools - ]; + build-system = with python3Packages; [ hatchling setuptools ]; dependencies = [ python3Packages.hatchling @@ -23,7 +20,8 @@ python3Packages.buildPythonApplication rec{ ]; meta = with lib; { - description = "Script to watch anime from terminal with russian translation, written in python."; + description = + "Script to watch anime from terminal with russian translation, written in python."; homepage = "https://github.com/vypivshiy/ani-cli-ru"; # DEAD license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ DADA30000 azikx ]; diff --git a/home/programs/custom-pkgs/anicliru/chompjs.nix b/home/programs/custom-pkgs/anicliru/chompjs.nix index 5d28140..5d1c0d2 100644 --- a/home/programs/custom-pkgs/anicliru/chompjs.nix +++ b/home/programs/custom-pkgs/anicliru/chompjs.nix @@ -1,6 +1,6 @@ { lib, pkgs, fetchPypi, python3Packages }: -python3Packages.buildPythonApplication rec{ +python3Packages.buildPythonApplication rec { pname = "chompjs"; version = "1.3.0"; pyproject = true; @@ -11,13 +11,9 @@ python3Packages.buildPythonApplication rec{ hash = "sha256-isCzF1XpOTSPsq8cwBw1fbUMhU+j1QbOeSGPwV8FaGg="; }; - build-system = with python3Packages; [ - setuptools - ]; + build-system = with python3Packages; [ setuptools ]; - dependencies = with python3Packages; [ - setuptools - ]; + dependencies = with python3Packages; [ setuptools ]; meta = with lib; { description = "chompjs"; diff --git a/home/programs/custom-pkgs/anicliru/eggella.nix b/home/programs/custom-pkgs/anicliru/eggella.nix index 95d06dd..992c03d 100644 --- a/home/programs/custom-pkgs/anicliru/eggella.nix +++ b/home/programs/custom-pkgs/anicliru/eggella.nix @@ -1,6 +1,6 @@ { lib, pkgs, fetchPypi, python3Packages }: -python3Packages.buildPythonApplication rec{ +python3Packages.buildPythonApplication rec { pname = "eggella"; version = "0.1.7"; pyproject = true; @@ -11,10 +11,7 @@ python3Packages.buildPythonApplication rec{ hash = "sha256-8Vo39BePA86wcLKs/F+u2N7tpIpPrEyEPp3POszy050="; }; - build-system = with python3Packages; [ - hatchling - setuptools - ]; + build-system = with python3Packages; [ hatchling setuptools ]; dependencies = [ python3Packages.prompt-toolkit diff --git a/home/programs/custom-pkgs/default.nix b/home/programs/custom-pkgs/default.nix index 1c665f1..822e21c 100644 --- a/home/programs/custom-pkgs/default.nix +++ b/home/programs/custom-pkgs/default.nix @@ -1,7 +1,7 @@ -{ pkgs, ... }: -{ - home.packages = with pkgs; [ - (callPackage ./anicliru/anicli-ru.nix { }) - # (callPackage ./torrserver/default.nix { }) - ]; +{ pkgs, ... }: { + home.packages = with pkgs; + [ + (callPackage ./anicliru/anicli-ru.nix { }) + # (callPackage ./torrserver/default.nix { }) + ]; } diff --git a/home/programs/default.nix b/home/programs/default.nix index c3cc195..b864dfb 100644 --- a/home/programs/default.nix +++ b/home/programs/default.nix @@ -1,9 +1 @@ -{ - imports = [ - ./custom-pkgs - ./shells - ./misc - ./cli - ./gui - ]; -} +{ imports = [ ./custom-pkgs ./shells ./misc ./cli ./gui ]; } diff --git a/home/programs/gui/ayugram/default.nix b/home/programs/gui/ayugram/default.nix index 44cde06..4ab921a 100644 --- a/home/programs/gui/ayugram/default.nix +++ b/home/programs/gui/ayugram/default.nix @@ -1,108 +1,107 @@ -{ ... }: -{ - home.file = { - ".local/share/AyuGramDesktop/tdata/ayu_settings.json".text = '' - { - "appIcon": "chibi2", - "channelBottomButton": 0, - "collapseSimilarChannels": true, - "deletedMark": "deleted", - "disableAds": true, - "disableCustomBackgrounds": false, - "disableNotificationsDelay": false, - "disableStories": false, - "editedMark": "edited", - "gifConfirmation": false, - "hideAllChatsFolder": true, - "hideFromBlocked": false, - "hideNotificationBadge": false, - "hideNotificationCounters": false, - "hideSimilarChannels": false, - "increaseWebviewHeight": false, - "increaseWebviewWidth": false, - "localPremium": true, - "markReadAfterAction": true, - "monoFont": "JetBrainsMono Nerd Font Mono", - "recentStickersCount": 40, - "saveDeletedMessages": true, - "saveMessagesHistory": true, - "sendOfflinePacketAfterOnline": false, - "sendOnlinePackets": true, - "sendReadMessages": true, - "sendReadStories": false, - "sendUploadProgress": true, - "showGhostToggleInDrawer": true, - "showGhostToggleInTray": true, - "showHideMessageInContextMenu": 0, - "showLReadToggleInDrawer": true, - "showMessageDetailsInContextMenu": 2, - "showMessageSeconds": false, - "showMessageShot": true, - "showPeerId": 2, - "showReactionsPanelInContextMenu": 1, - "showSReadToggleInDrawer": true, - "showStreamerToggleInDrawer": false, - "showStreamerToggleInTray": false, - "showUserMessagesInContextMenu": 2, - "showViewsPanelInContextMenu": 1, - "simpleQuotesAndReplies": true, - "spoofWebviewAsAndroid": false, - "stickerConfirmation": false, - "useScheduledMessages": false, - "voiceConfirmation": false - } - ''; - ".local/share/AyuGramDesktop/tdata/shortcuts-custom.json".text = '' - [ - { - "command": "quit_telegram", - "keys": "alt+q" - }, - { - "command": "folder1", - "keys": "alt+1" - }, - { - "command": "folder2", - "keys": "alt+2" - }, - { - "command": "folder3", - "keys": "alt+3" - }, - { - "command": "show_archive", - "keys": "alt+0" - }, - { - "command": "search", - "keys": "alt+/" - }, - { - "command": "show_contacts", - "keys": "alt+g" - }, - { - "command": "next_chat", - "keys": "alt+j" - }, - { - "command": "previous_chat", - "keys": "alt+k" - }, - { - "command": "next_folder", - "keys": "alt+l" - }, - { - "command": "previous_folder", - "keys": "alt+h" - }, - { - "command": "media_playpause", - "keys": "alt+p" - } - ] - ''; - }; +{ ... }: { + home.file = { + ".local/share/AyuGramDesktop/tdata/ayu_settings.json".text = '' + { + "appIcon": "chibi2", + "channelBottomButton": 0, + "collapseSimilarChannels": true, + "deletedMark": "deleted", + "disableAds": true, + "disableCustomBackgrounds": false, + "disableNotificationsDelay": false, + "disableStories": false, + "editedMark": "edited", + "gifConfirmation": false, + "hideAllChatsFolder": true, + "hideFromBlocked": false, + "hideNotificationBadge": false, + "hideNotificationCounters": false, + "hideSimilarChannels": false, + "increaseWebviewHeight": false, + "increaseWebviewWidth": false, + "localPremium": true, + "markReadAfterAction": true, + "monoFont": "JetBrainsMono Nerd Font Mono", + "recentStickersCount": 40, + "saveDeletedMessages": true, + "saveMessagesHistory": true, + "sendOfflinePacketAfterOnline": false, + "sendOnlinePackets": true, + "sendReadMessages": true, + "sendReadStories": false, + "sendUploadProgress": true, + "showGhostToggleInDrawer": true, + "showGhostToggleInTray": true, + "showHideMessageInContextMenu": 0, + "showLReadToggleInDrawer": true, + "showMessageDetailsInContextMenu": 2, + "showMessageSeconds": false, + "showMessageShot": true, + "showPeerId": 2, + "showReactionsPanelInContextMenu": 1, + "showSReadToggleInDrawer": true, + "showStreamerToggleInDrawer": false, + "showStreamerToggleInTray": false, + "showUserMessagesInContextMenu": 2, + "showViewsPanelInContextMenu": 1, + "simpleQuotesAndReplies": true, + "spoofWebviewAsAndroid": false, + "stickerConfirmation": false, + "useScheduledMessages": false, + "voiceConfirmation": false + } + ''; + ".local/share/AyuGramDesktop/tdata/shortcuts-custom.json".text = '' + [ + { + "command": "quit_telegram", + "keys": "alt+q" + }, + { + "command": "folder1", + "keys": "alt+1" + }, + { + "command": "folder2", + "keys": "alt+2" + }, + { + "command": "folder3", + "keys": "alt+3" + }, + { + "command": "show_archive", + "keys": "alt+0" + }, + { + "command": "search", + "keys": "alt+/" + }, + { + "command": "show_contacts", + "keys": "alt+g" + }, + { + "command": "next_chat", + "keys": "alt+j" + }, + { + "command": "previous_chat", + "keys": "alt+k" + }, + { + "command": "next_folder", + "keys": "alt+l" + }, + { + "command": "previous_folder", + "keys": "alt+h" + }, + { + "command": "media_playpause", + "keys": "alt+p" + } + ] + ''; + }; } diff --git a/home/programs/gui/default.nix b/home/programs/gui/default.nix index 5d19aab..214d640 100644 --- a/home/programs/gui/default.nix +++ b/home/programs/gui/default.nix @@ -1,15 +1,15 @@ { - imports = [ - ./spotify - ./obs-studio - ./ayugram - # ./firefox - ./floorp - ./qbittorrent - ./qutebrowser - ./mpv - ./swayimg + imports = [ + ./spotify + ./obs-studio + ./ayugram + # ./firefox + ./floorp + ./qbittorrent + ./qutebrowser + ./mpv + ./swayimg - ./pkgs.nix - ]; + ./pkgs.nix + ]; } diff --git a/home/programs/gui/firefox/default.nix b/home/programs/gui/firefox/default.nix index 3591eb8..ca948e2 100644 --- a/home/programs/gui/firefox/default.nix +++ b/home/programs/gui/firefox/default.nix @@ -1,67 +1,66 @@ -{ pkgs, inputs, ... }: -{ - imports = [ - ./user - - ./settings.nix - ./search.nix - ]; - programs.firefox = { - enable = true; - package = pkgs.firefox; - languagePacks = [ "ru" ]; - profiles.dragora = { - id = 0; - name = "megamozg"; - isDefault = true; - extensions = with inputs.firefox-addons.packages."x86_64-linux"; [ - #VERY IMPORTANT - ublock-origin - sponsorblock - darkreader - vimium-c - newtab-adapter - censor-tracker +{ pkgs, inputs, ... }: { + imports = [ + ./user - # MISC - tabcenter-reborn - firefox-color - stylus - translate-web-pages - ]; - }; - policies = { - CaptivePortal = false; - DisableFirefoxStudies = true; - DisablePocket = true; - DisableTelemetry = true; - # DisableFirefoxAccounts = true; - DisableFormHistory = true; - DisplayBookmarksToolbar = false; - DontCheckDefaultBrowser = true; - DisableProfileRefresh = true; - PromptForDownloadLocation = false; - NetworkPrediction = false; - showSearchBar = true; - DisableSetDesktopBackground = true; - LegacyProfiles = true; - ManualAppUpdateOnly = true; - DisableFirefoxScreenshots = true; - HardwareAcceleration = true; - FirefoxHome = { - Pocket = false; - Snippets = false; - }; - SanitizeOnShutdown = { - Cache = true; - History = false; - Cookies = false; - Downloads = true; - FormData = true; - Sessions = true; - OfflineApps = true; - }; - PasswordManagerEnabled = true; - }; - }; + ./settings.nix + ./search.nix + ]; + programs.firefox = { + enable = true; + package = pkgs.firefox; + languagePacks = [ "ru" ]; + profiles.dragora = { + id = 0; + name = "megamozg"; + isDefault = true; + extensions = with inputs.firefox-addons.packages."x86_64-linux"; [ + #VERY IMPORTANT + ublock-origin + sponsorblock + darkreader + vimium-c + newtab-adapter + censor-tracker + + # MISC + tabcenter-reborn + firefox-color + stylus + translate-web-pages + ]; + }; + policies = { + CaptivePortal = false; + DisableFirefoxStudies = true; + DisablePocket = true; + DisableTelemetry = true; + # DisableFirefoxAccounts = true; + DisableFormHistory = true; + DisplayBookmarksToolbar = false; + DontCheckDefaultBrowser = true; + DisableProfileRefresh = true; + PromptForDownloadLocation = false; + NetworkPrediction = false; + showSearchBar = true; + DisableSetDesktopBackground = true; + LegacyProfiles = true; + ManualAppUpdateOnly = true; + DisableFirefoxScreenshots = true; + HardwareAcceleration = true; + FirefoxHome = { + Pocket = false; + Snippets = false; + }; + SanitizeOnShutdown = { + Cache = true; + History = false; + Cookies = false; + Downloads = true; + FormData = true; + Sessions = true; + OfflineApps = true; + }; + PasswordManagerEnabled = true; + }; + }; } diff --git a/home/programs/gui/floorp/default.nix b/home/programs/gui/floorp/default.nix index ca2b627..bb859a6 100644 --- a/home/programs/gui/floorp/default.nix +++ b/home/programs/gui/floorp/default.nix @@ -1,66 +1,65 @@ -{ pkgs, inputs, ... }: -{ - imports = [ - ./user - - ./settings.nix - # ./search.nix - ]; - programs.floorp= { - enable = true; - package = pkgs.floorp; - languagePacks = [ "ru" ]; - profiles.megamozg = { - id = 0; - name = "megamozg"; - isDefault = true; - extensions = with inputs.firefox-addons.packages."x86_64-linux"; [ - #VERY IMPORTANT - ublock-origin - sponsorblock - darkreader - vimium-c - censor-tracker +{ pkgs, inputs, ... }: { + imports = [ + ./user - # MISC - tabcenter-reborn - firefox-color - stylus - translate-web-pages - ]; - }; - policies = { - CaptivePortal = false; - DisableFirefoxStudies = true; - DisablePocket = true; - DisableTelemetry = true; - # DisableFirefoxAccounts = true; - DisableFormHistory = true; - DisplayBookmarksToolbar = false; - DontCheckDefaultBrowser = true; - DisableProfileRefresh = true; - PromptForDownloadLocation = false; - NetworkPrediction = false; - showSearchBar = true; - DisableSetDesktopBackground = true; - LegacyProfiles = true; - ManualAppUpdateOnly = true; - DisableFirefoxScreenshots = true; - HardwareAcceleration = true; - FirefoxHome = { - Pocket = false; - Snippets = false; - }; - SanitizeOnShutdown = { - Cache = true; - History = false; - Cookies = false; - Downloads = true; - FormData = true; - Sessions = true; - OfflineApps = true; - }; - PasswordManagerEnabled = true; - }; - }; + ./settings.nix + # ./search.nix + ]; + programs.floorp = { + enable = true; + package = pkgs.floorp; + languagePacks = [ "ru" ]; + profiles.megamozg = { + id = 0; + name = "megamozg"; + isDefault = true; + extensions = with inputs.firefox-addons.packages."x86_64-linux"; [ + #VERY IMPORTANT + ublock-origin + sponsorblock + darkreader + vimium-c + censor-tracker + + # MISC + tabcenter-reborn + firefox-color + stylus + translate-web-pages + ]; + }; + policies = { + CaptivePortal = false; + DisableFirefoxStudies = true; + DisablePocket = true; + DisableTelemetry = true; + # DisableFirefoxAccounts = true; + DisableFormHistory = true; + DisplayBookmarksToolbar = false; + DontCheckDefaultBrowser = true; + DisableProfileRefresh = true; + PromptForDownloadLocation = false; + NetworkPrediction = false; + showSearchBar = true; + DisableSetDesktopBackground = true; + LegacyProfiles = true; + ManualAppUpdateOnly = true; + DisableFirefoxScreenshots = true; + HardwareAcceleration = true; + FirefoxHome = { + Pocket = false; + Snippets = false; + }; + SanitizeOnShutdown = { + Cache = true; + History = false; + Cookies = false; + Downloads = true; + FormData = true; + Sessions = true; + OfflineApps = true; + }; + PasswordManagerEnabled = true; + }; + }; } diff --git a/home/programs/gui/floorp/search.nix b/home/programs/gui/floorp/search.nix index 71ee1af..2ea6f79 100644 --- a/home/programs/gui/floorp/search.nix +++ b/home/programs/gui/floorp/search.nix @@ -1,27 +1,33 @@ -{ pkgs, ... }: -{ - programs.firefox.profiles.dragora = { - search = { - force = true; - default = "Google"; - engines = { - "Nix Packages" = { - urls = [{ - template = "https://search.nixos.org/packages?channel=unstable"; - params = [ - { name = "type"; value = "packages"; } - { name = "query"; value = "{searchTerms}"; } - ]; - }]; - icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; - definedAliases = [ "@np" ]; - }; - - "Bing".metaData.hidden = true; - "DuckDuckGo".metaData.hidden = true; - "Wikipedia (en)".metaData.hidden = true; - "Google".metaData.alias = "@g"; - }; - }; - }; +{ pkgs, ... }: { + programs.firefox.profiles.dragora = { + search = { + force = true; + default = "Google"; + engines = { + "Nix Packages" = { + urls = [{ + template = "https://search.nixos.org/packages?channel=unstable"; + params = [ + { + name = "type"; + value = "packages"; + } + { + name = "query"; + value = "{searchTerms}"; + } + ]; + }]; + icon = + "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; + definedAliases = [ "@np" ]; + }; + + "Bing".metaData.hidden = true; + "DuckDuckGo".metaData.hidden = true; + "Wikipedia (en)".metaData.hidden = true; + "Google".metaData.alias = "@g"; + }; + }; + }; } diff --git a/home/programs/gui/floorp/settings.nix b/home/programs/gui/floorp/settings.nix index 1ee9093..cc3e8de 100644 --- a/home/programs/gui/floorp/settings.nix +++ b/home/programs/gui/floorp/settings.nix @@ -1,10 +1,9 @@ -{ ... }: -{ - programs.floorp.profiles.megamozg.settings = { - # OTHER - "layers.acceleration.force-enabled" = true; - "gfx.webrender.all" = true; - "svg.context-properties.content.enabled" = true; - "ui.key.menuAccessKeyFocuses" = false; - }; +{ ... }: { + programs.floorp.profiles.megamozg.settings = { + # OTHER + "layers.acceleration.force-enabled" = true; + "gfx.webrender.all" = true; + "svg.context-properties.content.enabled" = true; + "ui.key.menuAccessKeyFocuses" = false; + }; } diff --git a/home/programs/gui/floorp/user/chrome.nix b/home/programs/gui/floorp/user/chrome.nix index adff1dc..b8a5a16 100644 --- a/home/programs/gui/floorp/user/chrome.nix +++ b/home/programs/gui/floorp/user/chrome.nix @@ -1,9 +1,4 @@ -{ ... }: -{ - programs.floorp.profiles.megamozg.userChrome = '' - * { - font-family: "JetBrainsMono Nerd Font" !important; - font-size: 12pt !important; - } - ''; +{ ... }: { + programs.floorp.profiles.megamozg.userChrome = + " * {\n font-family: \"JetBrainsMono Nerd Font\" !important;\n font-size: 12pt !important; \n }\n"; } diff --git a/home/programs/gui/floorp/user/content.nix b/home/programs/gui/floorp/user/content.nix index 6744f3b..ef23f41 100644 --- a/home/programs/gui/floorp/user/content.nix +++ b/home/programs/gui/floorp/user/content.nix @@ -1,32 +1,6 @@ { ... }: -let - repo = "https://github.com/axax-loll/fuji-wallpapers/blob/main"; -in -{ - programs.floorp.profiles.megamozg.userContent = '' - @-moz-document url(about:home), url(about:newtab), url(about:privatebrowsing) { - .click-target-container *, .top-sites-list * { - color: #fff !important ; - text-shadow: 2px 2px 2px #222 !important ; - } - body::before { - content: "" ; - z-index: -1 ; - position: fixed ; - top: 0 ; - left: 0 ; - background: #0F0F0F no-repeat url("${repo}/synth.png?raw=true") center ; - background-size: cover ; - width: 100vw ; - height: 100vh ; - } - .logo { background-image: url("${repo}/logo.png?raw=true") !important; } - .search-wrapper input { background: #0F0F0F !important; } - #PlacesToolbarItems { - width: 100%; - display: flex; - justify-content: center; - } - } - ''; +let repo = "https://github.com/axax-loll/fuji-wallpapers/blob/main"; +in { + programs.floorp.profiles.megamozg.userContent = + " @-moz-document url(about:home), url(about:newtab), url(about:privatebrowsing) {\n .click-target-container *, .top-sites-list * {\n color: #fff !important ;\n text-shadow: 2px 2px 2px #222 !important ;\n }\n body::before {\n content: \"\" ;\n z-index: -1 ;\n position: fixed ;\n top: 0 ;\n left: 0 ;\n background: #0F0F0F no-repeat url(\"${repo}/synth.png?raw=true\") center ;\n background-size: cover ;\n width: 100vw ;\n height: 100vh ;\n }\n .logo { background-image: url(\"${repo}/logo.png?raw=true\") !important; }\n .search-wrapper input { background: #0F0F0F !important; }\n #PlacesToolbarItems {\n width: 100%;\n display: flex;\n justify-content: center;\n }\n }\n"; } diff --git a/home/programs/gui/floorp/user/default.nix b/home/programs/gui/floorp/user/default.nix index e3be0c2..083c4f1 100644 --- a/home/programs/gui/floorp/user/default.nix +++ b/home/programs/gui/floorp/user/default.nix @@ -1,6 +1 @@ -{ - imports = [ - ./chrome.nix - ./tcr.nix - ]; -} +{ imports = [ ./chrome.nix ./tcr.nix ]; } diff --git a/home/programs/gui/floorp/user/tcr.nix b/home/programs/gui/floorp/user/tcr.nix index 7b7ad1b..43300a6 100644 --- a/home/programs/gui/floorp/user/tcr.nix +++ b/home/programs/gui/floorp/user/tcr.nix @@ -1,40 +1,4 @@ -{ ... }: -{ - programs.floorp.profiles.megamozg.userChrome = '' - #TabsToolbar { display: none !important; } - #nav-bar { width: 100vw !important; } - - #browser { position: relative; } - #sidebar-box[sidebarcommand*="tabcenter"] #sidebar-header { display: none; } - - #sidebar-box[sidebarcommand*="tabcenter"]:not([hidden]) { - - display: block; - - position: absolute; - top: 0; bottom: 0; - z-index: 1; - - min-width: 50px !important; max-width: 50px !important; - - border-right: none; - - transition: all 0.8s ease; - - overflow: hidden; - - } - - [sidebarcommand*="tabcenter"] #sidebar, - #sidebar-box[sidebarcommand*="tabcenter"]:hover { min-width: 10vw !important; width: 30vw !important; max-width: 250px !important; } - - [sidebarcommand*="tabcenter"] #sidebar { height: 100%; max-height: 100%; } - - #sidebar-box[sidebarcommand*="tabcenter"]:not([hidden]) ~ #appcontent { margin-left: 50px; } - #main-window[inFullscreen][inDOMFullscreen] #appcontent { margin-left: 0; } - /* Removes gap between active tab highlight and edge of bar */ - #sidebar-box[sidebarcommand="tabcenter-reborn_ariasuni-sidebar-action"] #sidebar-header, #sidebar-box[sidebarcommand="tabcenter-reborn_ariasuni-sidebar-action"] ~ #sidebar-splitter { - display: none; - } - ''; +{ ... }: { + programs.floorp.profiles.megamozg.userChrome = + " #TabsToolbar { display: none !important; }\n #nav-bar { width: 100vw !important; }\n \n #browser { position: relative; }\n #sidebar-box[sidebarcommand*=\"tabcenter\"] #sidebar-header { display: none; }\n \n #sidebar-box[sidebarcommand*=\"tabcenter\"]:not([hidden]) {\n \n display: block;\n \n position: absolute;\n top: 0; bottom: 0;\n z-index: 1;\n \n min-width: 50px !important; max-width: 50px !important;\n \n border-right: none;\n \n transition: all 0.8s ease;\n \n overflow: hidden;\n \n }\n \n [sidebarcommand*=\"tabcenter\"] #sidebar,\n #sidebar-box[sidebarcommand*=\"tabcenter\"]:hover { min-width: 10vw !important; width: 30vw !important; max-width: 250px !important; }\n \n [sidebarcommand*=\"tabcenter\"] #sidebar { height: 100%; max-height: 100%; }\n \n #sidebar-box[sidebarcommand*=\"tabcenter\"]:not([hidden]) ~ #appcontent { margin-left: 50px; }\n #main-window[inFullscreen][inDOMFullscreen] #appcontent { margin-left: 0; }\n /* Removes gap between active tab highlight and edge of bar */\n #sidebar-box[sidebarcommand=\"tabcenter-reborn_ariasuni-sidebar-action\"] #sidebar-header, #sidebar-box[sidebarcommand=\"tabcenter-reborn_ariasuni-sidebar-action\"] ~ #sidebar-splitter {\n display: none;\n }\n"; } diff --git a/home/programs/gui/mpv/default.nix b/home/programs/gui/mpv/default.nix index ab39796..d5d4a4e 100644 --- a/home/programs/gui/mpv/default.nix +++ b/home/programs/gui/mpv/default.nix @@ -1,91 +1,83 @@ -{ pkgs, ... }: -{ - # imports = [ ./shaders ]; - programs.mpv = { - enable = true; - scripts = with pkgs.mpvScripts; [ - thumbnail - sponsorblock-minimal - videoclip - ]; - scriptOpts = { - sponsorblock-minimal = { - sponsorblock_minimal-server = "https://sponsor.ajay.app/api/skipSegments"; - sponsorblock_minimal-categories = ["sponsor"]; - }; - mpv_thumbnail_script = { - autogenerate = "yes"; - autogenerate_max_duration = "3600"; - prefer_mpv = "yes"; - mpv_no_sub = "no"; - thumbnail_width = 200; - thumbnail_height = 200; - thumbnail_count = 150; - thumbnail_network = "no"; - background_color = "282828"; - }; - }; - config = { - fs = "yes"; - osc = "no"; - }; - bindings = { - WHEEL_UP = "add volume 2"; - WHEEL_DOWN = "add volume -2"; - "Shift+WHEEL_UP" = "add volume 5"; - "Shift+WHEEL_DOWN" = "add volume -5"; +{ pkgs, ... }: { + # imports = [ ./shaders ]; + programs.mpv = { + enable = true; + scripts = with pkgs.mpvScripts; [ + thumbnail + sponsorblock-minimal + videoclip + ]; + scriptOpts = { + sponsorblock-minimal = { + sponsorblock_minimal-server = + "https://sponsor.ajay.app/api/skipSegments"; + sponsorblock_minimal-categories = [ "sponsor" ]; + }; + mpv_thumbnail_script = { + autogenerate = "yes"; + autogenerate_max_duration = "3600"; + prefer_mpv = "yes"; + mpv_no_sub = "no"; + thumbnail_width = 200; + thumbnail_height = 200; + thumbnail_count = 150; + thumbnail_network = "no"; + background_color = "282828"; + }; + }; + config = { + fs = "yes"; + osc = "no"; + }; + bindings = { + WHEEL_UP = "add volume 2"; + WHEEL_DOWN = "add volume -2"; + "Shift+WHEEL_UP" = "add volume 5"; + "Shift+WHEEL_DOWN" = "add volume -5"; - RIGHT = "seek 5"; - l = "seek 5"; - "д" = "seek 5"; + RIGHT = "seek 5"; + l = "seek 5"; + "д" = "seek 5"; - LEFT = "seek -5"; - h = "seek -5"; - "р" = "seek -5"; + LEFT = "seek -5"; + h = "seek -5"; + "р" = "seek -5"; - UP = "add volume 2"; - k = "add volume 2"; - "л" = "add volume 2"; + UP = "add volume 2"; + k = "add volume 2"; + "л" = "add volume 2"; - DOWN = "add volume -2"; - j = "add volume -2"; - "о" = "add volume -2"; + DOWN = "add volume -2"; + j = "add volume -2"; + "о" = "add volume -2"; - "Shift+RIGHT" = "seek 10"; - "Shift+LEFT" = "seek -10"; + "Shift+RIGHT" = "seek 10"; + "Shift+LEFT" = "seek -10"; - "Shift+UP" = "add volume 5"; - "Shift+DOWN" = "add volume -5"; + "Shift+UP" = "add volume 5"; + "Shift+DOWN" = "add volume -5"; - q = "quit"; - "й" = "quit"; - Q = "quit-watch-later"; + q = "quit"; + "й" = "quit"; + Q = "quit-watch-later"; - SPACE = "cycle pause"; - p = "cycle pause"; - "з" = "cycle pause"; - - m = "cycle mute"; - "ь" = "cycle mute"; + SPACE = "cycle pause"; + p = "cycle pause"; + "з" = "cycle pause"; - o = "show-progress"; - "щ" = "show-progress"; + m = "cycle mute"; + "ь" = "cycle mute"; - f = "cycle fullscreen"; - "а" = "cycle fullscreen"; - ESC = "set fullscreen no"; - - c = "script-binding videoclip-menu-open"; - }; - extraInput = '' - CTRL+1 no-osd change-list glsl-shaders set "${pkgs.anime4k}/Anime4K_Clamp_Highlights.glsl:${pkgs.anime4k}/Anime4K_Restore_CNN_M.glsl:${pkgs.anime4k}/Anime4K_Upscale_CNN_x2_M.glsl:${pkgs.anime4k}/Anime4K_AutoDownscalePre_x2.glsl:${pkgs.anime4k}/Anime4K_AutoDownscalePre_x4.glsl:${pkgs.anime4k}/Anime4K_Upscale_CNN_x2_S.glsl"; show-text "Anime4K: Mode A (Fast)" - CTRL+2 no-osd change-list glsl-shaders set "${pkgs.anime4k}/Anime4K_Clamp_Highlights.glsl:${pkgs.anime4k}/Anime4K_Restore_CNN_Soft_M.glsl:${pkgs.anime4k}/Anime4K_Upscale_CNN_x2_M.glsl:${pkgs.anime4k}/Anime4K_AutoDownscalePre_x2.glsl:${pkgs.anime4k}/Anime4K_AutoDownscalePre_x4.glsl:${pkgs.anime4k}/Anime4K_Upscale_CNN_x2_S.glsl"; show-text "Anime4K: Mode B (Fast)" - CTRL+3 no-osd change-list glsl-shaders set "${pkgs.anime4k}/Anime4K_Clamp_Highlights.glsl:${pkgs.anime4k}/Anime4K_Upscale_Denoise_CNN_x2_M.glsl:${pkgs.anime4k}/Anime4K_AutoDownscalePre_x2.glsl:${pkgs.anime4k}/Anime4K_AutoDownscalePre_x4.glsl:${pkgs.anime4k}/Anime4K_Upscale_CNN_x2_S.glsl"; show-text "Anime4K: Mode C (Fast)" - CTRL+4 no-osd change-list glsl-shaders set "${pkgs.anime4k}/Anime4K_Clamp_Highlights.glsl:${pkgs.anime4k}/Anime4K_Restore_CNN_M.glsl:${pkgs.anime4k}/Anime4K_Upscale_CNN_x2_M.glsl:${pkgs.anime4k}/Anime4K_Restore_CNN_S.glsl:${pkgs.anime4k}/Anime4K_AutoDownscalePre_x2.glsl:${pkgs.anime4k}/Anime4K_AutoDownscalePre_x4.glsl:${pkgs.anime4k}/Anime4K_Upscale_CNN_x2_S.glsl"; show-text "Anime4K: Mode A+A (Fast)" - CTRL+5 no-osd change-list glsl-shaders set "${pkgs.anime4k}/Anime4K_Clamp_Highlights.glsl:${pkgs.anime4k}/Anime4K_Restore_CNN_Soft_M.glsl:${pkgs.anime4k}/Anime4K_Upscale_CNN_x2_M.glsl:${pkgs.anime4k}/Anime4K_AutoDownscalePre_x2.glsl:${pkgs.anime4k}/Anime4K_AutoDownscalePre_x4.glsl:${pkgs.anime4k}/Anime4K_Restore_CNN_Soft_S.glsl:${pkgs.anime4k}/Anime4K_Upscale_CNN_x2_S.glsl"; show-text "Anime4K: Mode B+B (Fast)" - CTRL+6 no-osd change-list glsl-shaders set "${pkgs.anime4k}/Anime4K_Clamp_Highlights.glsl:${pkgs.anime4k}/Anime4K_Upscale_Denoise_CNN_x2_M.glsl:${pkgs.anime4k}/Anime4K_AutoDownscalePre_x2.glsl:${pkgs.anime4k}/Anime4K_AutoDownscalePre_x4.glsl:${pkgs.anime4k}/Anime4K_Restore_CNN_S.glsl:${pkgs.anime4k}/Anime4K_Upscale_CNN_x2_S.glsl"; show-text "Anime4K: Mode C+A (Fast)" - - CTRL+0 no-osd change-list glsl-shaders clr ""; show-text "GLSL shaders cleared" - ''; - }; + o = "show-progress"; + "щ" = "show-progress"; + + f = "cycle fullscreen"; + "а" = "cycle fullscreen"; + ESC = "set fullscreen no"; + + c = "script-binding videoclip-menu-open"; + }; + extraInput = + " CTRL+1 no-osd change-list glsl-shaders set \"${pkgs.anime4k}/Anime4K_Clamp_Highlights.glsl:${pkgs.anime4k}/Anime4K_Restore_CNN_M.glsl:${pkgs.anime4k}/Anime4K_Upscale_CNN_x2_M.glsl:${pkgs.anime4k}/Anime4K_AutoDownscalePre_x2.glsl:${pkgs.anime4k}/Anime4K_AutoDownscalePre_x4.glsl:${pkgs.anime4k}/Anime4K_Upscale_CNN_x2_S.glsl\"; show-text \"Anime4K: Mode A (Fast)\"\n CTRL+2 no-osd change-list glsl-shaders set \"${pkgs.anime4k}/Anime4K_Clamp_Highlights.glsl:${pkgs.anime4k}/Anime4K_Restore_CNN_Soft_M.glsl:${pkgs.anime4k}/Anime4K_Upscale_CNN_x2_M.glsl:${pkgs.anime4k}/Anime4K_AutoDownscalePre_x2.glsl:${pkgs.anime4k}/Anime4K_AutoDownscalePre_x4.glsl:${pkgs.anime4k}/Anime4K_Upscale_CNN_x2_S.glsl\"; show-text \"Anime4K: Mode B (Fast)\"\n CTRL+3 no-osd change-list glsl-shaders set \"${pkgs.anime4k}/Anime4K_Clamp_Highlights.glsl:${pkgs.anime4k}/Anime4K_Upscale_Denoise_CNN_x2_M.glsl:${pkgs.anime4k}/Anime4K_AutoDownscalePre_x2.glsl:${pkgs.anime4k}/Anime4K_AutoDownscalePre_x4.glsl:${pkgs.anime4k}/Anime4K_Upscale_CNN_x2_S.glsl\"; show-text \"Anime4K: Mode C (Fast)\"\n CTRL+4 no-osd change-list glsl-shaders set \"${pkgs.anime4k}/Anime4K_Clamp_Highlights.glsl:${pkgs.anime4k}/Anime4K_Restore_CNN_M.glsl:${pkgs.anime4k}/Anime4K_Upscale_CNN_x2_M.glsl:${pkgs.anime4k}/Anime4K_Restore_CNN_S.glsl:${pkgs.anime4k}/Anime4K_AutoDownscalePre_x2.glsl:${pkgs.anime4k}/Anime4K_AutoDownscalePre_x4.glsl:${pkgs.anime4k}/Anime4K_Upscale_CNN_x2_S.glsl\"; show-text \"Anime4K: Mode A+A (Fast)\"\n CTRL+5 no-osd change-list glsl-shaders set \"${pkgs.anime4k}/Anime4K_Clamp_Highlights.glsl:${pkgs.anime4k}/Anime4K_Restore_CNN_Soft_M.glsl:${pkgs.anime4k}/Anime4K_Upscale_CNN_x2_M.glsl:${pkgs.anime4k}/Anime4K_AutoDownscalePre_x2.glsl:${pkgs.anime4k}/Anime4K_AutoDownscalePre_x4.glsl:${pkgs.anime4k}/Anime4K_Restore_CNN_Soft_S.glsl:${pkgs.anime4k}/Anime4K_Upscale_CNN_x2_S.glsl\"; show-text \"Anime4K: Mode B+B (Fast)\"\n CTRL+6 no-osd change-list glsl-shaders set \"${pkgs.anime4k}/Anime4K_Clamp_Highlights.glsl:${pkgs.anime4k}/Anime4K_Upscale_Denoise_CNN_x2_M.glsl:${pkgs.anime4k}/Anime4K_AutoDownscalePre_x2.glsl:${pkgs.anime4k}/Anime4K_AutoDownscalePre_x4.glsl:${pkgs.anime4k}/Anime4K_Restore_CNN_S.glsl:${pkgs.anime4k}/Anime4K_Upscale_CNN_x2_S.glsl\"; show-text \"Anime4K: Mode C+A (Fast)\"\n \n CTRL+0 no-osd change-list glsl-shaders clr \"\"; show-text \"GLSL shaders cleared\"\n"; + }; } diff --git a/home/programs/gui/obs-studio/default.nix b/home/programs/gui/obs-studio/default.nix index 8957596..086e0d0 100644 --- a/home/programs/gui/obs-studio/default.nix +++ b/home/programs/gui/obs-studio/default.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{ pkgs, ... }: { programs.obs-studio = { enable = true; package = pkgs.obs-studio; diff --git a/home/programs/gui/pkgs.nix b/home/programs/gui/pkgs.nix index bfbac1c..16ebc22 100644 --- a/home/programs/gui/pkgs.nix +++ b/home/programs/gui/pkgs.nix @@ -1,54 +1,47 @@ -{ pkgs, inputs, config, ... }: -{ - imports = [ - inputs.nur.hmModules.nur - ]; - home.packages = with pkgs; [ - home-manager - - # (vivaldi.override { - # isSnapshot = true; - # }) - vieb - qutebrowser - vesktop - tor-browser - qbittorrent-enhanced - - xdg-user-dirs - libreoffice-fresh - onlyoffice-bin +{ pkgs, inputs, config, ... }: { + imports = [ inputs.nur.hmModules.nur ]; + home.packages = with pkgs; [ + home-manager - nemo-with-extensions - nemo-fileroller - nemo-emblems - gvfs - - obsidian - inkscape - - popsicle - ventoy + # (vivaldi.override { + # isSnapshot = true; + # }) + vieb + qutebrowser + vesktop + tor-browser + qbittorrent-enhanced - swayimg - anime4k - cheese + xdg-user-dirs + libreoffice-fresh + onlyoffice-bin - bottles - mindustry-wayland - mangohud - superTuxKart + nemo-with-extensions + nemo-fileroller + nemo-emblems + gvfs - (prismlauncher.override { - jdks = [ - temurin-bin-21 - temurin-bin-17 - temurin-bin-8 - ]; - }) + obsidian + inkscape - config.nur.repos.abszero.palgen - config.nur.repos.rycee.mozilla-addons-to-nix - inputs.ayugram-desktop.packages.${pkgs.system}.default - ]; + popsicle + ventoy + + swayimg + anime4k + cheese + + bottles + mindustry-wayland + mangohud + superTuxKart + + (prismlauncher.override { + jdks = [ temurin-bin-21 temurin-bin-17 temurin-bin-8 ]; + }) + + config.nur.repos.abszero.palgen + config.nur.repos.rycee.mozilla-addons-to-nix + inputs.ayugram-desktop.packages.${pkgs.system}.default + ]; } diff --git a/home/programs/gui/qbittorrent/default.nix b/home/programs/gui/qbittorrent/default.nix index 5bbffdd..bbb12fd 100644 --- a/home/programs/gui/qbittorrent/default.nix +++ b/home/programs/gui/qbittorrent/default.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{ ... }: { xdg.configFile = { # CONFIG FILE "qBittorrent/qBittorrent.conf".text = '' @@ -103,6 +102,6 @@ }, "version": 2 } - ''; + ''; }; } diff --git a/home/programs/gui/qutebrowser/default.nix b/home/programs/gui/qutebrowser/default.nix index a2217d4..08d982b 100644 --- a/home/programs/gui/qutebrowser/default.nix +++ b/home/programs/gui/qutebrowser/default.nix @@ -1,6 +1 @@ -{ ... }: -{ - programs.qutebrowser = { - enable = true; - }; -} +{ ... }: { programs.qutebrowser = { enable = true; }; } diff --git a/home/programs/gui/spotify/default.nix b/home/programs/gui/spotify/default.nix index 073b1b9..a88b6c1 100644 --- a/home/programs/gui/spotify/default.nix +++ b/home/programs/gui/spotify/default.nix @@ -1,48 +1,46 @@ { pkgs, config, inputs, ... }: -let - spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; -in -{ - imports = [ inputs.spicetify-nix.homeManagerModules.default ]; - programs.spicetify = { - enable = true; - theme = spicePkgs.themes.sleek; - colorScheme = "custom"; - customColorScheme = with config.lib.stylix.colors; { - # BASE 16 SCHEME - text = "${base07}"; - subtext = "${base06}"; - sidebar-text = "${base07}"; - main = "${base00}"; - sidebar = "${base02}"; - player = "${base00}"; - card = "${base00}"; - shadow = "${base00}"; - selected-row = "${base0C}"; - button = "${base0B}"; - button-active = "${base0B}"; - button-disabled = "${base03}"; - tab-active = "${base0A}"; - notification = "${base0A}"; - notification-error = "${base08}"; - misc = "${base02}"; - }; - enabledExtensions = with spicePkgs.extensions; [ - # OFFICIAL - fullAppDisplay - shuffle +let spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; +in { + imports = [ inputs.spicetify-nix.homeManagerModules.default ]; + programs.spicetify = { + enable = true; + theme = spicePkgs.themes.sleek; + colorScheme = "custom"; + customColorScheme = with config.lib.stylix.colors; { + # BASE 16 SCHEME + text = "${base07}"; + subtext = "${base06}"; + sidebar-text = "${base07}"; + main = "${base00}"; + sidebar = "${base02}"; + player = "${base00}"; + card = "${base00}"; + shadow = "${base00}"; + selected-row = "${base0C}"; + button = "${base0B}"; + button-active = "${base0B}"; + button-disabled = "${base03}"; + tab-active = "${base0A}"; + notification = "${base0A}"; + notification-error = "${base08}"; + misc = "${base02}"; + }; + enabledExtensions = with spicePkgs.extensions; [ + # OFFICIAL + fullAppDisplay + shuffle - #COMMUNITY - adblockify - adblock - - historyShortcut - beautifulLyrics - playlistIcons - betterGenres - powerBar - seekSong - history - ]; - }; + #COMMUNITY + adblockify + adblock + + historyShortcut + beautifulLyrics + playlistIcons + betterGenres + powerBar + seekSong + history + ]; + }; } diff --git a/home/programs/gui/swayimg/default.nix b/home/programs/gui/swayimg/default.nix index f5d98d8..ea1ba10 100644 --- a/home/programs/gui/swayimg/default.nix +++ b/home/programs/gui/swayimg/default.nix @@ -1,5 +1,4 @@ -{ config, ... }: -{ +{ config, ... }: { xdg.configFile = with config.lib.stylix.colors; { "swayimg/config".text = '' ################################################################################ @@ -18,7 +17,7 @@ sigusr2 = next_file # Application ID and window class name app_id = swayimg - + ################################################################################ # Viewer mode configuration ################################################################################ @@ -41,7 +40,7 @@ history = 1 # Number of preloaded images (read ahead) preload = 1 - + ################################################################################ # Gallery mode configuration ################################################################################ @@ -64,7 +63,7 @@ border = #${base0E}ff # Shadow color of the selected tile (RGBA) shadow = #${base00}a0 - + ################################################################################ # Image list configuration ################################################################################ @@ -77,7 +76,7 @@ recursive = no # Open all files in the start directory (yes/no) all = yes - + ################################################################################ # Font configuration ################################################################################ @@ -90,7 +89,7 @@ color = #${base06}ff # Shadow color (RGBA) shadow = #${base00}a0 - + ################################################################################ # Image meta info scheme (format, size, EXIF, etc) ################################################################################ @@ -101,21 +100,21 @@ info_timeout = 5 # Timeout to hide status message (seconds) status_timeout = 3 - + # Display scheme for viewer mode (position = content) [info.viewer] top_left = none top_right = index bottom_left = none bottom_right = none - + # Display scheme for gallery mode (position = content) [info.gallery] top_left = none top_right = index bottom_left = none bottom_right = none - + ################################################################################ # Viewer mode key binding configuration: key = action [parameters] ################################################################################ @@ -175,37 +174,37 @@ Shift+ScrollDown = next_file Alt+ScrollUp = prev_frame Alt+ScrollDown = next_frame - + ################################################################################ # Gallery mode key binding configuration: key = action [parameters] ################################################################################ [keys.gallery] F1 = help - + Home = first_file g = first_file - + End = last_file Shift+g = last_file - + Left = step_left Right = step_right Up = step_up Down = step_down - + h = step_left j = step_down k = step_up l = step_right Prior = page_up Next = page_down - + c = skip_file f = fullscreen Return = mode a = antialiasing r = reload - + i = info Shift+Delete = exec rm "%"; skip_file Escape = exit diff --git a/home/programs/misc/dconf.nix b/home/programs/misc/dconf.nix index 98d1ab5..04de62d 100644 --- a/home/programs/misc/dconf.nix +++ b/home/programs/misc/dconf.nix @@ -1,11 +1,8 @@ -{ ... }: -{ - dconf = { - enable = true; - settings = { - "org/gnome/desktop/wm/preferences" = { - button-layout = ""; - }; - }; - }; +{ ... }: { + dconf = { + enable = true; + settings = { + "org/gnome/desktop/wm/preferences" = { button-layout = ""; }; + }; + }; } diff --git a/home/programs/misc/default.nix b/home/programs/misc/default.nix index edfd6a1..c5a27e9 100644 --- a/home/programs/misc/default.nix +++ b/home/programs/misc/default.nix @@ -1,9 +1,9 @@ { - imports =[ - ./dconf.nix - ./nwg.nix - ./nix.nix - ./xdg.nix - # ./env.nix - ]; + imports = [ + ./dconf.nix + ./nwg.nix + ./nix.nix + ./xdg.nix + # ./env.nix + ]; } diff --git a/home/programs/misc/env.nix b/home/programs/misc/env.nix index 73591f8..219b175 100644 --- a/home/programs/misc/env.nix +++ b/home/programs/misc/env.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{ ... }: { home.sessionVariables = { MICRO_TRUECOLOR = "1"; QT_QPA_PLATFORMTHEME = "qt5ct"; diff --git a/home/programs/misc/nix.nix b/home/programs/misc/nix.nix index c56526c..b6478d5 100644 --- a/home/programs/misc/nix.nix +++ b/home/programs/misc/nix.nix @@ -1,29 +1,23 @@ -{ pkgs, ... }: -{ - nix = { - package = pkgs.nix; - settings = { - warn-dirty = false; - experimental-features = [ "nix-command" "flakes" ]; - extra-experimental-features = [ "nix-command" "flakes" ]; - builders-use-substitutes = true; - auto-optimise-store = true; - extra-substituters = [ - "https://yazi.cachix.org" - "https://cache.garnix.io" - ]; - extra-trusted-public-keys = [ - "yazi.cachix.org-1:Dcdz63NZKfvUCbDGngQDAZq6kOroIrFoyO064uvLh8k=" - "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" - ]; - trusted-users = [ - "megamozg" - "@wheel" - ]; - }; - }; - nixpkgs.config = { - allowBroken = true; - allowUnfree = true; - }; +{ pkgs, ... }: { + nix = { + package = pkgs.nix; + settings = { + warn-dirty = false; + experimental-features = [ "nix-command" "flakes" ]; + extra-experimental-features = [ "nix-command" "flakes" ]; + builders-use-substitutes = true; + auto-optimise-store = true; + extra-substituters = + [ "https://yazi.cachix.org" "https://cache.garnix.io" ]; + extra-trusted-public-keys = [ + "yazi.cachix.org-1:Dcdz63NZKfvUCbDGngQDAZq6kOroIrFoyO064uvLh8k=" + "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" + ]; + trusted-users = [ "megamozg" "@wheel" ]; + }; + }; + nixpkgs.config = { + allowBroken = true; + allowUnfree = true; + }; } diff --git a/home/programs/misc/nwg.nix b/home/programs/misc/nwg.nix index 95ebddc..969ec81 100644 --- a/home/programs/misc/nwg.nix +++ b/home/programs/misc/nwg.nix @@ -1,21 +1,6 @@ -{ pkgs, config, lib, ... }: -{ - xdg.configFile = with config.lib.stylix.colors; { - "nwg-drawer/drawer.css".text = '' - window { - background-color: #${base00}; - color: #eeeeee; - } - - button { - color: #${base04}; - background-color: #${base00}; - } - - button:hover { - color: #${base04}; - background-color: #${base01}; - } - ''; - }; +{ config, ... }: { + xdg.configFile = with config.lib.stylix.colors; { + "nwg-drawer/drawer.css".text = + " window {\n background-color: #${base00};\n color: #eeeeee;\n }\n \n button {\n color: #${base04};\n background-color: #${base00};\n }\n \n button:hover {\n color: #${base04};\n background-color: #${base01};\n }\n"; + }; } diff --git a/home/programs/misc/xdg.nix b/home/programs/misc/xdg.nix index 4b4953b..b6e15b2 100644 --- a/home/programs/misc/xdg.nix +++ b/home/programs/misc/xdg.nix @@ -1,41 +1,37 @@ { pkgs, config, ... }: -let - hmdir = config.home.homeDirectory; -in -{ - xdg = { - portal = { - enable = true; - config.common.default = "gtk"; - extraPortals = with pkgs; [ - xdg-desktop-portal-hyprland - xdg-desktop-portal-gtk - ]; - }; - mime = { - enable = true; - }; - mimeApps = { - # defaultApplications = { - # "default-web-browser" = [ "floorp.desktop" ]; - # "text/html" = [ "floorp.desktop" ]; - # "x-scheme-handler/http" = [ "floorp.desktop" ]; - # "x-scheme-handler/https" = [ "floorp.desktop" ]; - # "x-scheme-handler/about" = [ "floorp.desktop" ]; - # "x-scheme-handler/unknown" = [ "floorp.desktop" ]; - # }; - }; - userDirs = { - enable = true; - createDirectories = true; - desktop = "${hmdir}/Desktop"; - documents = "${hmdir}/Documents"; - download = "${hmdir}/Downloads"; - music = "${hmdir}/Music"; - pictures = "${hmdir}/Pictures"; - publicShare = "${hmdir}/"; - templates = "${hmdir}/"; - videos = "${hmdir}/Videos"; - }; - }; +let hmdir = config.home.homeDirectory; +in { + xdg = { + portal = { + enable = true; + config.common.default = "gtk"; + extraPortals = with pkgs; [ + xdg-desktop-portal-hyprland + xdg-desktop-portal-gtk + ]; + }; + mime = { enable = true; }; + mimeApps = { + # defaultApplications = { + # "default-web-browser" = [ "floorp.desktop" ]; + # "text/html" = [ "floorp.desktop" ]; + # "x-scheme-handler/http" = [ "floorp.desktop" ]; + # "x-scheme-handler/https" = [ "floorp.desktop" ]; + # "x-scheme-handler/about" = [ "floorp.desktop" ]; + # "x-scheme-handler/unknown" = [ "floorp.desktop" ]; + # }; + }; + userDirs = { + enable = true; + createDirectories = true; + desktop = "${hmdir}/Desktop"; + documents = "${hmdir}/Documents"; + download = "${hmdir}/Downloads"; + music = "${hmdir}/Music"; + pictures = "${hmdir}/Pictures"; + publicShare = "${hmdir}/"; + templates = "${hmdir}/"; + videos = "${hmdir}/Videos"; + }; + }; } diff --git a/home/programs/shells/default.nix b/home/programs/shells/default.nix index f603f38..b8cf816 100644 --- a/home/programs/shells/default.nix +++ b/home/programs/shells/default.nix @@ -1,8 +1,8 @@ { - imports = [ - ./starship.nix - - # ./zsh - ./fish - ]; + imports = [ + ./starship.nix + + # ./zsh + ./fish + ]; } diff --git a/home/programs/shells/fish/default.nix b/home/programs/shells/fish/default.nix index 5a4adc1..b6597c5 100644 --- a/home/programs/shells/fish/default.nix +++ b/home/programs/shells/fish/default.nix @@ -1,84 +1,81 @@ -{ ... }: -{ - programs.fish = { - enable = true; - shellAliases = { - e = "$EDITOR"; - sudo = "doas"; +{ ... }: { + programs.fish = { + enable = true; + shellAliases = { + e = "$EDITOR"; + sudo = "doas"; - cp = "cpz"; - rm = "rmz"; - - c = "clear"; - x = "exit"; - - nhs = "nh home switch"; - nos = "nh os switch"; - nca = "nh clean all"; - - ls = "eza --icons=always --group-directories-first"; - lsl = "eza --icons=always -l --group-directories-first"; - lst = "eza --icons=always -T --group-directories-first"; - - ls1 = "eza --icons=always -1 --group-directories-first"; - ls11 = "eza --icons=never -1 --group-directories-first"; - lsd = "eza --icons=never -D1 --group-directories-first"; - lsf = "eza --icons=never -f1 --group-directories-first"; - - cat = "bat --theme base16"; + cp = "cpz"; + rm = "rmz"; - ff = "fastfetch"; - of = "nix run nixpkgs#onefetch -- -d commits churn license head --no-art --no-color-palette -t 5"; - - r = "ranger"; - y = "yazi"; - j = "joshuto"; - nxt = "nix-tree"; - - m = "micro"; - v = "nvim"; - h = "hx"; - - fsf = "fastfetch"; - cpf = "cpufetch"; - cav = "cava"; - pmx = "pulsemixer"; - blt = "bluetuith"; + c = "clear"; + x = "exit"; - gl = "git clone"; - ga = "git add ."; - gA = "git add"; - gc = "git commit -m"; - gC = "git commit -m 'update  '"; - gp = "git push"; - gP = "git pull"; - - lut = "lutgen apply -p paradise"; - lutall = "lutgen apply -p paradise ./*"; - icat = "kitten icat"; - - btp = "btop"; - nvt = "nvtop -i"; + nhs = "nh home switch"; + nos = "nh os switch"; + nca = "nh clean all"; - ter = "tenki --mode rain --wind disable --timer-color cyan -f 80"; - tes = "tenki --mode snow --wind disable --timer-color yellow -f 80"; - tem = "tenki --mode meteor --wind disable --timer-color red -f 80"; + ls = "eza --icons=always --group-directories-first"; + lsl = "eza --icons=always -l --group-directories-first"; + lst = "eza --icons=always -T --group-directories-first"; - rmr = "trash restore"; - rmp = "trash put"; - tre = "trash empty -all"; + ls1 = "eza --icons=always -1 --group-directories-first"; + ls11 = "eza --icons=never -1 --group-directories-first"; + lsd = "eza --icons=never -D1 --group-directories-first"; + lsf = "eza --icons=never -f1 --group-directories-first"; - nxr = "nix run"; - nxf = "nix-prefetch-github"; - }; - interactiveShellInit = '' - set fish_greeting - [ "$(tty)" = /dev/tty1 ] && exec Hyprland - ''; - }; - xdg.configFile = { - "lutgen/paradise".text = '' - 151515 1F1F1F 2E2E2E 424242 BBB6B6 E8E3E3 E8E3E3 E8E3E3 B66467 D9BC8C D9BC8C 8C977D 8AA6A2 8DA3B9 A988B0 BBB6B6 - ''; - }; + cat = "bat --theme base16"; + + ff = "fastfetch"; + of = + "nix run nixpkgs#onefetch -- -d commits churn license head --no-art --no-color-palette -t 5"; + + r = "ranger"; + y = "yazi"; + j = "joshuto"; + nxt = "nix-tree"; + + m = "micro"; + v = "nvim"; + h = "hx"; + + fsf = "fastfetch"; + cpf = "cpufetch"; + cav = "cava"; + pmx = "pulsemixer"; + blt = "bluetuith"; + + gl = "git clone"; + ga = "git add ."; + gA = "git add"; + gc = "git commit -m"; + gC = "git commit -m 'update  '"; + gp = "git push"; + gP = "git pull"; + + lut = "lutgen apply -p paradise"; + lutall = "lutgen apply -p paradise ./*"; + icat = "kitten icat"; + + btp = "btop"; + nvt = "nvtop -i"; + + ter = "tenki --mode rain --wind disable --timer-color cyan -f 80"; + tes = "tenki --mode snow --wind disable --timer-color yellow -f 80"; + tem = "tenki --mode meteor --wind disable --timer-color red -f 80"; + + rmr = "trash restore"; + rmp = "trash put"; + tre = "trash empty -all"; + + nxr = "nix run"; + nxf = "nix-prefetch-github"; + }; + interactiveShellInit = + " set fish_greeting\n [ \"$(tty)\" = /dev/tty1 ] && exec Hyprland\n"; + }; + xdg.configFile = { + "lutgen/paradise".text = + " 151515 1F1F1F 2E2E2E 424242 BBB6B6 E8E3E3 E8E3E3 E8E3E3 B66467 D9BC8C D9BC8C 8C977D 8AA6A2 8DA3B9 A988B0 BBB6B6\n"; + }; } diff --git a/home/programs/shells/starship.nix b/home/programs/shells/starship.nix index c9df023..4d0a201 100644 --- a/home/programs/shells/starship.nix +++ b/home/programs/shells/starship.nix @@ -1,68 +1,65 @@ -{ lib, ... }: -{ - programs.starship = { - enable = true; - settings = { - add_newline = true; - format = lib.concatStrings [ - "$shell" - "$username" - "$directory" - "$git_branch" - "$package" - "$cmd_duration" - "$line_break" - "$character" - ]; - shell = { - fish_indicator = "\[fish\]($style)"; - zsh_indicator = "\[zsh\]($style)"; - bash_indicator = "\[bash\]($style)"; - nu_indicator = "\[nu\]($style)"; - unknown_indicator = "\[sh ?\]"; - style = "bold fg:purple"; - disabled = false; - }; - username = { - style_user = "bold red"; - style_root = "bold red"; - format = "[$user]($style) in "; - show_always = true; - disabled = false; - }; - directory = { - format = "[$path]($style) [$read_only]($read_only_style)"; - style = "bold fg:blue"; - read_only = "[󰌾] "; - read_only_style = "bold red"; - home_symbol = "~~"; - truncation_length = 2; - truncation_symbol = "../"; - disabled = false; - }; - git_branch = { - format = "on [$symbol$branch]($style) "; - style = "bold italic fg:green"; - symbol = " "; - truncation_length = 4; - truncation_symbol = ""; - disabled = false; - }; - package = { - format = "via [󰏗 $version](bold fg:yellow) "; - }; - cmd_duration = { - min_time = 1000; - format = "took [$duration](bold fg:yellow)"; - disabled = false; - }; - character = { - format = "$symbol "; - success_symbol = "[❯❯❯](bold green)"; - error_symbol = "[❯❯❯](bold red)"; - vimcmd_symbol = "[❯❯❯](bold yellow)"; - disabled = false; - }; - }; - }; +{ lib, ... }: { + programs.starship = { + enable = true; + settings = { + add_newline = true; + format = lib.concatStrings [ + "$shell" + "$username" + "$directory" + "$git_branch" + "$package" + "$cmd_duration" + "$line_break" + "$character" + ]; + shell = { + fish_indicator = "[fish]($style)"; + zsh_indicator = "[zsh]($style)"; + bash_indicator = "[bash]($style)"; + nu_indicator = "[nu]($style)"; + unknown_indicator = "[sh ?]"; + style = "bold fg:purple"; + disabled = false; + }; + username = { + style_user = "bold red"; + style_root = "bold red"; + format = "[$user]($style) in "; + show_always = true; + disabled = false; + }; + directory = { + format = "[$path]($style) [$read_only]($read_only_style)"; + style = "bold fg:blue"; + read_only = "[󰌾] "; + read_only_style = "bold red"; + home_symbol = "~~"; + truncation_length = 2; + truncation_symbol = "../"; + disabled = false; + }; + git_branch = { + format = "on [$symbol$branch]($style) "; + style = "bold italic fg:green"; + symbol = " "; + truncation_length = 4; + truncation_symbol = ""; + disabled = false; + }; + package = { format = "via [󰏗 $version](bold fg:yellow) "; }; + cmd_duration = { + min_time = 1000; + format = "took [$duration](bold fg:yellow)"; + disabled = false; + }; + character = { + format = "$symbol "; + success_symbol = "[❯❯❯](bold green)"; + error_symbol = "[❯❯❯](bold red)"; + vimcmd_symbol = "[❯❯❯](bold yellow)"; + disabled = false; + }; + }; + }; } diff --git a/home/themes/default.nix b/home/themes/default.nix index 7e2a0c1..ebe2c04 100644 --- a/home/themes/default.nix +++ b/home/themes/default.nix @@ -1,8 +1,8 @@ { - imports = [ - ./stylix/stylix.nix - ./gtk.nix + imports = [ + ./stylix/stylix.nix + ./gtk.nix - ./qt - ]; + ./qt + ]; } diff --git a/home/themes/gtk.nix b/home/themes/gtk.nix index 2109327..88cf4c0 100644 --- a/home/themes/gtk.nix +++ b/home/themes/gtk.nix @@ -1,21 +1,21 @@ -{ pkgs, lib, ... }: -{ - home.packages = with pkgs; [ - noto-fonts - noto-fonts-cjk - openmoji-color - (nerdfonts.override { fonts = [ "FiraCode" "JetBrainsMono" ]; }) - ]; - gtk = { - enable = true; - iconTheme = { - name = "Papirus-Dark"; - package = pkgs.papirus-icon-theme.override { color = "yaru"; }; - }; - font = lib.mkForce { - name = "JetBrainsMono NerdFont"; - package = pkgs.nerdfonts.override { fonts = [ "FiraCode" "JetBrainsMono" ]; }; - size = 12; - }; - }; +{ pkgs, lib, ... }: { + home.packages = with pkgs; [ + noto-fonts + noto-fonts-cjk + openmoji-color + (nerdfonts.override { fonts = [ "FiraCode" "JetBrainsMono" ]; }) + ]; + gtk = { + enable = true; + iconTheme = { + name = "Papirus-Dark"; + package = pkgs.papirus-icon-theme.override { color = "yaru"; }; + }; + font = lib.mkForce { + name = "JetBrainsMono NerdFont"; + package = + pkgs.nerdfonts.override { fonts = [ "FiraCode" "JetBrainsMono" ]; }; + size = 12; + }; + }; } diff --git a/home/themes/qt/default.nix b/home/themes/qt/default.nix index 0d85ecb..a7ab7cd 100644 --- a/home/themes/qt/default.nix +++ b/home/themes/qt/default.nix @@ -1,7 +1 @@ -{ - imports = [ - ./qt5ct.nix - ./qt6ct.nix - ./qt.nix - ]; -} +{ imports = [ ./qt5ct.nix ./qt6ct.nix ./qt.nix ]; } diff --git a/home/themes/qt/qt.nix b/home/themes/qt/qt.nix index 55b3e3a..a4c8df1 100644 --- a/home/themes/qt/qt.nix +++ b/home/themes/qt/qt.nix @@ -1,6 +1,6 @@ { - qt = { - enable = true; - platformTheme.name = "qtct"; - }; + qt = { + enable = true; + platformTheme.name = "qtct"; + }; } diff --git a/home/themes/qt/qt5ct.nix b/home/themes/qt/qt5ct.nix index 726204e..ee83c9c 100644 --- a/home/themes/qt/qt5ct.nix +++ b/home/themes/qt/qt5ct.nix @@ -1,11 +1,10 @@ -{ pkgs, config, ... }: -{ +{ pkgs, config, ... }: { xdg.configFile = with config.lib.stylix.colors; { "qt5ct/colors/paradise.conf".text = '' - [ColorScheme] - active_colors=#ff${base06}, #ff${base01}, #ff${base01}, #ff${base00}, #ff${base03}, #ff${base0C}, #ff${base06}, #ff${base06}, #${base06}, #ff${base00}, #ff${base01}, #ff${base00}, #ff${base02}, #ff${base06}, #ff${base0B}, #ff, #ff151515, #ffe8e3e3, #ff181926, #ffe8e3e3, #80151515 - disabled_colors=#ff808080, #ff1f1f1f, #ff1f1f1f, #ff151515, #ff424242, #ff6e738d, #ff808080, #ffe8e3e3, #ff808080, #ff151515, #ff1f1f1f, #ff151515, #ff2e2e2e, #ff808080, #ff8c977d, #ffed8796, #ff151515, #ffe8e3e3, #ff181926, #ffe8e3e3, #80151515 - inactive_colors=#ffe8e3e3, #ff1f1f1f, #ff1f1f1f, #ff151515, #ff424242, #ff6e738d, #ffe8e3e3, #ffe8e3e3, #ffe8e3e3, #ff151515, #ff1f1f1f, #ff151515, #ff2e2e2e, #ffbbb6b6, #ff8c977d, #ffed8796, #ff151515, #ffe8e3e3, #ff181926, #ffe8e3e3, #80151515 + [ColorScheme] + active_colors=#ff${base06}, #ff${base01}, #ff${base01}, #ff${base00}, #ff${base03}, #ff${base0C}, #ff${base06}, #ff${base06}, #${base06}, #ff${base00}, #ff${base01}, #ff${base00}, #ff${base02}, #ff${base06}, #ff${base0B}, #ff, #ff151515, #ffe8e3e3, #ff181926, #ffe8e3e3, #80151515 + disabled_colors=#ff808080, #ff1f1f1f, #ff1f1f1f, #ff151515, #ff424242, #ff6e738d, #ff808080, #ffe8e3e3, #ff808080, #ff151515, #ff1f1f1f, #ff151515, #ff2e2e2e, #ff808080, #ff8c977d, #ffed8796, #ff151515, #ffe8e3e3, #ff181926, #ffe8e3e3, #80151515 + inactive_colors=#ffe8e3e3, #ff1f1f1f, #ff1f1f1f, #ff151515, #ff424242, #ff6e738d, #ffe8e3e3, #ffe8e3e3, #ffe8e3e3, #ff151515, #ff1f1f1f, #ff151515, #ff2e2e2e, #ffbbb6b6, #ff8c977d, #ffed8796, #ff151515, #ffe8e3e3, #ff181926, #ffe8e3e3, #80151515 ''; "qt5ct/qt5ct.conf".text = '' [Appearance] diff --git a/home/themes/qt/qt6ct.nix b/home/themes/qt/qt6ct.nix index a858061..ee35252 100644 --- a/home/themes/qt/qt6ct.nix +++ b/home/themes/qt/qt6ct.nix @@ -1,11 +1,10 @@ -{ pkgs, ... }: -{ +{ pkgs, ... }: { xdg.configFile = { "qt6ct/colors/paradise.conf".text = '' - [ColorScheme] - active_colors=#ffe8e3e3, #ff1f1f1f, #ff1f1f1f, #ff151515, #ff424242, #ff6e738d, #ffe8e3e3, #ffe8e3e3, #ffe8e3e3, #ff151515, #ff1f1f1f, #ff151515, #ff2e2e2e, #ffbbb6b6, #ff8c977d, #ffed8796, #ff151515, #ffe8e3e3, #ff181926, #ffe8e3e3, #80151515 - disabled_colors=#ff808080, #ff1f1f1f, #ff1f1f1f, #ff151515, #ff424242, #ff6e738d, #ff808080, #ffe8e3e3, #ff808080, #ff151515, #ff1f1f1f, #ff151515, #ff2e2e2e, #ff808080, #ff8c977d, #ffed8796, #ff151515, #ffe8e3e3, #ff181926, #ffe8e3e3, #80151515 - inactive_colors=#ffe8e3e3, #ff1f1f1f, #ff1f1f1f, #ff151515, #ff424242, #ff6e738d, #ffe8e3e3, #ffe8e3e3, #ffe8e3e3, #ff151515, #ff1f1f1f, #ff151515, #ff2e2e2e, #ffbbb6b6, #ff8c977d, #ffed8796, #ff151515, #ffe8e3e3, #ff181926, #ffe8e3e3, #80151515 + [ColorScheme] + active_colors=#ffe8e3e3, #ff1f1f1f, #ff1f1f1f, #ff151515, #ff424242, #ff6e738d, #ffe8e3e3, #ffe8e3e3, #ffe8e3e3, #ff151515, #ff1f1f1f, #ff151515, #ff2e2e2e, #ffbbb6b6, #ff8c977d, #ffed8796, #ff151515, #ffe8e3e3, #ff181926, #ffe8e3e3, #80151515 + disabled_colors=#ff808080, #ff1f1f1f, #ff1f1f1f, #ff151515, #ff424242, #ff6e738d, #ff808080, #ffe8e3e3, #ff808080, #ff151515, #ff1f1f1f, #ff151515, #ff2e2e2e, #ff808080, #ff8c977d, #ffed8796, #ff151515, #ffe8e3e3, #ff181926, #ffe8e3e3, #80151515 + inactive_colors=#ffe8e3e3, #ff1f1f1f, #ff1f1f1f, #ff151515, #ff424242, #ff6e738d, #ffe8e3e3, #ffe8e3e3, #ffe8e3e3, #ff151515, #ff1f1f1f, #ff151515, #ff2e2e2e, #ffbbb6b6, #ff8c977d, #ffed8796, #ff151515, #ffe8e3e3, #ff181926, #ffe8e3e3, #80151515 ''; "qt6ct/qt6ct.conf".text = '' [Appearance] diff --git a/home/themes/stylix/paradise.nix b/home/themes/stylix/paradise.nix index b1a8ca0..d82c51b 100644 --- a/home/themes/stylix/paradise.nix +++ b/home/themes/stylix/paradise.nix @@ -1,25 +1,25 @@ { inputs, ... }: -let walls = inputs.nix-wallpapers; in -{ - stylix = { - image = "${walls}/desktop/cassette.jpg"; - base16Scheme = { - base00 = "#151515"; - base01 = "#1F1F1F"; - base02 = "#2E2E2E"; - base03 = "#424242"; - base04 = "#BBB6B6"; - base05 = "#E8E3E3"; - base06 = "#E8E3E3"; - base07 = "#E8E3E3"; - base08 = "#B66467"; - base09 = "#D9BC8C"; - base0A = "#D9BC8C"; - base0B = "#8C977D"; - base0C = "#8AA6A2"; - base0D = "#8DA3B9"; - base0E = "#A988B0"; - base0F = "#BBB6B6"; - }; - }; +let walls = inputs.nix-wallpapers; +in { + stylix = { + image = "${walls}/desktop/cassette.jpg"; + base16Scheme = { + base00 = "#151515"; + base01 = "#1F1F1F"; + base02 = "#2E2E2E"; + base03 = "#424242"; + base04 = "#BBB6B6"; + base05 = "#E8E3E3"; + base06 = "#E8E3E3"; + base07 = "#E8E3E3"; + base08 = "#B66467"; + base09 = "#D9BC8C"; + base0A = "#D9BC8C"; + base0B = "#8C977D"; + base0C = "#8AA6A2"; + base0D = "#8DA3B9"; + base0E = "#A988B0"; + base0F = "#BBB6B6"; + }; + }; } diff --git a/home/themes/stylix/stylix.nix b/home/themes/stylix/stylix.nix index 744e28f..130eb65 100644 --- a/home/themes/stylix/stylix.nix +++ b/home/themes/stylix/stylix.nix @@ -1,52 +1,48 @@ -{ config, pkgs, inputs, ... }: -{ - imports = [ - inputs.stylix.homeManagerModules.stylix - ./paradise.nix - ]; - stylix = { - enable = true; - autoEnable = false; - cursor = { - name = "GoogleDot-Black"; - package = pkgs.google-cursor; - size = 21; - }; - fonts = { - serif = { - name = "JetBrainsMono NerdFont"; - package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }; - }; - monospace = config.stylix.fonts.serif; - emoji = { - name = "OpenMoji Color"; - package = pkgs.noto-fonts-emoji; - }; - sizes = { - desktop = 10; - popups = 10; - applications = 12; - terminal = 12; - }; - }; - targets = { - tmux.enable = true; - fish.enable = true; - nushell.enable = true; - hyprland.enable = true; - sway.enable = true; - foot.enable = true; - kitty.enable = true; - gtk.enable = true; - nixvim.enable = true; - yazi.enable = true; - fzf.enable = true; - bat.enable = true; - mako.enable = true; - mangohud.enable = true; - vesktop.enable = true; - qutebrowser.enable = true; - firefox.enable = true; - }; - }; +{ config, pkgs, inputs, ... }: { + imports = [ inputs.stylix.homeManagerModules.stylix ./paradise.nix ]; + stylix = { + enable = true; + autoEnable = false; + cursor = { + name = "GoogleDot-Black"; + package = pkgs.google-cursor; + size = 21; + }; + fonts = { + serif = { + name = "JetBrainsMono NerdFont"; + package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }; + }; + monospace = config.stylix.fonts.serif; + emoji = { + name = "OpenMoji Color"; + package = pkgs.noto-fonts-emoji; + }; + sizes = { + desktop = 10; + popups = 10; + applications = 12; + terminal = 12; + }; + }; + targets = { + tmux.enable = true; + fish.enable = true; + nushell.enable = true; + hyprland.enable = true; + sway.enable = true; + foot.enable = true; + kitty.enable = true; + gtk.enable = true; + nixvim.enable = true; + yazi.enable = true; + fzf.enable = true; + bat.enable = true; + mako.enable = true; + mangohud.enable = true; + vesktop.enable = true; + qutebrowser.enable = true; + firefox.enable = true; + }; + }; } diff --git a/home/window-managers/hyprland/binds.nix b/home/window-managers/hyprland/binds.nix index ffc00ac..5ff2186 100644 --- a/home/window-managers/hyprland/binds.nix +++ b/home/window-managers/hyprland/binds.nix @@ -1,161 +1,161 @@ -{ pkgs, config, ... }: -{ - wayland.windowManager.hyprland.settings = with pkgs; { - # SHORTCUTS - "$m" = "SUPER"; - "$s" = "SHIFT"; - "$a" = "ALT"; - "$c" = "CTRL"; +{ pkgs, config, ... }: { + wayland.windowManager.hyprland.settings = with pkgs; { + # SHORTCUTS + "$m" = "SUPER"; + "$s" = "SHIFT"; + "$a" = "ALT"; + "$c" = "CTRL"; - "$rt" = "RETURN"; - "$sp" = "SPACE"; - "$tb" = "TAB"; - - "$nx" = "Next"; - "$pr" = "Prior"; - "$p" = "Print"; + "$rt" = "RETURN"; + "$sp" = "SPACE"; + "$tb" = "TAB"; - "$md" = "mouse_down"; - "$mu" = "mouse_up"; + "$nx" = "Next"; + "$pr" = "Prior"; + "$p" = "Print"; - # MOUSE - bindm = [ - "$m, mouse:272, movewindow" - "$m, mouse:273, resizewindow" - "$m $s, mouse:273, resizewindow 1" - ]; + "$md" = "mouse_down"; + "$mu" = "mouse_up"; - # KEYBOARD - bind = [ - # BUILTIN COMMANDS - "$m, $sp, togglefloating" - # "$m $s, $sp, hyprexpo:expo, toggle" - "$m, Q, killactive" - "$m, C, centerwindow" - "$m, F, fullscreen" - "$m, X, pseudo" - "$m, P, pin" - - "$m, O, cyclenext" - "$m $s, O, swapnext " - - "$m, G, togglegroup" - "$m $s, G, changegroupactive" - "$m $a, G, moveoutofgroup" - - "$m, D, togglespecialworkspace, extra" - "$m $s, D, movetoworkspace, special:extra" - - "$m, S, togglespecialworkspace, magic" - "$m $s, S, movetoworkspace, special:magic" + # MOUSE + bindm = [ + "$m, mouse:272, movewindow" + "$m, mouse:273, resizewindow" + "$m $s, mouse:273, resizewindow 1" + ]; - "$m, $md, workspace, e+1" - "$m, $mu, workspace, e-1" + # KEYBOARD + bind = [ + # BUILTIN COMMANDS + "$m, $sp, togglefloating" + # "$m $s, $sp, hyprexpo:expo, toggle" + "$m, Q, killactive" + "$m, C, centerwindow" + "$m, F, fullscreen" + "$m, X, pseudo" + "$m, P, pin" - "$m, $nx, workspace, e+1" - "$m, $pr, workspace, e-1" - - # PROGRAMS - "$m, $rt, exec, kitty -T Terminal" - "$m $s, $rt, exec, kitty --class=termfloat -T Terminal" - - "$m, $tb, exec, nwg-drawer -ovl -nocats -nofs -d -c 7 -mb -49" - - "$m, V, exec, ayugram-desktop" - "$m $s, V, exec, vesktop" - - "$m, B, exec, floorp" - "$m $s, B, exec, firefox" - - "$m, N, exec, kitty -T Explorer yazi" - "$m $s, N, exec, kitty --class=tfm -T Explorer yazi" - "$m $a, N, exec, nemo" - - "$m, M, exec, spotify" - "$m $s, M, exec, obsidian" - - "$m, A, exec, kitty --class=anicliru -T Anime anicli-ru -q 1080" - - "$m, Z, exec, kitty --class=miniprogs -T Sound pulsemixer --no-mouse" - "$m $s, Z, exec, kitty --class=miniprogs -T Bluetooth bluetuith" - - "$m, T, exec, bottles" - "$m $s, T, exec, prismlauncher" + "$m, O, cyclenext" + "$m $s, O, swapnext " - "$m, XF86WakeUp, exec, playerctl play-pause" - "$m, XF86Go, exec, playerctl next" - "$m, Cancel, exec, playerctl previous" - - ", $p, exec, grimblast copysave area $(xdg-user-dir PICTURES)/$(date +'scr_%d-%m-%y|%H:%M:%S.png')" - "$s, $p, exec, grimblast copysave output $(xdg-user-dir PICTURES)/$(date +'scr_%d-%m-%y|%H:%M:%S.png')" - "$a, $p, exec, grimblast copysave active $(xdg-user-dir PICTURES)/$(date +'scr_%d-%m-%y|%H:%M:%S.png')" - "$a $s, $p, exec, hyprpicker -a" - ] - ++ ( builtins.concatLists (builtins.genList (i: let ws = i + 1; in [ - "$mod, code:1${toString i}, workspace, ${toString ws}" - "$mod SHIFT, code:1${toString i}, movetoworkspace, ${toString ws}" - ] ) 9) ); + "$m, G, togglegroup" + "$m $s, G, changegroupactive" + "$m $a, G, moveoutofgroup" - # HOLDING BUTTONS - binde = [ - # HJKL - "$m, H, movefocus, l" - "$m, J, movefocus, d" - "$m, K, movefocus, u" - "$m, L, movefocus, r" - - "$m $s, H, swapwindow, l" - "$m $s, J, swapwindow, d" - "$m $s, K, swapwindow, u" - "$m $s, L, swapwindow, r" + "$m, D, togglespecialworkspace, extra" + "$m $s, D, movetoworkspace, special:extra" - "$m $a, H, resizeactive, -50 0" - "$m $a, J, resizeactive, 0 50" - "$m $a, K, resizeactive, 0 -50" - "$m $a, L, resizeactive, 50 0" + "$m, S, togglespecialworkspace, magic" + "$m $s, S, movetoworkspace, special:magic" - "$m $c, H, moveactive, -50 0" - "$m $c, J, moveactive, 0 50" - "$m $c, K, moveactive, 0 -50" - "$m $c, L, moveactive, 50 0" + "$m, $md, workspace, e+1" + "$m, $mu, workspace, e-1" - # ARROWS - "$m, left, movefocus, l" - "$m, down, movefocus, d" - "$m, up, movefocus, u" - "$m, right, movefocus, r" - - "$m $s, left, swapwindow, l" - "$m $s, down, swapwindow, d" - "$m $s, up, swapwindow, u" - "$m $s, right, swapwindow, r" + "$m, $nx, workspace, e+1" + "$m, $pr, workspace, e-1" - "$m $a, left, resizeactive, -50 0" - "$m $a, down, resizeactive, 0 50" - "$m $a, up, resizeactive, 0 -50" - "$m $a, right, resizeactive, 50 0" + # PROGRAMS + "$m, $rt, exec, kitty -T Terminal" + "$m $s, $rt, exec, kitty --class=termfloat -T Terminal" - "$m $c, left, moveactive, -50 0" - "$m $c, down, moveactive, 0 50" - "$m $c, up, moveactive, 0 -50" - "$m $c, right, moveactive, 50 0" - - # BRIGHTNESS - ", XF86MonBrightnessDown, exec, doas light -U 10" - ", XF86MonBrightnessUp, exec, doas light -A 10" + "$m, $tb, exec, nwg-drawer -ovl -nocats -nofs -d -c 7 -mb -49" - # SOUND - ", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+" - ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" - - "$s, XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 10%+" - "$s, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 10%-" + "$m, V, exec, ayugram-desktop" + "$m $s, V, exec, vesktop" - ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" - ", XF86AudioMicMute, exec, fixf4=$(cat /sys/class/leds/platform\:\:micmute/brightness); echo $((1-fixf4)) | doas tee /sys/class/leds/platform\:\:micmute/brightness; wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle" - ]; - bindl = [ - # ", switch:on:Lid Switch, exec, hyprctl keyword input:kb_variant = us && hyprlock" - ]; - }; + "$m, B, exec, floorp" + "$m $s, B, exec, firefox" + + "$m, N, exec, kitty -T Explorer yazi" + "$m $s, N, exec, kitty --class=tfm -T Explorer yazi" + "$m $a, N, exec, nemo" + + "$m, M, exec, spotify" + "$m $s, M, exec, obsidian" + + "$m, A, exec, kitty --class=anicliru -T Anime anicli-ru -q 1080" + + "$m, Z, exec, kitty --class=miniprogs -T Sound pulsemixer --no-mouse" + "$m $s, Z, exec, kitty --class=miniprogs -T Bluetooth bluetuith" + + "$m, T, exec, bottles" + "$m $s, T, exec, prismlauncher" + + "$m, XF86WakeUp, exec, playerctl play-pause" + "$m, XF86Go, exec, playerctl next" + "$m, Cancel, exec, playerctl previous" + + ", $p, exec, grimblast copysave area $(xdg-user-dir PICTURES)/$(date +'scr_%d-%m-%y|%H:%M:%S.png')" + "$s, $p, exec, grimblast copysave output $(xdg-user-dir PICTURES)/$(date +'scr_%d-%m-%y|%H:%M:%S.png')" + "$a, $p, exec, grimblast copysave active $(xdg-user-dir PICTURES)/$(date +'scr_%d-%m-%y|%H:%M:%S.png')" + "$a $s, $p, exec, hyprpicker -a" + ] ++ (builtins.concatLists (builtins.genList (i: + let ws = i + 1; + in [ + "$mod, code:1${toString i}, workspace, ${toString ws}" + "$mod SHIFT, code:1${toString i}, movetoworkspace, ${toString ws}" + ]) 9)); + + # HOLDING BUTTONS + binde = [ + # HJKL + "$m, H, movefocus, l" + "$m, J, movefocus, d" + "$m, K, movefocus, u" + "$m, L, movefocus, r" + + "$m $s, H, swapwindow, l" + "$m $s, J, swapwindow, d" + "$m $s, K, swapwindow, u" + "$m $s, L, swapwindow, r" + + "$m $a, H, resizeactive, -50 0" + "$m $a, J, resizeactive, 0 50" + "$m $a, K, resizeactive, 0 -50" + "$m $a, L, resizeactive, 50 0" + + "$m $c, H, moveactive, -50 0" + "$m $c, J, moveactive, 0 50" + "$m $c, K, moveactive, 0 -50" + "$m $c, L, moveactive, 50 0" + + # ARROWS + "$m, left, movefocus, l" + "$m, down, movefocus, d" + "$m, up, movefocus, u" + "$m, right, movefocus, r" + + "$m $s, left, swapwindow, l" + "$m $s, down, swapwindow, d" + "$m $s, up, swapwindow, u" + "$m $s, right, swapwindow, r" + + "$m $a, left, resizeactive, -50 0" + "$m $a, down, resizeactive, 0 50" + "$m $a, up, resizeactive, 0 -50" + "$m $a, right, resizeactive, 50 0" + + "$m $c, left, moveactive, -50 0" + "$m $c, down, moveactive, 0 50" + "$m $c, up, moveactive, 0 -50" + "$m $c, right, moveactive, 50 0" + + # BRIGHTNESS + ", XF86MonBrightnessDown, exec, doas light -U 10" + ", XF86MonBrightnessUp, exec, doas light -A 10" + + # SOUND + ", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+" + ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" + + "$s, XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 10%+" + "$s, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 10%-" + + ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" + ", XF86AudioMicMute, exec, fixf4=$(cat /sys/class/leds/platform::micmute/brightness); echo $((1-fixf4)) | doas tee /sys/class/leds/platform::micmute/brightness; wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle" + ]; + bindl = [ + # ", switch:on:Lid Switch, exec, hyprctl keyword input:kb_variant = us && hyprlock" + ]; + }; } diff --git a/home/window-managers/hyprland/default.nix b/home/window-managers/hyprland/default.nix index 4dade89..7d790a9 100644 --- a/home/window-managers/hyprland/default.nix +++ b/home/window-managers/hyprland/default.nix @@ -1,13 +1,11 @@ -{ pkgs, inputs, ... }: -let - hpkg = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}; -in -{ - imports = [ ./binds.nix ./rules.nix ./settings.nix ./plugins.nix ]; - wayland.windowManager.hyprland = { - enable = true; - package = hpkg.hyprland; - xwayland.enable = true; - systemd.enable = true; - }; +{ pkgs, inputs, ... }: +let hpkg = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}; +in { + imports = [ ./binds.nix ./rules.nix ./settings.nix ./plugins.nix ]; + wayland.windowManager.hyprland = { + enable = true; + package = hpkg.hyprland; + xwayland.enable = true; + systemd.enable = true; + }; } diff --git a/home/window-managers/hyprland/plugins.nix b/home/window-managers/hyprland/plugins.nix index c271a2f..f923cfb 100644 --- a/home/window-managers/hyprland/plugins.nix +++ b/home/window-managers/hyprland/plugins.nix @@ -1,70 +1,70 @@ -{ pkgs, inputs, config, ... }: -{ - wayland.windowManager.hyprland = with config.lib.stylix.colors; { - plugins = with inputs; [ - hyprfocus.packages.${pkgs.system}.default - # hyprland-plugins.packages.${pkgs.system}.hyprexpo - ]; - settings.plugin = { - # FOCUS - hyprfocus = { - enabled = "yes"; - animate_floating = "yes"; - animate_workspacechange = "yes"; - focus_animation = "focus"; - bezier = [ - "bezIn, 0.5,0.0,1.0,0.5" - "bezOut, 0.0,0.5,0.5,1.0" - "overshot, 0.05, 0.9, 0.1, 1.05" - "smoothOut, 0.36, 0, 0.66, -0.56" - "smoothIn, 0.25, 1, 0.5, 1" - "realsmooth, 0.28,0.29,.69,1.08" - ]; - flash = { - flash_opacity = 0.95; - in_bezier = "realsmooth"; - in_speed = 0.5; - out_bezier = "realsmooth"; - out_speed = 3; +{ pkgs, inputs, config, ... }: { + wayland.windowManager.hyprland = with config.lib.stylix.colors; { + plugins = with inputs; + [ + hyprfocus.packages.${pkgs.system}.default + # hyprland-plugins.packages.${pkgs.system}.hyprexpo + ]; + settings.plugin = { + # FOCUS + hyprfocus = { + enabled = "yes"; + animate_floating = "yes"; + animate_workspacechange = "yes"; + focus_animation = "focus"; + bezier = [ + "bezIn, 0.5,0.0,1.0,0.5" + "bezOut, 0.0,0.5,0.5,1.0" + "overshot, 0.05, 0.9, 0.1, 1.05" + "smoothOut, 0.36, 0, 0.66, -0.56" + "smoothIn, 0.25, 1, 0.5, 1" + "realsmooth, 0.28,0.29,.69,1.08" + ]; + flash = { + flash_opacity = 0.95; + in_bezier = "realsmooth"; + in_speed = 0.5; + out_bezier = "realsmooth"; + out_speed = 3; }; - shrink = { - shrink_percentage = 0.95; - in_bezier = "realsmooth"; - in_speed = 1; - out_bezier = "realsmooth"; - out_speed = 2; - }; - }; + shrink = { + shrink_percentage = 0.95; + in_bezier = "realsmooth"; + in_speed = 1; + out_bezier = "realsmooth"; + out_speed = 2; + }; + }; - # EXPO LIKE IDK - # hyprexpo = { - # columns = 3; - # gap_size = 5; - # bg_col = "rgb(${base00})"; - # workspace_method = "center current"; + # EXPO LIKE IDK + # hyprexpo = { + # columns = 3; + # gap_size = 5; + # bg_col = "rgb(${base00})"; + # workspace_method = "center current"; - # enable_gesture = true; - # gesture_fingers = 3; - # gesture_distance = 300; - # gesture_positive = true; - # }; + # enable_gesture = true; + # gesture_fingers = 3; + # gesture_distance = 300; + # gesture_positive = true; + # }; - # WINDOW TITLES - # hyprbars = { - # bar_height = 20; - # bar_color = "rgb(${base00})"; - # "col.text" = "rgb(${base06})"; - # bar_text_size = 12; - # bar_text_font = "JetBrainsMono NerdFont"; - # bar_text_align = "left"; - # bar_buttons_alignment = "left"; - # bar_part_of_window = true; - # bar_precedence_over_border = true; - # hyprbars-button = [ - # "rgb(${base08}), 10, 󰖭, hyprctl dispatch killactive" - # "rgb(${base0C}), 10, , hyprctl dispatch fullscreen 1" - # ]; - # }; - }; - }; + # WINDOW TITLES + # hyprbars = { + # bar_height = 20; + # bar_color = "rgb(${base00})"; + # "col.text" = "rgb(${base06})"; + # bar_text_size = 12; + # bar_text_font = "JetBrainsMono NerdFont"; + # bar_text_align = "left"; + # bar_buttons_alignment = "left"; + # bar_part_of_window = true; + # bar_precedence_over_border = true; + # hyprbars-button = [ + # "rgb(${base08}), 10, 󰖭, hyprctl dispatch killactive" + # "rgb(${base0C}), 10, , hyprctl dispatch fullscreen 1" + # ]; + # }; + }; + }; } diff --git a/home/window-managers/hyprland/rules.nix b/home/window-managers/hyprland/rules.nix index adec13b..cf1721f 100644 --- a/home/window-managers/hyprland/rules.nix +++ b/home/window-managers/hyprland/rules.nix @@ -1,40 +1,40 @@ -{ config, lib, ... }: -{ - wayland.windowManager.hyprland.settings = with config.lib.stylix.colors; { - windowrulev2 = [ - # "rounding 8, floating:1" - # "noshadow, floating:0" - # "noanim, floating:0" +{ config, lib, ... }: { + wayland.windowManager.hyprland.settings = with config.lib.stylix.colors; { + windowrulev2 = [ + # "rounding 8, floating:1" + # "noshadow, floating:0" + # "noanim, floating:0" - "workspace 2 silent, class:^(firefox)$" - "workspace 3 silent, class:^(Spotify)$" - "workspace 4 silent, class:^(com.ayugram)$" - "workspace 4 silent, class:^(vesktop)$" - "workspace 5 silent, class:^(obsidian)$" - "workspace 6 silent, class:^(anicli)$" + "workspace 2 silent, class:^(firefox)$" + "workspace 2 silent, class:^(floorp)$" + "workspace 3 silent, class:^(Spotify)$" + "workspace 4 silent, class:^(com.ayugram)$" + "workspace 4 silent, class:^(vesktop)$" + "workspace 5 silent, class:^(obsidian)$" + "workspace 6 silent, class:^(anicli)$" - "float, class:^(termfloat)$" - "size 650 430, class:^(termfloat)$" - "move center, class:^(termfloat)$" + "float, class:^(termfloat)$" + "size 650 430, class:^(termfloat)$" + "move center, class:^(termfloat)$" - "float, class:^(tfm)$" - "size 800 350, class:^(tfm)$" - "move center, class:^(tfm)$" + "float, class:^(tfm)$" + "size 800 350, class:^(tfm)$" + "move center, class:^(tfm)$" - "float, title:^(Media viewer)$" - "fullscreen, title:^(Media viewer)$" - "size 670 540, title:^(Media viewer)$" + "float, title:^(Media viewer)$" + "fullscreen, title:^(Media viewer)$" + "size 670 540, title:^(Media viewer)$" - "float, class:^(xdg-desktop-portal-gtk)$" - "size 807 570, class:^(xdg-desktop-portal-gtk)$" + "float, class:^(xdg-desktop-portal-gtk)$" + "size 807 570, class:^(xdg-desktop-portal-gtk)$" - "nodim, class:^(mpv)$" - "float, class:^(anicliru)$" - "size 660 630, class:^(anicliru)$" - "bordercolor rgb(${base08}) rgb(${base09}) 45deg, class:^(anicliru)$" + "nodim, class:^(mpv)$" + "float, class:^(anicliru)$" + "size 660 630, class:^(anicliru)$" + "bordercolor rgb(${base08}) rgb(${base09}) 45deg, class:^(anicliru)$" - "bordercolor rgb(${base0E}, title:^(Картинка в картинке)$" - "noshadow, title:^(Картинка в картинке)$" - ]; - }; + "bordercolor rgb(${base0E}, title:^(Картинка в картинке)$" + "noshadow, title:^(Картинка в картинке)$" + ]; + }; } diff --git a/home/window-managers/hyprland/settings.nix b/home/window-managers/hyprland/settings.nix index c9e8838..5f02c40 100644 --- a/home/window-managers/hyprland/settings.nix +++ b/home/window-managers/hyprland/settings.nix @@ -1,125 +1,117 @@ -{ config, lib, ... }: -{ - wayland.windowManager.hyprland = { - settings = with config.lib.stylix.colors; { - monitor = ", 1920x1080@60, auto, 1"; - env = [ "SLURP_ARGS, -b ${base00}CC -c ${base06}FF -B ${base0F}CC" ]; - exec-once = [ - "mako" - "waybar" - ]; - - # APPERANCE - general = { - gaps_in = 4; - gaps_out = 8; - border_size = 3; - layout = "dwindle"; - allow_tearing = false; - "col.active_border" = lib.mkForce "rgb(${base01})"; - "col.inactive_border" = lib.mkForce "rgb(${base01})"; - }; - decoration = { - rounding = 12; - drop_shadow = true; - shadow_ignore_window = true; - shadow_offset = "0 0"; - shadow_range = 10; - shadow_render_power = 8; - dim_inactive = true; - dim_strength = 0.3; - blur = { - enabled = true; - size = 18; - passes = 5; - noise = 0; - new_optimizations = true; - ignore_opacity = true; - xray = false; - vibrancy = 0.9; - popups = true; - special = true; - }; - }; - group = { - "col.border_active" = lib.mkForce "rgb(${base0C}) rgb(${base0B}) 45deg"; - "col.border_inactive" = lib.mkForce "rgb(${base01})"; - groupbar = { - gradients = false; - "col.active" = lib.mkForce "rgb(${base05})"; - "col.inactive" = lib.mkForce "rgb(${base01})"; - render_titles = false; - }; - }; - - # ANIMATIONS - animations = { - enabled = true; - first_launch_animation = false; - bezier = [ - "linear, 1, 1, 1, 1" - "over, 0, 0.1, 0.1, 0.3" - "myBezier, 0.05, 0.9, 0.1, 1.0" - ]; - animation = [ - "windowsIn, 1, 3, myBezier, popin 80%" - "windowsOut, 1, 3, myBezier, popin 80%" - "windowsMove, 1, 2, over" - - "border, 1, 3, myBezier" - "workspaces, 1, 2.7, default, slide" - "specialWorkspaceIn, 1, 1, default, fade" - "specialWorkspaceOut, 1, 1, default, fade" - - "fade, 1, 2, myBezier" - "fadeShadow, 1, 4, default" - ]; - }; - - # TRACKPOINT | TOUCHPAD | MOUSE - cursor.inactive_timeout = 1; - input = { - kb_layout = "us,ru"; - kb_options = "grp:caps_toggle"; - accel_profile = "adaptive"; - touchpad = { - natural_scroll = false; - disable_while_typing = true; - }; - }; - gestures = { - workspace_swipe = true; - workspace_swipe_fingers = 3; - workspace_swipe_create_new = true; - }; - - # WINDOW LAYOUT - dwindle = { - pseudotile = true; - preserve_split = true; - smart_resizing = true; - # no_gaps_when_only = true; - force_split = 2; - }; - - misc = { - disable_hyprland_logo = true; - disable_splash_rendering = true; - mouse_move_enables_dpms = true; - vfr = true; - vrr = 1; - animate_manual_resizes = true; - animate_mouse_windowdragging = true; - enable_swallow = true ; - close_special_on_empty = true; - background_color = lib.mkForce "rgb(${base00})"; - }; - }; - extraConfig = '' - device { - name = tpps/2-elan-trackpoint - accel_profile = flat - } - ''; - }; +{ config, lib, ... }: { + wayland.windowManager.hyprland = { + settings = with config.lib.stylix.colors; { + monitor = ", 1920x1080@60, auto, 1"; + env = [ "SLURP_ARGS, -b ${base00}CC -c ${base06}FF -B ${base0F}CC" ]; + exec-once = [ "mako" "waybar" ]; + + # APPERANCE + general = { + gaps_in = 4; + gaps_out = 8; + border_size = 3; + layout = "dwindle"; + allow_tearing = false; + "col.active_border" = lib.mkForce "rgb(${base01})"; + "col.inactive_border" = lib.mkForce "rgb(${base01})"; + }; + decoration = { + rounding = 12; + drop_shadow = true; + shadow_ignore_window = true; + shadow_offset = "0 0"; + shadow_range = 10; + shadow_render_power = 8; + dim_inactive = true; + dim_strength = 0.3; + blur = { + enabled = true; + size = 18; + passes = 5; + noise = 0; + new_optimizations = true; + ignore_opacity = true; + xray = false; + vibrancy = 0.9; + popups = true; + special = true; + }; + }; + group = { + "col.border_active" = lib.mkForce "rgb(${base0C}) rgb(${base0B}) 45deg"; + "col.border_inactive" = lib.mkForce "rgb(${base01})"; + groupbar = { + gradients = false; + "col.active" = lib.mkForce "rgb(${base05})"; + "col.inactive" = lib.mkForce "rgb(${base01})"; + render_titles = false; + }; + }; + + # ANIMATIONS + animations = { + enabled = true; + first_launch_animation = false; + bezier = [ + "linear, 1, 1, 1, 1" + "over, 0, 0.1, 0.1, 0.3" + "myBezier, 0.05, 0.9, 0.1, 1.0" + ]; + animation = [ + "windowsIn, 1, 3, myBezier, popin 80%" + "windowsOut, 1, 3, myBezier, popin 80%" + "windowsMove, 1, 2, over" + + "border, 1, 3, myBezier" + "workspaces, 1, 2.7, default, slide" + "specialWorkspaceIn, 1, 1, default, fade" + "specialWorkspaceOut, 1, 1, default, fade" + + "fade, 1, 2, myBezier" + "fadeShadow, 1, 4, default" + ]; + }; + + # TRACKPOINT | TOUCHPAD | MOUSE + cursor.inactive_timeout = 1; + input = { + kb_layout = "us,ru"; + kb_options = "grp:caps_toggle"; + accel_profile = "adaptive"; + touchpad = { + natural_scroll = false; + disable_while_typing = true; + }; + }; + gestures = { + workspace_swipe = true; + workspace_swipe_fingers = 3; + workspace_swipe_create_new = true; + }; + + # WINDOW LAYOUT + dwindle = { + pseudotile = true; + preserve_split = true; + smart_resizing = true; + # no_gaps_when_only = true; + force_split = 2; + }; + + misc = { + disable_hyprland_logo = true; + disable_splash_rendering = true; + mouse_move_enables_dpms = true; + vfr = true; + vrr = 1; + animate_manual_resizes = true; + animate_mouse_windowdragging = true; + enable_swallow = true; + close_special_on_empty = true; + background_color = lib.mkForce "rgb(${base00})"; + }; + }; + extraConfig = + " device {\n name = tpps/2-elan-trackpoint\n accel_profile = flat\n }\n"; + }; } diff --git a/home/window-managers/misc/default.nix b/home/window-managers/misc/default.nix index 7c93ded..4a9839f 100644 --- a/home/window-managers/misc/default.nix +++ b/home/window-managers/misc/default.nix @@ -1,7 +1 @@ -{ - imports = [ - ./mako - ./waybar - ./swaync - ]; -} +{ imports = [ ./mako ./waybar ./swaync ]; } diff --git a/home/window-managers/misc/mako/default.nix b/home/window-managers/misc/mako/default.nix index 453cbb6..fff251d 100644 --- a/home/window-managers/misc/mako/default.nix +++ b/home/window-managers/misc/mako/default.nix @@ -1,19 +1,18 @@ -{ config, lib, ...}: -{ - services.mako = with config.lib.stylix.colors; { - enable = true; - icons = true; - anchor = "top-right"; - actions = false; - backgroundColor = lib.mkForce "#${base01}"; - borderColor = lib.mkForce "#${base0E}"; - borderRadius= 12; - borderSize = 2; - textColor = lib.mkForce "#${base05}"; - layer = "overlay"; - sort = "-time"; - margin = "20, 10, 20"; - maxVisible = 5; - defaultTimeout = 8; - }; +{ config, lib, ... }: { + services.mako = with config.lib.stylix.colors; { + enable = true; + icons = true; + anchor = "top-right"; + actions = false; + backgroundColor = lib.mkForce "#${base01}"; + borderColor = lib.mkForce "#${base0E}"; + borderRadius = 12; + borderSize = 2; + textColor = lib.mkForce "#${base05}"; + layer = "overlay"; + sort = "-time"; + margin = "20, 10, 20"; + maxVisible = 5; + defaultTimeout = 8; + }; } diff --git a/home/window-managers/misc/waybar/default.nix b/home/window-managers/misc/waybar/default.nix index df49abc..cd1f335 100644 --- a/home/window-managers/misc/waybar/default.nix +++ b/home/window-managers/misc/waybar/default.nix @@ -1,5 +1,4 @@ -{ config, ... }: -{ +{ config, ... }: { imports = [ ./style.nix ]; programs.waybar = with config.lib.stylix.colors; { enable = true; @@ -19,10 +18,8 @@ "network" "custom/separatorL" "hyprland/language" - ]; - modules-center = [ - "hyprland/workspaces" ]; + modules-center = [ "hyprland/workspaces" ]; modules-right = [ "tray" "custom/separatorR" @@ -33,7 +30,7 @@ "battery" ]; - # LEFT MODULES + # LEFT MODULES "custom/launcher" = { format = " {}"; on-click = "nwg-drawer -ovl -nocats -nofs -d -c 7 -mb -49"; @@ -65,7 +62,7 @@ tooltip = false; }; "network" = { - format-icons = ["󰤯" "󰤟" "󰤢" "󰤥" "󰤨"]; + format-icons = [ "󰤯" "󰤟" "󰤢" "󰤥" "󰤨" ]; format-wifi = "{icon} CON"; format-ethernet = "󰈀 ETH"; format-disconnected = "⚠ ERR"; @@ -86,9 +83,7 @@ bars = 12; source = "auto"; format-icons = [ "▁" "▂" "▃" "▄" "▅" "▆" "▇" "█" ]; - actions = { - on-click-right = "mode"; - }; + actions = { on-click-right = "mode"; }; }; # CENTER MODULES @@ -107,9 +102,7 @@ "9" = "九"; "10" = "十"; }; - persistent-workspaces = { - "*" = [ 1 2 3 4 5 6 7 8 9 10 ]; - }; + persistent-workspaces = { "*" = [ 1 2 3 4 5 6 7 8 9 10 ]; }; }; # RIGHT MODULES diff --git a/home/window-managers/misc/waybar/style.nix b/home/window-managers/misc/waybar/style.nix index ef12c35..c8ce2cb 100644 --- a/home/window-managers/misc/waybar/style.nix +++ b/home/window-managers/misc/waybar/style.nix @@ -1,117 +1,116 @@ -{ config, ... }: -{ +{ config, ... }: { programs.waybar.style = with config.lib.stylix.colors; '' - /* BAR ITSELF */ - * { - font-family: "JetBrainsMono Nerd Font"; - font-weight: bold; - font-size: 16px; - } + /* BAR ITSELF */ + * { + font-family: "JetBrainsMono Nerd Font"; + font-weight: bold; + font-size: 16px; + } - window#waybar { - background-color: transparent; - color: #${base06}; - } + window#waybar { + background-color: transparent; + color: #${base06}; + } - window#waybar > box { - margin: 5px 0px 0px 0px; - background-color: #${base00}; - border-top: 0px; - border-bottom: 0; - border-style: solid; - border-color: #3C3836; - /* box-shadow: 1 1 3 1px #101010; */ - } + window#waybar > box { + margin: 5px 0px 0px 0px; + background-color: #${base00}; + border-top: 0px; + border-bottom: 0; + border-style: solid; + border-color: #3C3836; + /* box-shadow: 1 1 3 1px #101010; */ + } - /* WORKSPACES */ - #workspaces button { - background-color: #${base03}; - border-radius: 20px; - margin: 2px; - padding: 0px; - padding-right: 6px; - padding-left: 6px; - color: #${base06}; - min-height: 25px; - transition: all 0.4s ease-in-out; - } + /* WORKSPACES */ + #workspaces button { + background-color: #${base03}; + border-radius: 20px; + margin: 2px; + padding: 0px; + padding-right: 6px; + padding-left: 6px; + color: #${base06}; + min-height: 25px; + transition: all 0.4s ease-in-out; + } - #workspaces button label { - color: #${base06}; - font-weight: bolder; - } + #workspaces button label { + color: #${base06}; + font-weight: bolder; + } - #workspaces button.empty { - background: #${base02}; - } + #workspaces button.empty { + background: #${base02}; + } - #workspaces button.active { - background: radial-gradient(circle, #${base0E} 0%, #${base0E} 50%, #${base0D} 100%); - background-size: 400% 400%; - animation: gradient 5s linear infinite; - transition: all 0.3s ease-in-out; - border-color: #${base00}; - } + #workspaces button.active { + background: radial-gradient(circle, #${base0E} 0%, #${base0E} 50%, #${base0D} 100%); + background-size: 400% 400%; + animation: gradient 5s linear infinite; + transition: all 0.3s ease-in-out; + border-color: #${base00}; + } - #workspaces button.active label { - color: #${base02}; - font-weight: bolder; - } + #workspaces button.active label { + color: #${base02}; + font-weight: bolder; + } - @keyframes gradient { - 0% { background-position: 0px 50px; } - 50% { background-position: 100px 30px; } - 100% { background-position: 0px 50px; } - } + @keyframes gradient { + 0% { background-position: 0px 50px; } + 50% { background-position: 100px 30px; } + 100% { background-position: 0px 50px; } + } - @keyframes gradient_f { - 0% { background-position: 0px 200px; } - 50% { background-position: 200px 0px; } - 100% { background-position: 400px 200px; } - } + @keyframes gradient_f { + 0% { background-position: 0px 200px; } + 50% { background-position: 200px 0px; } + 100% { background-position: 400px 200px; } + } - @keyframes gradient_f_nh { - 0% { background-position: 0px 200px; } - 100% { background-position: 200px 200px; } - } + @keyframes gradient_f_nh { + 0% { background-position: 0px 200px; } + 100% { background-position: 200px 200px; } + } - /* MODULES */ - #custom-date, - #battery, - #backlight - #clock, - #pulseaudio, - #workspaces, - #window, - #language, - #text, - #custom-launcher, - #custom-separator + /* MODULES */ + #custom-date, + #battery, + #backlight + #clock, + #pulseaudio, + #workspaces, + #window, + #language, + #text, + #custom-launcher, + #custom-separator - #battery, - #backlight, - #custom-date, - #cava, - #network, - #disk, - #clock, - #language, - #pulseaudio, - #custom-separator, - #custom-launcher, - #tray { - color: #${base06}; - background-color: transparent; - padding: 0 0.4em; - padding-top: 0px; - padding-bottom: 2px; - border-style: solid; - min-height: 30px; - } - - #workspaces { - margin: 3 0 3 0px; - border-radius: 14 14 14 14px; - } + #battery, + #backlight, + #custom-date, + #cava, + #network, + #disk, + #clock, + #language, + #pulseaudio, + #custom-separator, + #custom-launcher, + #tray { + color: #${base06}; + background-color: transparent; + padding: 0 0.4em; + padding-top: 0px; + padding-bottom: 2px; + border-style: solid; + min-height: 30px; + } + + #workspaces { + margin: 3 0 3 0px; + border-radius: 14 14 14 14px; + } ''; } diff --git a/home/window-managers/terminals/default.nix b/home/window-managers/terminals/default.nix index c68c261..f3cf7b6 100644 --- a/home/window-managers/terminals/default.nix +++ b/home/window-managers/terminals/default.nix @@ -1,6 +1 @@ -{ - imports = [ - ./foot - ./kitty - ]; -} +{ imports = [ ./foot ./kitty ]; } diff --git a/home/window-managers/terminals/foot/default.nix b/home/window-managers/terminals/foot/default.nix index 0786c06..304fda3 100644 --- a/home/window-managers/terminals/foot/default.nix +++ b/home/window-managers/terminals/foot/default.nix @@ -1,21 +1,16 @@ -{ lib, ... }: -{ - programs.foot = { - enable = true; - server.enable = false; - settings = { - main = { - font = lib.mkForce "JetBrainsMono Nerd Font:size=12"; - pad = "10x10 center"; - resize-by-cells = "yes"; - letter-spacing = 0; - }; - cursor = { - style = "block"; - }; - mouse = { - hide-when-typing = "yes"; - }; - }; - }; +{ lib, ... }: { + programs.foot = { + enable = true; + server.enable = false; + settings = { + main = { + font = lib.mkForce "JetBrainsMono Nerd Font:size=12"; + pad = "10x10 center"; + resize-by-cells = "yes"; + letter-spacing = 0; + }; + cursor = { style = "block"; }; + mouse = { hide-when-typing = "yes"; }; + }; + }; } diff --git a/home/window-managers/terminals/kitty/binds.nix b/home/window-managers/terminals/kitty/binds.nix index 2ae6cb7..ea73cbb 100644 --- a/home/window-managers/terminals/kitty/binds.nix +++ b/home/window-managers/terminals/kitty/binds.nix @@ -1,51 +1,50 @@ -{ ... }: -{ - programs.kitty.keybindings = { - "ctrl+shift+c" = "copy_to_clipboard"; - "ctrl+shift+v" = "paste_from_clipboard"; - - "kitty_mod+x" = "next_tab"; - "kitty_mod+shift+x" = "move_tab_forward"; - - "kitty_mod+z" = "previous_tab"; - "kitty_mod+shift+z" = "move_tab_backward"; +{ ... }: { + programs.kitty.keybindings = { + "ctrl+shift+c" = "copy_to_clipboard"; + "ctrl+shift+v" = "paste_from_clipboard"; - "kitty_mod+enter" = "new_window"; - "kitty_mod+a" = "new_tab"; - "kitty_mod+q" = "close_window"; + "kitty_mod+x" = "next_tab"; + "kitty_mod+shift+x" = "move_tab_forward"; - "kitty_mod+shift+=" = "set_background_opacity +0.1"; - "kitty_mod+shift+-" = "set_background_opacity -0.1"; - "kitty_mod+shift+0" = "set_background_opacity 1"; + "kitty_mod+z" = "previous_tab"; + "kitty_mod+shift+z" = "move_tab_backward"; - "kitty_mod+." = "layout_action decrease_num_full_size_windows"; - "kitty_mod+," = "layout_action increase_num_full_size_windows"; - "kitty_mod+/" = "layout_action mirror toggle"; - "kitty_mod+m" = "layout_action mirror true"; - "kitty_mod+n" = "layout_action mirror false"; + "kitty_mod+enter" = "new_window"; + "kitty_mod+a" = "new_tab"; + "kitty_mod+q" = "close_window"; - "kitty_mod+left" = "resize_window narrower"; - "kitty_mod+right" = "resize_window wider"; - "kitty_mod+up" = "resize_window taller"; - "kitty_mod+down" = "resize_window shorter"; - "kitty_mod+home" = "resize_window reset"; + "kitty_mod+shift+=" = "set_background_opacity +0.1"; + "kitty_mod+shift+-" = "set_background_opacity -0.1"; + "kitty_mod+shift+0" = "set_background_opacity 1"; - "kitty_mod+h" = "resize_window narrower"; - "kitty_mod+l" = "resize_window wider"; - "kitty_mod+k" = "resize_window taller"; - "kitty_mod+j" = "resize_window shorter"; - "kitty_mod+g" = "resize_window reset"; - - "kitty_mod+r" = "load_config_file"; - "kitty_mod+t" = "set_tab_title"; - "kitty_mod+i" = "next_layout"; - "kitty_mod+u" = "kitten unicode_input"; - "kitty_mod+escape" = "kitty_shell overlay"; - "kitty_mod+]" = "next_window"; - "kitty_mod+[" = "previous_window"; - "kitty_mod+p" = "set_background_opacity 1"; - "kitty_mod+o" = "set_background_opacity default"; - "kitty_mod+f" = "toggle_fullscreen"; - "f11" = "toggle_fullscreen"; - }; + "kitty_mod+." = "layout_action decrease_num_full_size_windows"; + "kitty_mod+," = "layout_action increase_num_full_size_windows"; + "kitty_mod+/" = "layout_action mirror toggle"; + "kitty_mod+m" = "layout_action mirror true"; + "kitty_mod+n" = "layout_action mirror false"; + + "kitty_mod+left" = "resize_window narrower"; + "kitty_mod+right" = "resize_window wider"; + "kitty_mod+up" = "resize_window taller"; + "kitty_mod+down" = "resize_window shorter"; + "kitty_mod+home" = "resize_window reset"; + + "kitty_mod+h" = "resize_window narrower"; + "kitty_mod+l" = "resize_window wider"; + "kitty_mod+k" = "resize_window taller"; + "kitty_mod+j" = "resize_window shorter"; + "kitty_mod+g" = "resize_window reset"; + + "kitty_mod+r" = "load_config_file"; + "kitty_mod+t" = "set_tab_title"; + "kitty_mod+i" = "next_layout"; + "kitty_mod+u" = "kitten unicode_input"; + "kitty_mod+escape" = "kitty_shell overlay"; + "kitty_mod+]" = "next_window"; + "kitty_mod+[" = "previous_window"; + "kitty_mod+p" = "set_background_opacity 1"; + "kitty_mod+o" = "set_background_opacity default"; + "kitty_mod+f" = "toggle_fullscreen"; + "f11" = "toggle_fullscreen"; + }; } diff --git a/home/window-managers/terminals/kitty/colors.nix b/home/window-managers/terminals/kitty/colors.nix index a1c4700..5193220 100644 --- a/home/window-managers/terminals/kitty/colors.nix +++ b/home/window-managers/terminals/kitty/colors.nix @@ -1,37 +1,36 @@ -{ config, ... }: -{ - programs.kitty.settings = with config.lib.stylix.colors; { - foreground = "#${base05}"; - background = "#${base00}"; - - selection_foreground = "#${base05}"; - selection_background = "#${base02}"; - - tab_bar_background = "#${base00}"; - active_tab_foreground = "#${base00}"; - active_tab_background = "#${base0B}"; - inactive_tab_foreground = "#${base04}"; - inactive_tab_background = "#${base00}"; - - active_border_color = "#${base0E}"; - inactive_border_color = "#${base00}"; - bell_border_color = "#${base08}"; - - color0 = "#${base00}"; - color1 = "#${base08}"; - color2 = "#${base0B}"; - color3 = "#${base0A}"; - color4 = "#${base0D}"; - color5 = "#${base0E}"; - color6 = "#${base0C}"; - color7 = "#${base05}"; - color8 = "#${base03}"; - color9 = "#${base08}"; - color10 = "#${base0B}"; - color11 = "#${base0A}"; - color12 = "#${base0D}"; - color13 = "#${base0E}"; - color14 = "#${base0C}"; - color15 = "#${base07}"; - }; +{ config, ... }: { + programs.kitty.settings = with config.lib.stylix.colors; { + foreground = "#${base05}"; + background = "#${base00}"; + + selection_foreground = "#${base05}"; + selection_background = "#${base02}"; + + tab_bar_background = "#${base00}"; + active_tab_foreground = "#${base00}"; + active_tab_background = "#${base0B}"; + inactive_tab_foreground = "#${base04}"; + inactive_tab_background = "#${base00}"; + + active_border_color = "#${base0E}"; + inactive_border_color = "#${base00}"; + bell_border_color = "#${base08}"; + + color0 = "#${base00}"; + color1 = "#${base08}"; + color2 = "#${base0B}"; + color3 = "#${base0A}"; + color4 = "#${base0D}"; + color5 = "#${base0E}"; + color6 = "#${base0C}"; + color7 = "#${base05}"; + color8 = "#${base03}"; + color9 = "#${base08}"; + color10 = "#${base0B}"; + color11 = "#${base0A}"; + color12 = "#${base0D}"; + color13 = "#${base0E}"; + color14 = "#${base0C}"; + color15 = "#${base07}"; + }; } diff --git a/home/window-managers/terminals/kitty/default.nix b/home/window-managers/terminals/kitty/default.nix index 8480276..7653cf5 100644 --- a/home/window-managers/terminals/kitty/default.nix +++ b/home/window-managers/terminals/kitty/default.nix @@ -1,44 +1,44 @@ -{ config, ... }: -{ - imports = [ ./binds.nix ./colors.nix ]; - programs.kitty = with config.lib.stylix.colors; { - enable = true; - environment = { - "MICRO_TRUECOLOR" = "1"; - "RANGER_LOAD_DEFAULT_RC" = "false"; - }; - settings = { - confirm_os_window_close = 0; +{ config, ... }: { + imports = [ ./binds.nix ./colors.nix ]; + programs.kitty = with config.lib.stylix.colors; { + enable = true; + environment = { + "MICRO_TRUECOLOR" = "1"; + "RANGER_LOAD_DEFAULT_RC" = "false"; + }; + settings = { + confirm_os_window_close = 0; - tab_bar_min_tabs = 2; - tab_bar_edge = "button"; - tab_bar_style = "fade"; - tab_bar_align = "left"; - tab_powerline_style = "angled"; - tab_title_template = "{title}"; - tab_bar_margin_width = 0; - tab_fade = "0 0.5 1"; - - window_margin_width = 8; - window_padding_width = 4; - window_border_width = "0.2pt"; - single_window_padding_width = 4; - - resize_in_steps = "no"; - resize_debounce_time = 0; - - dynamic_background_opacity = true; - cursor_shape = "block"; - mouse_hide_wait = 2; - underline_hyperlinks = "always"; - enable_audio_bell = "no"; - disable_ligatures = "never"; - font_features = "+calt +liga +ss01 +ss02 +ss03 +ss04 +ss05 +ss06 +ss07 +ss08 +ss09"; + tab_bar_min_tabs = 2; + tab_bar_edge = "button"; + tab_bar_style = "fade"; + tab_bar_align = "left"; + tab_powerline_style = "angled"; + tab_title_template = "{title}"; + tab_bar_margin_width = 0; + tab_fade = "0 0.5 1"; - # clipboard_control = "read-primary read-clipboard"; + window_margin_width = 8; + window_padding_width = 4; + window_border_width = "0.2pt"; + single_window_padding_width = 4; - kitty_mod = "alt"; - }; - shellIntegration.enableFishIntegration = true; - }; + resize_in_steps = "no"; + resize_debounce_time = 0; + + dynamic_background_opacity = true; + cursor_shape = "block"; + mouse_hide_wait = 2; + underline_hyperlinks = "always"; + enable_audio_bell = "no"; + disable_ligatures = "never"; + font_features = + "+calt +liga +ss01 +ss02 +ss03 +ss04 +ss05 +ss06 +ss07 +ss08 +ss09"; + + # clipboard_control = "read-primary read-clipboard"; + + kitty_mod = "alt"; + }; + shellIntegration.enableFishIntegration = true; + }; } diff --git a/host/default.nix b/host/default.nix index 44f8ae0..c7206ef 100644 --- a/host/default.nix +++ b/host/default.nix @@ -1,7 +1 @@ -{ - imports = [ - ./themes/stylix.nix - ./system - ./misc - ]; -} +{ imports = [ ./themes/stylix.nix ./system ./misc ]; } diff --git a/host/misc/autocpu.nix b/host/misc/autocpu.nix index 1208abc..b0ba0bc 100644 --- a/host/misc/autocpu.nix +++ b/host/misc/autocpu.nix @@ -1,5 +1,4 @@ -{ inputs, ... }: -{ +{ inputs, ... }: { imports = [ inputs.auto-cpufreq.nixosModules.default ]; programs.auto-cpufreq = { # CPU PERFMORMANCE enable = true; diff --git a/host/misc/battery.nix b/host/misc/battery.nix index 3c6a24d..e0f50c5 100644 --- a/host/misc/battery.nix +++ b/host/misc/battery.nix @@ -1,8 +1,7 @@ -{ ... }: -{ - # SOMETHING FOR BATTERY - powerManagement = { - enable = true; - powertop.enable = true; - }; +{ ... }: { + # SOMETHING FOR BATTERY + powerManagement = { + enable = true; + powertop.enable = true; + }; } diff --git a/host/misc/locale.nix b/host/misc/locale.nix index cd5b5b5..1772fb5 100644 --- a/host/misc/locale.nix +++ b/host/misc/locale.nix @@ -1,19 +1,18 @@ -{ pkgs, ...}: -{ - # LOCALE AND TIME SETTINGS - time.timeZone = "Asia/Chita"; - i18n = { - defaultLocale = "en_US.UTF-8"; - extraLocaleSettings = { - LC_ADDRESS = "en_US.UTF-8"; - LC_IDENTIFICATION = "en_US.UTF-8"; - LC_MEASUREMENT = "en_US.UTF-8"; - LC_MONETARY = "en_US.UTF-8"; - LC_NAME = "en_US.UTF-8"; - LC_NUMERIC = "en_US.UTF-8"; - LC_PAPER = "en_US.UTF-8"; - LC_TELEPHONE = "en_US.UTF-8"; - LC_TIME = "en_US.UTF-8"; - }; - }; +{ ... }: { + # LOCALE AND TIME SETTINGS + time.timeZone = "Asia/Chita"; + i18n = { + defaultLocale = "en_US.UTF-8"; + extraLocaleSettings = { + LC_ADDRESS = "en_US.UTF-8"; + LC_IDENTIFICATION = "en_US.UTF-8"; + LC_MEASUREMENT = "en_US.UTF-8"; + LC_MONETARY = "en_US.UTF-8"; + LC_NAME = "en_US.UTF-8"; + LC_NUMERIC = "en_US.UTF-8"; + LC_PAPER = "en_US.UTF-8"; + LC_TELEPHONE = "en_US.UTF-8"; + LC_TIME = "en_US.UTF-8"; + }; + }; } diff --git a/host/misc/nh.nix b/host/misc/nh.nix index 9cdf6c4..a3f7a16 100644 --- a/host/misc/nh.nix +++ b/host/misc/nh.nix @@ -1,9 +1,8 @@ -{ ... }: -{ - programs.nh = { # NIX HELPER - enable = true; - clean.enable = true; - clean.extraArgs = "--keep-since 4d --keep 3"; - flake = "/home/megamozg/.flake"; - }; +{ ... }: { + programs.nh = { # NIX HELPER + enable = true; + clean.enable = true; + clean.extraArgs = "--keep-since 4d --keep 3"; + flake = "/home/megamozg/.flake"; + }; } diff --git a/host/misc/nix.nix b/host/misc/nix.nix index 1a9ac86..1c718e7 100644 --- a/host/misc/nix.nix +++ b/host/misc/nix.nix @@ -1,32 +1,28 @@ -{ pkgs, lib, ... }: -{ - nix = { # NIX SETTINGS - package = pkgs.nix; - settings = { - warn-dirty = false; - experimental-features = [ "nix-command" "flakes" ]; - substituters = [ - "https://cache.garnix.io" - "https://anyrun.cachix.org" - "https://hyprland.cachix.org" - ]; - trusted-public-keys = [ - "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" - "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s=" - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" - ]; - trusted-users = [ - "megamozg" - "@wheel" - ]; - }; - }; +{ pkgs, lib, ... }: { + nix = { # NIX SETTINGS + package = pkgs.nix; + settings = { + warn-dirty = false; + experimental-features = [ "nix-command" "flakes" ]; + substituters = [ + "https://cache.garnix.io" + "https://anyrun.cachix.org" + "https://hyprland.cachix.org" + ]; + trusted-public-keys = [ + "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" + "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s=" + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + ]; + trusted-users = [ "megamozg" "@wheel" ]; + }; + }; - nixpkgs = { - hostPlatform = lib.mkDefault "x86_64-linux"; - config = { # NIXPKGS SETS - allowBroken = true; - allowUnfree = true; - }; - }; + nixpkgs = { + hostPlatform = lib.mkDefault "x86_64-linux"; + config = { # NIXPKGS SETS + allowBroken = true; + allowUnfree = true; + }; + }; } diff --git a/host/misc/pkgs.nix b/host/misc/pkgs.nix index 60f50e8..ffd730a 100644 --- a/host/misc/pkgs.nix +++ b/host/misc/pkgs.nix @@ -1,25 +1,23 @@ { pkgs, inputs, lib, ... }: -let - hpkg = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}; -in -{ - # OS PACKAGES - nixpkgs = { hostPlatform = lib.mkDefault "x86_64-linux"; }; - environment.systemPackages = with pkgs; [ - git - helix - hyprland - home-manager - # (callPackage ./torrserver/default.nix { }) - ]; +let hpkg = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}; +in { + # OS PACKAGES + nixpkgs = { hostPlatform = lib.mkDefault "x86_64-linux"; }; + environment.systemPackages = with pkgs; [ + git + helix + hyprland + home-manager + # (callPackage ./torrserver/default.nix { }) + ]; - # PROGRAMS ENABLE - programs = { - fish.enable = true; - hyprland = { - enable = true; - package = hpkg.hyprland; - portalPackage = hpkg.xdg-desktop-portal-hyprland; - }; - }; + # PROGRAMS ENABLE + programs = { + fish.enable = true; + hyprland = { + enable = true; + package = hpkg.hyprland; + portalPackage = hpkg.xdg-desktop-portal-hyprland; + }; + }; } diff --git a/host/misc/security.nix b/host/misc/security.nix index 48b829e..08d7e54 100644 --- a/host/misc/security.nix +++ b/host/misc/security.nix @@ -1,31 +1,22 @@ -{ pkgs, ... }: -{ - security = { - sudo = { # FUCKING CRAP - enable = true; - }; - doas = { # VERY TOP - enable = true; - wheelNeedsPassword = true; - extraRules = [ - { - users = [ "megamozg" ]; - keepEnv = true; - persist = true; - } - ]; - extraConfig = '' - permit nopass megamozg as root cmd light - permit nopass megamozg as root cmd tee - ''; - }; - pam = { # SOMTHING WITH FPRINT - services = { - swaylock.fprintAuth = true; - }; - }; - polkit = { - enable = true; - }; - }; +{ ... }: { + security = { + sudo = { # FUCKING CRAP + enable = true; + }; + doas = { # VERY TOP + enable = true; + wheelNeedsPassword = true; + extraRules = [{ + users = [ "megamozg" ]; + keepEnv = true; + persist = true; + }]; + extraConfig = + " permit nopass megamozg as root cmd light\n permit nopass megamozg as root cmd tee\n"; + }; + pam = { # SOMTHING WITH FPRINT + services = { swaylock.fprintAuth = true; }; + }; + polkit = { enable = true; }; + }; } diff --git a/host/misc/torrserver.nix b/host/misc/torrserver.nix index ea82282..b34cd91 100644 --- a/host/misc/torrserver.nix +++ b/host/misc/torrserver.nix @@ -1,18 +1,14 @@ { pkgs, ... }: -let - torrserver = pkgs.callPackage ./torrserver {}; -in -{ +let torrserver = pkgs.callPackage ./torrserver { }; +in { systemd = { services = { # SERVICES SEETINGS torrserver = { # TORRSERVER enable = true; - after = ["multi-user.target"]; - wantedBy = ["multi-user.target"]; + after = [ "multi-user.target" ]; + wantedBy = [ "multi-user.target" ]; path = [ torrserver ]; - serviceConfig = { - ExecStart = "${pkgs.torrserver}"; - }; + serviceConfig = { ExecStart = "${pkgs.torrserver}"; }; }; }; }; diff --git a/host/misc/torrserver/default.nix b/host/misc/torrserver/default.nix index 7b7f95c..d1a29d0 100644 --- a/host/misc/torrserver/default.nix +++ b/host/misc/torrserver/default.nix @@ -1,30 +1,27 @@ { lib, stdenv, fetchurl, autoPatchelfHook }: let - version = "134"; - hash = "sha256-WDygG9aGnD20nGxtG0t+T2KEwbJ+fZ0uRaCndirrsXI="; -in -stdenv.mkDerivation { - name = "torrserver"; - dontUnpack = true; + version = "134"; + hash = "sha256-WDygG9aGnD20nGxtG0t+T2KEwbJ+fZ0uRaCndirrsXI="; +in stdenv.mkDerivation { + name = "torrserver"; + dontUnpack = true; - src = fetchurl { - url = "https://github.com/YouROK/TorrServer/releases/download/MatriX.${version}/TorrServer-linux-amd64"; - sha256 = "${hash}"; - }; + src = fetchurl { + url = + "https://github.com/YouROK/TorrServer/releases/download/MatriX.${version}/TorrServer-linux-amd64"; + sha256 = "${hash}"; + }; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = [ autoPatchelfHook ]; - installPhase = '' - mkdir -p $out/bin - cp $src $out/bin/torrserver - chmod +x $out/bin/torrserver - ''; + installPhase = + " mkdir -p $out/bin\n cp $src $out/bin/torrserver\n chmod +x $out/bin/torrserver\n"; - meta = with lib; { - description = "Torrserver"; - homepage = "https://github.com/YouROK/TorrServer"; - license = licenses.unlicense; - meta.platforms = platforms.all; - mainProgram = "torrserver"; - }; + meta = with lib; { + description = "Torrserver"; + homepage = "https://github.com/YouROK/TorrServer"; + license = licenses.unlicense; + meta.platforms = platforms.all; + mainProgram = "torrserver"; + }; } diff --git a/host/misc/user.nix b/host/misc/user.nix index e4b57a4..d70ece6 100644 --- a/host/misc/user.nix +++ b/host/misc/user.nix @@ -1,13 +1,12 @@ -{ pkgs, config, ... }: -{ - users = { - users = { # USERS - megamozg = { - shell = pkgs.fish; - isNormalUser = true; - extraGroups = [ "networkmanager" "wheel" "video" ]; - }; - }; - }; - system.stateVersion = "24.05"; +{ pkgs, ... }: { + users = { + users = { # USERS + megamozg = { + shell = pkgs.fish; + isNormalUser = true; + extraGroups = [ "networkmanager" "wheel" "video" ]; + }; + }; + }; + system.stateVersion = "24.05"; } diff --git a/host/misc/zapret.nix b/host/misc/zapret.nix index 1e70155..adb801f 100644 --- a/host/misc/zapret.nix +++ b/host/misc/zapret.nix @@ -1,52 +1,20 @@ -{ pkgs, lib, config, ... }: -{ - systemd.services.zapret = { # ZAPRET FOR YOTUBE - after = [ "network-online.target" ]; - wants = [ "network-online.target" ]; - wantedBy = [ "multi-user.target" ]; - path = with pkgs; [ - iptables - nftables - zapret - ipset - curl - gawk - ]; - serviceConfig = { - Type = "forking"; - Restart = "no"; - TimeoutSec = "30sec"; - IgnoreSIGPIPE = "no"; - KillMode = "none"; - GuessMainPID = "no"; - ExecStart = "${pkgs.zapret}/bin/zapret start"; - ExecStop = "${pkgs.zapret}/bin/zapret stop"; - EnvironmentFile = pkgs.writeText "zapret-environment" '' - FWTYPE="iptables" - SET_MAXELEM=522288 - IPSET_OPT="hashsize 262144 maxelem $SET_MAXELEM" - AUTOHOSTLIST_RETRANS_THRESHOLD=3 - AUTOHOSTLIST_FAIL_THRESHOLD=3 - AUTOHOSTLIST_FAIL_TIME=60 - AUTOHOSTLIST_DEBUGLOG=0 - MDIG_THREADS=30 - GZIP_LISTS=1 - - MODE=nfqws - MODE_HTTP=1 - MODE_HTTP_KEEPALIVE=0 - MODE_HTTPS=1 - MODE_QUIC=0 - MODE_FILTER=none - - DESYNC_MARK=0x40000000 - DESYNC_MARK_POSTNAT=0x20000000 - NFQWS_OPT_DESYNC="--dpi-desync=fake,split2 --dpi-desync-ttl=3" - TPWS_OPT="--hostspell=HOST --split-http-req=method --split-pos=3 --oob" - FLOWOFFLOAD=donttouch - INIT_APPLY_FW=1 - DISABLE_IPV6=0 - ''; - }; - }; +{ pkgs, lib, config, ... }: { + systemd.services.zapret = { # ZAPRET FOR YOTUBE + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + path = with pkgs; [ iptables nftables zapret ipset curl gawk ]; + serviceConfig = { + Type = "forking"; + Restart = "no"; + TimeoutSec = "30sec"; + IgnoreSIGPIPE = "no"; + KillMode = "none"; + GuessMainPID = "no"; + ExecStart = "${pkgs.zapret}/bin/zapret start"; + ExecStop = "${pkgs.zapret}/bin/zapret stop"; + EnvironmentFile = pkgs.writeText "zapret-environment" + " FWTYPE=\"iptables\"\n SET_MAXELEM=522288\n IPSET_OPT=\"hashsize 262144 maxelem $SET_MAXELEM\"\n AUTOHOSTLIST_RETRANS_THRESHOLD=3\n AUTOHOSTLIST_FAIL_THRESHOLD=3\n AUTOHOSTLIST_FAIL_TIME=60\n AUTOHOSTLIST_DEBUGLOG=0\n MDIG_THREADS=30\n GZIP_LISTS=1\n\n MODE=nfqws\n MODE_HTTP=1\n MODE_HTTP_KEEPALIVE=0\n MODE_HTTPS=1\n MODE_QUIC=0\n MODE_FILTER=none\n\n DESYNC_MARK=0x40000000\n DESYNC_MARK_POSTNAT=0x20000000\n NFQWS_OPT_DESYNC=\"--dpi-desync=fake,split2 --dpi-desync-ttl=3\"\n TPWS_OPT=\"--hostspell=HOST --split-http-req=method --split-pos=3 --oob\"\n FLOWOFFLOAD=donttouch\n INIT_APPLY_FW=1\n DISABLE_IPV6=0\n"; + }; + }; } diff --git a/host/system/boot.nix b/host/system/boot.nix index 19b5dd4..38a5732 100644 --- a/host/system/boot.nix +++ b/host/system/boot.nix @@ -1,57 +1,57 @@ -{ pkgs, ... }: -{ - # BOOT PARAMETERS - boot = { # ITSELF LOL - kernelPackages = pkgs.linuxPackages_zen; - kernelModules = [ "kvm-amd" ]; - consoleLogLevel = 0; - kernelParams = [ - "quiet" - "loglevel=3" - "nowatchdog" - "page_alloc.shuffle=1" - "threadirqs" - "split_lock_detect=off" - "pci=pcie_bus_perf" - "psmouse.synaptics_intertouch=0" - "rd.systemd.show_status=false" - "amdgpu.gttsize=2000" - ]; - - loader = { # SYSTEMD BOOT AS DEFAULT - systemd-boot = { - enable = true; - configurationLimit = 4; - }; - efi.canTouchEfiVariables = true; - timeout = 0; - }; - - initrd = { # IDK - availableKernelModules = [ - "nvme" - "xhci_pci" - "ahci" - "ohci_pci" - "ehci_pci" - "pata_atiixp" - "ums_realtek" - "sd_mod" - "sr_mod" - "sdhci_pci" - "usb_storage" - ]; - systemd.enable = true; - compressor = "zstd"; - compressorArgs = [ "-9" ]; - verbose = false; - }; +{ pkgs, ... }: { + # BOOT PARAMETERS + boot = { # ITSELF LOL + kernelPackages = pkgs.linuxPackages_zen; + kernelModules = [ "kvm-amd" ]; + consoleLogLevel = 0; + kernelParams = [ + "quiet" + "loglevel=3" + "nowatchdog" + "page_alloc.shuffle=1" + "threadirqs" + "split_lock_detect=off" + "pci=pcie_bus_perf" + "psmouse.synaptics_intertouch=0" + "rd.systemd.show_status=false" + "amdgpu.gttsize=2000" + ]; - plymouth = { # PLYMOUTH WITH NIXOS LOGO - enable = true; - logo = "${pkgs.nixos-icons}/share/icons/hicolor/48x48/apps/nix-snowflake-white.png"; - }; - - tmp.cleanOnBoot = true; - }; + loader = { # SYSTEMD BOOT AS DEFAULT + systemd-boot = { + enable = true; + configurationLimit = 4; + }; + efi.canTouchEfiVariables = true; + timeout = 0; + }; + + initrd = { # IDK + availableKernelModules = [ + "nvme" + "xhci_pci" + "ahci" + "ohci_pci" + "ehci_pci" + "pata_atiixp" + "ums_realtek" + "sd_mod" + "sr_mod" + "sdhci_pci" + "usb_storage" + ]; + systemd.enable = true; + compressor = "zstd"; + compressorArgs = [ "-9" ]; + verbose = false; + }; + + plymouth = { # PLYMOUTH WITH NIXOS LOGO + enable = true; + logo = + "${pkgs.nixos-icons}/share/icons/hicolor/48x48/apps/nix-snowflake-white.png"; + }; + + tmp.cleanOnBoot = true; + }; } diff --git a/host/system/disks.nix b/host/system/disks.nix index f56095e..4adffb6 100644 --- a/host/system/disks.nix +++ b/host/system/disks.nix @@ -1,23 +1,22 @@ -{ config, lib, pkgs, modulesPath, ... }: -{ - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - fileSystems = { - "/" = { # ROOT - device = "/dev/disk/by-uuid/9913d333-cd8d-4960-8e3c-4af764b9a9ca"; - fsType = "btrfs"; - options = [ "subvol=@" "compress=zstd" ]; - }; +{ modulesPath, ... }: { + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + fileSystems = { + "/" = { # ROOT + device = "/dev/disk/by-uuid/9913d333-cd8d-4960-8e3c-4af764b9a9ca"; + fsType = "btrfs"; + options = [ "subvol=@" "compress=zstd" ]; + }; - "/boot" = { # EFI - device = "/dev/disk/by-uuid/8547-1299"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; - }; + "/boot" = { # EFI + device = "/dev/disk/by-uuid/8547-1299"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + }; - zramSwap = { # ZRAM - enable = true; - memoryPercent = 50; - algorithm = "zstd"; - }; + zramSwap = { # ZRAM + enable = true; + memoryPercent = 50; + algorithm = "zstd"; + }; } diff --git a/host/system/hardware.nix b/host/system/hardware.nix index d70a2db..5e8cbd1 100644 --- a/host/system/hardware.nix +++ b/host/system/hardware.nix @@ -1,25 +1,23 @@ -{ pkgs, config, lib, inputs, ... }: -{ - imports = [ "${inputs.nixos-hardware}/lenovo/thinkpad/t14/amd/gen1" ]; - hardware = { - bluetooth = { # BT - enable = true; - powerOnBoot = true; - }; - graphics = { # GPU - enable = true; - enable32Bit = true; - extraPackages = with pkgs; [ - amdvlk - # rocmPackages.clr.icd - # vaapiVdpau - # libvdpau-va-gl - ]; - extraPackages32 = with pkgs; [ - driversi686Linux.amdvlk - ]; - }; - system76.enableAll = true; - firmware = [ pkgs.linux-firmware ]; - }; +{ pkgs, inputs, ... }: { + imports = [ "${inputs.nixos-hardware}/lenovo/thinkpad/t14/amd/gen1" ]; + hardware = { + bluetooth = { # BT + enable = true; + powerOnBoot = true; + }; + graphics = { # GPU + enable = true; + enable32Bit = true; + extraPackages = with pkgs; + [ + amdvlk + # rocmPackages.clr.icd + # vaapiVdpau + # libvdpau-va-gl + ]; + extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ]; + }; + system76.enableAll = true; + firmware = [ pkgs.linux-firmware ]; + }; } diff --git a/host/system/network.nix b/host/system/network.nix index d05b27b..d2a5915 100644 --- a/host/system/network.nix +++ b/host/system/network.nix @@ -1,15 +1,14 @@ -{ lib, ... }: -{ - # NETWORKING - networking = { - hostName = "wysvort"; - networkmanager = { # NETWORK MANAGER - enable = true; - insertNameservers = [ "1.1.1.1" "1.0.0.1" ]; - wifi.powersave = true; - }; - useDHCP = lib.mkDefault true; - nftables.enable = true; - # resolvconf.dnsSingleRequest = true; - }; +{ lib, ... }: { + # NETWORKING + networking = { + hostName = "wysvort"; + networkmanager = { # NETWORK MANAGER + enable = true; + insertNameservers = [ "1.1.1.1" "1.0.0.1" ]; + wifi.powersave = true; + }; + useDHCP = lib.mkDefault true; + nftables.enable = true; + # resolvconf.dnsSingleRequest = true; + }; } diff --git a/host/system/services.nix b/host/system/services.nix index b835f5b..93449e3 100644 --- a/host/system/services.nix +++ b/host/system/services.nix @@ -1,71 +1,68 @@ -{ pkgs, ... }: -{ - # SERVICES ANY PROGRAM - services = { - getty.autologinUser = "megamozg"; - xserver = { # XORG? - xkb = { - layout = "us"; - variant = "qwerty"; - options = "grp:caps_toggle"; - }; - }; - tailscale = { # OWN VPN NETWORK - enable = true; - useRoutingFeatures = "both"; - }; - system76-scheduler = { # PERFORMANCEE - enable = false; - settings = { - cfsProfiles.enable = true; - processScheduler.pipewireBoost.enable = true; - }; - }; - fprintd = { # FINGER PRINT - enable = true; - package = pkgs.fprintd-tod; - tod = { - enable = true; - driver = pkgs.libfprint-2-tod1-vfs0090; - }; - }; - tlp = { # BATTERY - enable = true; - settings = { - TLP_DEFAULT_MODE = "BAT"; +{ pkgs, ... }: { + # SERVICES ANY PROGRAM + services = { + getty.autologinUser = "megamozg"; + xserver = { # XORG? + xkb = { + layout = "us"; + variant = "qwerty"; + options = "grp:caps_toggle"; + }; + }; + tailscale = { # OWN VPN NETWORK + enable = true; + useRoutingFeatures = "both"; + }; + system76-scheduler = { # PERFORMANCEE + enable = false; + settings = { + cfsProfiles.enable = true; + processScheduler.pipewireBoost.enable = true; + }; + }; + fprintd = { # FINGER PRINT + enable = true; + package = pkgs.fprintd-tod; + tod = { + enable = true; + driver = pkgs.libfprint-2-tod1-vfs0090; + }; + }; + tlp = { # BATTERY + enable = true; + settings = { + TLP_DEFAULT_MODE = "BAT"; - # NETWORKING - WIFI_PWR_ON_AC = "off"; - WIFI_PWR_ON_BAT = "on"; + # NETWORKING + WIFI_PWR_ON_AC = "off"; + WIFI_PWR_ON_BAT = "on"; - # CPU - CPU_SCALING_GOVERNOR_ON_AC = "performance"; - CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; - CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; - CPU_ENERGY_PERF_POLICY_ON_AC = "balance_performance"; - CPU_BOOST_ON_AC = 1; - CPU_BOOST_ON_BAT = 1; + # CPU + CPU_SCALING_GOVERNOR_ON_AC = "performance"; + CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; + CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; + CPU_ENERGY_PERF_POLICY_ON_AC = "balance_performance"; + CPU_BOOST_ON_AC = 1; + CPU_BOOST_ON_BAT = 1; - # GRAPHICS - RADEON_DPM_STATE_ON_AC = "performance"; - RADEON_DPM_STATE_ON_BAT = "battery"; - RADEON_POWER_PROFILE_ON_AC = "default"; - RADEON_POWER_PROFILE_ON_BAT = "default"; + # GRAPHICS + RADEON_DPM_STATE_ON_AC = "performance"; + RADEON_DPM_STATE_ON_BAT = "battery"; + RADEON_POWER_PROFILE_ON_AC = "default"; + RADEON_POWER_PROFILE_ON_BAT = "default"; - # IDK - RUNTIME_PM_ON_AC = "auto"; - RUNTIME_PM_ON_BAT = "auto"; - USB_AUTOSUSPEND = 0; - }; - }; - resolved = { - enable = true; - }; + # IDK + RUNTIME_PM_ON_AC = "auto"; + RUNTIME_PM_ON_BAT = "auto"; + USB_AUTOSUSPEND = 0; + }; + }; + resolved = { enable = true; }; - dbus.implementation = "broker"; - upower.enable = true; - thermald.enable = true; - # thinkfan.enable = true; - gvfs.enable = true; - }; + dbus.implementation = "broker"; + upower.enable = true; + thermald.enable = true; + # thinkfan.enable = true; + gvfs.enable = true; + }; } diff --git a/host/system/sound.nix b/host/system/sound.nix index 06f0847..212baca 100644 --- a/host/system/sound.nix +++ b/host/system/sound.nix @@ -1,11 +1,10 @@ -{ ... }: -{ - security.rtkit.enable = true; - services.pipewire = { # SOUND NEW GEN - enable = true; - wireplumber.enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; +{ ... }: { + security.rtkit.enable = true; + services.pipewire = { # SOUND NEW GEN + enable = true; + wireplumber.enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; } diff --git a/host/themes/paradise.nix b/host/themes/paradise.nix index bd49422..b072838 100644 --- a/host/themes/paradise.nix +++ b/host/themes/paradise.nix @@ -1,22 +1,22 @@ { - stylix = { - base16Scheme = { - base00 = "#151515"; - base01 = "#1F1F1F"; - base02 = "#2E2E2E"; - base03 = "#424242"; - base04 = "#BBB6B6"; - base05 = "#E8E3E3"; - base06 = "#E8E3E3"; - base07 = "#E8E3E3"; - base08 = "#B66467"; - base09 = "#D9BC8C"; - base0A = "#D9BC8C"; - base0B = "#8C977D"; - base0C = "#8AA6A2"; - base0D = "#8DA3B9"; - base0E = "#A988B0"; - base0F = "#BBB6B6"; - }; - }; + stylix = { + base16Scheme = { + base00 = "#151515"; + base01 = "#1F1F1F"; + base02 = "#2E2E2E"; + base03 = "#424242"; + base04 = "#BBB6B6"; + base05 = "#E8E3E3"; + base06 = "#E8E3E3"; + base07 = "#E8E3E3"; + base08 = "#B66467"; + base09 = "#D9BC8C"; + base0A = "#D9BC8C"; + base0B = "#8C977D"; + base0C = "#8AA6A2"; + base0D = "#8DA3B9"; + base0E = "#A988B0"; + base0F = "#BBB6B6"; + }; + }; } diff --git a/host/themes/stylix.nix b/host/themes/stylix.nix index 54072e2..6a09360 100644 --- a/host/themes/stylix.nix +++ b/host/themes/stylix.nix @@ -1,22 +1,18 @@ -{ inputs, ... }: -{ - # SYSTEM COLORSCHEME (see targets) - imports = [ - inputs.stylix.nixosModules.stylix - ./paradise.nix - ]; - stylix = { # COLORIZE !!! - enable = true; - autoEnable = false; - targets = { - console.enable = true; # TTY - nixos-icons.enable = true; # ICONS - chromium.enable = true; # CHROMIUM LOL - fish.enable = true; # SHELL - plymouth = { # STARTING SCREEN - enable = true; - logoAnimated = true; - }; - }; - }; +{ inputs, ... }: { + # SYSTEM COLORSCHEME (see targets) + imports = [ inputs.stylix.nixosModules.stylix ./paradise.nix ]; + stylix = { # COLORIZE !!! + enable = true; + autoEnable = false; + targets = { + console.enable = true; # TTY + nixos-icons.enable = true; # ICONS + chromium.enable = true; # CHROMIUM LOL + fish.enable = true; # SHELL + plymouth = { # STARTING SCREEN + enable = true; + logoAnimated = true; + }; + }; + }; }