format all files
This commit is contained in:
parent
f940a235f0
commit
a47826b7c2
101 changed files with 1073 additions and 1034 deletions
|
|
@ -1,5 +1,8 @@
|
|||
{ lib, osconfig, ... }:
|
||||
{
|
||||
lib,
|
||||
osconfig,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./settings/default.nix
|
||||
];
|
||||
|
|
@ -9,4 +12,3 @@
|
|||
xwayland.enable = true;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ osconfig, ... }:
|
||||
{
|
||||
{osconfig, ...}: {
|
||||
imports = [
|
||||
./key-bind.nix
|
||||
./theme.nix
|
||||
|
|
@ -12,4 +11,3 @@
|
|||
monitorv2 = osconfig.device.wm.hyprland.monitors;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
wayland.windowManager.hyprland.settings.exec-once = [
|
||||
"quickshell"
|
||||
"fcitx5"
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
"$LAPTOP_TOUCHPAD_ENABLE" = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,68 +1,73 @@
|
|||
{ osconfig, config, ... }:
|
||||
{
|
||||
osconfig,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
bind = [
|
||||
"CTRL ALT, T, exec, ${osconfig.device.programs.terminal.name}"
|
||||
bind =
|
||||
[
|
||||
"CTRL ALT, T, exec, ${osconfig.device.programs.terminal.name}"
|
||||
|
||||
"SUPER SHIFT, L, exit,"
|
||||
"SUPER SHIFT, TAB, togglefloating,"
|
||||
"SUPER SHIFT, S, exec, hyprshot -m region -o '${config.home.homeDirectory}/Pictures/Screenshots/' -z"
|
||||
"SUPER, J, togglesplit,"
|
||||
"SUPER, E, exec, dolphin"
|
||||
"SUPER SHIFT, L, exit,"
|
||||
"SUPER SHIFT, TAB, togglefloating,"
|
||||
"SUPER SHIFT, S, exec, hyprshot -m region -o '${config.home.homeDirectory}/Pictures/Screenshots/' -z"
|
||||
"SUPER, J, togglesplit,"
|
||||
"SUPER, E, exec, dolphin"
|
||||
|
||||
"SUPER, C, killactive"
|
||||
"SUPER, C, killactive"
|
||||
|
||||
"SUPER SHIFT, LEFT, resizeactive, -25 0"
|
||||
"SUPER SHIFT, RIGHT, resizeactive, 25 0"
|
||||
"SUPER SHIFT, UP, resizeactive, 0 -25"
|
||||
"SUPER SHIFT, DOWN, resizeactive, 0 25"
|
||||
"SUPER SHIFT, LEFT, resizeactive, -25 0"
|
||||
"SUPER SHIFT, RIGHT, resizeactive, 25 0"
|
||||
"SUPER SHIFT, UP, resizeactive, 0 -25"
|
||||
"SUPER SHIFT, DOWN, resizeactive, 0 25"
|
||||
|
||||
"SUPER, LEFT, movefocus, l"
|
||||
"SUPER, RIGHT, movefocus, r"
|
||||
"SUPER, UP, movefocus, u"
|
||||
"SUPER, DOWN, movefocus, d"
|
||||
"SUPER, LEFT, movefocus, l"
|
||||
"SUPER, RIGHT, movefocus, r"
|
||||
"SUPER, UP, movefocus, u"
|
||||
"SUPER, DOWN, movefocus, d"
|
||||
|
||||
"SUPER CTRL, LEFT, movewindow, l"
|
||||
"SUPER CTRL, RIGHT, movewindow, r"
|
||||
"SUPER CTRL, UP, movewindow, u"
|
||||
"SUPER CTRL, DOWN, movewindow, d"
|
||||
"SUPER CTRL, LEFT, movewindow, l"
|
||||
"SUPER CTRL, RIGHT, movewindow, r"
|
||||
"SUPER CTRL, UP, movewindow, u"
|
||||
"SUPER CTRL, DOWN, movewindow, d"
|
||||
|
||||
"SUPER SHIFT, h, resizeactive, -25 0"
|
||||
"SUPER SHIFT, l, resizeactive, 25 0"
|
||||
"SUPER SHIFT, k, resizeactive, 0 -25"
|
||||
"SUPER SHIFT, j, resizeactive, 0 25"
|
||||
"SUPER SHIFT, h, resizeactive, -25 0"
|
||||
"SUPER SHIFT, l, resizeactive, 25 0"
|
||||
"SUPER SHIFT, k, resizeactive, 0 -25"
|
||||
"SUPER SHIFT, j, resizeactive, 0 25"
|
||||
|
||||
"SUPER, h, movefocus, l"
|
||||
"SUPER, l, movefocus, r"
|
||||
"SUPER, k, movefocus, u"
|
||||
"SUPER, j, movefocus, d"
|
||||
"SUPER, h, movefocus, l"
|
||||
"SUPER, l, movefocus, r"
|
||||
"SUPER, k, movefocus, u"
|
||||
"SUPER, j, movefocus, d"
|
||||
|
||||
"SUPER CTRL, h, movewindow, l"
|
||||
"SUPER CTRL, l, movewindow, r"
|
||||
"SUPER CTRL, k, movewindow, u"
|
||||
"SUPER CTRL, j, movewindow, d"
|
||||
"SUPER CTRL, h, movewindow, l"
|
||||
"SUPER CTRL, l, movewindow, r"
|
||||
"SUPER CTRL, k, movewindow, u"
|
||||
"SUPER CTRL, j, movewindow, d"
|
||||
|
||||
"SUPER, TAB, workspace, e+1"
|
||||
"SUPER ALT, TAB, workspace, e-1"
|
||||
"SUPER, MOUSE_DOWN, workspace, e-1"
|
||||
"SUPER, MOUSE_UP, workspace, e+1"
|
||||
"SUPER, TAB, workspace, e+1"
|
||||
"SUPER ALT, TAB, workspace, e-1"
|
||||
"SUPER, MOUSE_DOWN, workspace, e-1"
|
||||
"SUPER, MOUSE_UP, workspace, e+1"
|
||||
|
||||
", XF86TouchpadToggle, global, asakiyuki:touchpadtoggle"
|
||||
"ALT, SPACE, global, asakiyuki:launcher"
|
||||
", XF86TouchpadToggle, global, asakiyuki:touchpadtoggle"
|
||||
"ALT, SPACE, global, asakiyuki:launcher"
|
||||
|
||||
",XF86MonBrightnessDown, exec, brightnessctl s 5%-"
|
||||
",XF86MonBrightnessUp, exec, brightnessctl s +5%"
|
||||
]
|
||||
++ builtins.concatLists (
|
||||
builtins.genList (i: [
|
||||
"SUPER, ${toString (i + 1)}, workspace,${toString (i + 1)}"
|
||||
"SUPER SHIFT, ${toString (i + 1)}, movetoworkspace,${toString (i + 1)}"
|
||||
]) 9
|
||||
)
|
||||
++ [
|
||||
"SUPER, 0, workspace, 10"
|
||||
"SUPER SHIFT, 0, movetoworkspace, 10"
|
||||
];
|
||||
",XF86MonBrightnessDown, exec, brightnessctl s 5%-"
|
||||
",XF86MonBrightnessUp, exec, brightnessctl s +5%"
|
||||
]
|
||||
++ builtins.concatLists (
|
||||
builtins.genList (i: [
|
||||
"SUPER, ${toString (i + 1)}, workspace,${toString (i + 1)}"
|
||||
"SUPER SHIFT, ${toString (i + 1)}, movetoworkspace,${toString (i + 1)}"
|
||||
])
|
||||
9
|
||||
)
|
||||
++ [
|
||||
"SUPER, 0, workspace, 10"
|
||||
"SUPER SHIFT, 0, movetoworkspace, 10"
|
||||
];
|
||||
|
||||
bindi = [
|
||||
", Caps_Lock, global, asakiyuki:capslock"
|
||||
|
|
|
|||
|
|
@ -1,58 +1,58 @@
|
|||
{ ... }: {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
general = {
|
||||
gaps_in = 5;
|
||||
gaps_out = 10;
|
||||
border_size = 1;
|
||||
"col.active_border" = "rgb(cdd6f4)";
|
||||
"col.inactive_border" = "rgb(7f849c)";
|
||||
allow_tearing = true;
|
||||
resize_on_border = true;
|
||||
};
|
||||
|
||||
decoration = {
|
||||
rounding = 5;
|
||||
rounding_power = 5;
|
||||
active_opacity = 1;
|
||||
inactive_opacity = 1;
|
||||
|
||||
blur = {
|
||||
enabled = true;
|
||||
size = 2;
|
||||
passes = 5;
|
||||
vibrancy = 3;
|
||||
};
|
||||
};
|
||||
|
||||
animations = {
|
||||
enabled = "yes";
|
||||
|
||||
bezier = [
|
||||
"overshot, 0.05, 0.9, 0.1, 1.1"
|
||||
"md3_decel, 0.05, 0.7, 0.1, 1"
|
||||
];
|
||||
|
||||
animation = [
|
||||
"windows, 1, 3, overshot, popin 60%"
|
||||
"border, 1, 10, default"
|
||||
"fade, 1, 2, default"
|
||||
"workspaces, 1, 3.5, overshot, slidefade 15%"
|
||||
"specialWorkspace, 1, 3, md3_decel, slidevert"
|
||||
];
|
||||
};
|
||||
|
||||
dwindle = {
|
||||
pseudotile = true;
|
||||
preserve_split = true;
|
||||
};
|
||||
|
||||
master = {
|
||||
new_status = "master";
|
||||
};
|
||||
|
||||
misc = {
|
||||
force_default_wallpaper = 1;
|
||||
disable_hyprland_logo = true;
|
||||
};
|
||||
{...}: {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
general = {
|
||||
gaps_in = 5;
|
||||
gaps_out = 10;
|
||||
border_size = 1;
|
||||
"col.active_border" = "rgb(cdd6f4)";
|
||||
"col.inactive_border" = "rgb(7f849c)";
|
||||
allow_tearing = true;
|
||||
resize_on_border = true;
|
||||
};
|
||||
}
|
||||
|
||||
decoration = {
|
||||
rounding = 5;
|
||||
rounding_power = 5;
|
||||
active_opacity = 1;
|
||||
inactive_opacity = 1;
|
||||
|
||||
blur = {
|
||||
enabled = true;
|
||||
size = 2;
|
||||
passes = 5;
|
||||
vibrancy = 3;
|
||||
};
|
||||
};
|
||||
|
||||
animations = {
|
||||
enabled = "yes";
|
||||
|
||||
bezier = [
|
||||
"overshot, 0.05, 0.9, 0.1, 1.1"
|
||||
"md3_decel, 0.05, 0.7, 0.1, 1"
|
||||
];
|
||||
|
||||
animation = [
|
||||
"windows, 1, 3, overshot, popin 60%"
|
||||
"border, 1, 10, default"
|
||||
"fade, 1, 2, default"
|
||||
"workspaces, 1, 3.5, overshot, slidefade 15%"
|
||||
"specialWorkspace, 1, 3, md3_decel, slidevert"
|
||||
];
|
||||
};
|
||||
|
||||
dwindle = {
|
||||
pseudotile = true;
|
||||
preserve_split = true;
|
||||
};
|
||||
|
||||
master = {
|
||||
new_status = "master";
|
||||
};
|
||||
|
||||
misc = {
|
||||
force_default_wallpaper = 1;
|
||||
disable_hyprland_logo = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,11 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
wayland.windowManager.hyprland.settings.windowrule = [
|
||||
"float, class:(clipse)"
|
||||
"size 622 652, class:(clipse)"
|
||||
"stayfocused, class:(clipse)"
|
||||
"float, class:(clipse)"
|
||||
"size 622 652, class:(clipse)"
|
||||
"stayfocused, class:(clipse)"
|
||||
|
||||
"suppressevent maximize, class:.*"
|
||||
"nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0"
|
||||
"suppressevent maximize, class:.*"
|
||||
"nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0"
|
||||
|
||||
"opacity 0.0 override, class:^(xwaylandvideobridge)$"
|
||||
"noanim, class:^(xwaylandvideobridge)$"
|
||||
|
|
@ -19,4 +18,3 @@
|
|||
"tile, class:^(Chromium)$"
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
{ lib, libs, osconfig, ... }:
|
||||
{
|
||||
lib,
|
||||
libs,
|
||||
osconfig,
|
||||
...
|
||||
}: {
|
||||
programs.nixcord = lib.mkIf osconfig.device.programs.nixcord.enable {
|
||||
enable = true;
|
||||
discord = {
|
||||
|
|
@ -12,7 +16,7 @@
|
|||
config = {
|
||||
useQuickCss = true;
|
||||
enableReactDevtools = true;
|
||||
themeLinks = [ "https://catppuccin.github.io/discord/dist/catppuccin-mocha-blue.theme.css" ];
|
||||
themeLinks = ["https://catppuccin.github.io/discord/dist/catppuccin-mocha-blue.theme.css"];
|
||||
|
||||
plugins = {
|
||||
BlurNSFW.enable = true;
|
||||
|
|
@ -44,4 +48,4 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ pkgs, config, ... }:
|
||||
{
|
||||
{...}: {
|
||||
programs.nixvim.imports = [
|
||||
./default.nix
|
||||
./extra-packages.nix
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
enable = true;
|
||||
vimdiffAlias = true;
|
||||
colorschemes.catppuccin.enable = true;
|
||||
|
|
@ -17,4 +16,3 @@
|
|||
clipboard = "unnamedplus";
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
extraPackages = with pkgs; [
|
||||
nodePackages.prettier
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,11 +1,9 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
globals.mapleader = " ";
|
||||
keymaps =
|
||||
[ ]
|
||||
[]
|
||||
++ (import ./_default.nix)
|
||||
++ (import ./barbar.nix)
|
||||
++ (import ./toggleterm.nix)
|
||||
++ (import ./nvim-tree-toggle.nix);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -31,9 +31,9 @@
|
|||
}
|
||||
]
|
||||
++ (builtins.genList (i: {
|
||||
mode = "n";
|
||||
key = "<A-${toString (i + 1)}>";
|
||||
action = "<cmd>BufferGoto ${toString (i + 1)}<CR>";
|
||||
options.silent = true;
|
||||
}) 9)
|
||||
|
||||
mode = "n";
|
||||
key = "<A-${toString (i + 1)}>";
|
||||
action = "<cmd>BufferGoto ${toString (i + 1)}<CR>";
|
||||
options.silent = true;
|
||||
})
|
||||
9)
|
||||
|
|
|
|||
|
|
@ -59,5 +59,6 @@
|
|||
options.silent = true;
|
||||
options.noremap = true;
|
||||
}
|
||||
]) 9
|
||||
])
|
||||
9
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,2 @@
|
|||
{ ... }:
|
||||
{
|
||||
|
||||
{...}: {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,13 @@
|
|||
{ pkgs, ... }:
|
||||
let
|
||||
EXTRA_PLUGINS = [
|
||||
./extras/neocord.nix
|
||||
./extras/mini-icons.nix
|
||||
];
|
||||
{pkgs, ...}: let
|
||||
EXTRA_PLUGINS = [
|
||||
./extras/neocord.nix
|
||||
./extras/mini-icons.nix
|
||||
];
|
||||
|
||||
LUA = [
|
||||
./lua/neocord.lua
|
||||
];
|
||||
in
|
||||
{
|
||||
extraPlugins = map (path: import path { plugins = pkgs.vimPlugins; }) EXTRA_PLUGINS;
|
||||
extraConfigLua = builtins.concatStringsSep "\n" (map builtins.readFile LUA);
|
||||
}
|
||||
LUA = [
|
||||
./lua/neocord.lua
|
||||
];
|
||||
in {
|
||||
extraPlugins = map (path: import path {plugins = pkgs.vimPlugins;}) EXTRA_PLUGINS;
|
||||
extraConfigLua = builtins.concatStringsSep "\n" (map builtins.readFile LUA);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }@inputs:
|
||||
{
|
||||
{...} @ inputs: {
|
||||
plugins = {
|
||||
nvim-tree = import ./nvimtree.nix inputs;
|
||||
lsp = import ./lsp.nix inputs;
|
||||
|
|
|
|||
|
|
@ -1,25 +1,25 @@
|
|||
{ ... }: {
|
||||
enable = true;
|
||||
autoEnableSources = true;
|
||||
{...}: {
|
||||
enable = true;
|
||||
autoEnableSources = true;
|
||||
|
||||
settings = {
|
||||
sources = [
|
||||
{ name = "nvim_lsp"; }
|
||||
{ name = "path"; }
|
||||
{ name = "luasnip"; }
|
||||
{ name = "buffer"; }
|
||||
];
|
||||
settings = {
|
||||
sources = [
|
||||
{name = "nvim_lsp";}
|
||||
{name = "path";}
|
||||
{name = "luasnip";}
|
||||
{name = "buffer";}
|
||||
];
|
||||
|
||||
mapping = {
|
||||
"<C-Space>" = "cmp.mapping.complete()";
|
||||
"<C-d>" = "cmp.mapping.scroll_docs(-4)";
|
||||
"<C-f>" = "cmp.mapping.scroll_docs(4)";
|
||||
"<C-e>" = "cmp.mapping.abort()";
|
||||
"<CR>" = "cmp.mapping.confirm({ select = true })";
|
||||
"<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
|
||||
"<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
|
||||
};
|
||||
|
||||
formatting.fields = [ "kind" "abbr" "menu" ];
|
||||
mapping = {
|
||||
"<C-Space>" = "cmp.mapping.complete()";
|
||||
"<C-d>" = "cmp.mapping.scroll_docs(-4)";
|
||||
"<C-f>" = "cmp.mapping.scroll_docs(4)";
|
||||
"<C-e>" = "cmp.mapping.abort()";
|
||||
"<CR>" = "cmp.mapping.confirm({ select = true })";
|
||||
"<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
|
||||
"<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
|
||||
};
|
||||
}
|
||||
|
||||
formatting.fields = ["kind" "abbr" "menu"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,14 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
enable = true;
|
||||
settings = {
|
||||
formatters_by_ft = {
|
||||
javascript = [ "prettier" ];
|
||||
typescript = [ "prettier" ];
|
||||
json = [ "prettier" ];
|
||||
css = [ "prettier" ];
|
||||
html = [ "prettier" ];
|
||||
nix = [ "nixfmt" ];
|
||||
php = [ "php_cs_fixer" ];
|
||||
javascript = ["prettier"];
|
||||
typescript = ["prettier"];
|
||||
json = ["prettier"];
|
||||
css = ["prettier"];
|
||||
html = ["prettier"];
|
||||
nix = ["nixfmt"];
|
||||
php = ["php_cs_fixer"];
|
||||
};
|
||||
|
||||
format_on_save = {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
{ plugins, ... }:
|
||||
{
|
||||
plugin = plugins.mini-icons;
|
||||
}
|
||||
{plugins, ...}: {
|
||||
plugin = plugins.mini-icons;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
{ plugins, ... }:
|
||||
{
|
||||
plugin = plugins.neocord;
|
||||
}
|
||||
{plugins, ...}: {
|
||||
plugin = plugins.neocord;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
enable = true;
|
||||
lintersByFt = {
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
enable = true;
|
||||
servers = {
|
||||
phpactor.enable = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ ... }: {
|
||||
enable = true;
|
||||
cmp.enable = true;
|
||||
{...}: {
|
||||
enable = true;
|
||||
cmp.enable = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{ ... }: {
|
||||
enable = true;
|
||||
openOnSetupFile = true;
|
||||
settings.auto_reload_on_write = true;
|
||||
{...}: {
|
||||
enable = true;
|
||||
openOnSetupFile = true;
|
||||
settings.auto_reload_on_write = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }:
|
||||
{
|
||||
{...}: {
|
||||
enable = true;
|
||||
settings = {
|
||||
preset = "modern";
|
||||
|
|
|
|||
Reference in a new issue