cleanup
This commit is contained in:
parent
1165454fc3
commit
c7cb20b7be
16 changed files with 191 additions and 378 deletions
|
|
@ -34,7 +34,6 @@
|
|||
(tree-sitter.withPlugins (_: tree-sitter.allGrammars))
|
||||
];
|
||||
|
||||
home.file.".npmrc".source = ../../homes/emenel/dotfiles/dot_npmrc;
|
||||
home.file.".sbclrc".source = ../../homes/emenel/dotfiles/dot_sbclrc;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ in {
|
|||
{ command = ["clipse" "-listen"]; }
|
||||
{ command = [ "${nix-config.packages.x86_64-linux.filen-desktop}/bin/filen-desktop" ]; }
|
||||
# { command = ["waybar"]; }
|
||||
{ command = [ "systemctl" "--user" "restart" "xwayland-satellite.service" "shikane.service" "waybar.service" ]; }
|
||||
{ command = [ "systemctl" "--user" "restart" "xwayland-satellite.service" "shikane.service" ]; }
|
||||
];
|
||||
|
||||
workspaces = {
|
||||
|
|
|
|||
|
|
@ -165,43 +165,6 @@
|
|||
thefuck = {
|
||||
enable = true;
|
||||
};
|
||||
ghostty = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
installBatSyntax = true;
|
||||
settings = {
|
||||
command = "/home/emenel/.nix-profile/bin/fish --login --interactive";
|
||||
theme = "Adventure";
|
||||
font-family = "JetBrains Mono";
|
||||
font-size = 12;
|
||||
background = 111111;
|
||||
selection-foreground = "ffffff";
|
||||
selection-background = 444444;
|
||||
bold-is-bright = true;
|
||||
cursor-style = "bar";
|
||||
adjust-cursor-thickness = 2;
|
||||
resize-overlay = "never";
|
||||
cursor-click-to-move = true;
|
||||
|
||||
clipboard-paste-protection = true;
|
||||
keybind = [
|
||||
"ctrl+t=new_tab"
|
||||
"ctrl+w=close_surface"
|
||||
"ctrl+enter=new_split:down"
|
||||
"ctrl+shift+enter=new_split:right"
|
||||
"ctrl+alt+enter=equalize_splits"
|
||||
"ctrl+alt+z=toggle_split_zoom"
|
||||
"ctrl+alt+left=previous_tab"
|
||||
"ctrl+alt+right=next_tab"
|
||||
"ctrl+alt+up=goto_split:left"
|
||||
"ctrl+alt+down=goto_split:right"
|
||||
"ctrl+backspace=text:\x1b\x7f"
|
||||
];
|
||||
};
|
||||
};
|
||||
# zellij = {
|
||||
# enable = true;
|
||||
# };
|
||||
wezterm = {
|
||||
enable = true;
|
||||
package = inputs.wezterm.packages.${pkgs.system}.default;
|
||||
|
|
|
|||
|
|
@ -4,10 +4,166 @@ let strPalette = palette.toRGBHex pkgs.rice.colorPalette;
|
|||
in {
|
||||
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
package = pkgs.waybar;
|
||||
systemd = {
|
||||
enable = true;
|
||||
package = pkgs.waybar;
|
||||
systemd.enable = true;
|
||||
style = ''
|
||||
};
|
||||
settings = {
|
||||
mainBar = {
|
||||
layer = "top";
|
||||
position = "top";
|
||||
|
||||
modules-left = [
|
||||
"clock"
|
||||
"niri/workspaces"
|
||||
"mpris"
|
||||
];
|
||||
|
||||
modules-right = [
|
||||
"wlr/taskbar"
|
||||
"tray"
|
||||
"cpu"
|
||||
"memory"
|
||||
"network"
|
||||
"wireplumber"
|
||||
"power-profiles-daemon"
|
||||
"upower"
|
||||
"idle_inhibitor"
|
||||
"custom/notification"
|
||||
];
|
||||
|
||||
"custom/notification" = {
|
||||
"tooltip" = false;
|
||||
"format" = "{icon}";
|
||||
"format-icons" = {
|
||||
"notification" = "<span foreground='red'><sup></sup></span>";
|
||||
"none" = "";
|
||||
"dnd-notification" = "<span foreground='red'><sup></sup></span>";
|
||||
"dnd-none" = "";
|
||||
"inhibited-notification" = "<span foreground='red'><sup></sup></span>";
|
||||
"inhibited-none" = "";
|
||||
"dnd-inhibited-notification" = "<span foreground='red'><sup></sup></span>";
|
||||
"dnd-inhibited-none" = "";
|
||||
};
|
||||
|
||||
"return-type" = "json";
|
||||
"exec-if" = "which swaync-client";
|
||||
"exec" = "swaync-client -swb";
|
||||
"on-click" = "swaync-client -t -sw";
|
||||
"on-click-right" = "swaync-client -d -sw";
|
||||
"escape" = true;
|
||||
};
|
||||
|
||||
"idle_inhibitor" = {
|
||||
"format" = "{icon}";
|
||||
"tooltip-format-activated" = "idle inhibitor = {status}";
|
||||
"tooltip-format-deactivated" = "idle inhibitor = {status}";
|
||||
"format-icons" = {
|
||||
"activated" = "";
|
||||
"deactivated" = "";
|
||||
};
|
||||
};
|
||||
|
||||
"power-profiles-daemon" = {
|
||||
"format" = "{icon}";
|
||||
"tooltip-format" = "Power profile = {profile}\nDriver = {driver}";
|
||||
"tooltip" = true;
|
||||
"format-icons" = {
|
||||
"default" = "?";
|
||||
"performance" = "";
|
||||
"balanced" = "";
|
||||
"power-saver" = "";
|
||||
};
|
||||
};
|
||||
|
||||
"memory" = {
|
||||
"interval" = 30;
|
||||
"format" = "{used =0.1f}G/{total =0.1f}G ";
|
||||
"on-click" = "$HOME/.local/bin/wezapp btop";
|
||||
};
|
||||
|
||||
"cpu" = {
|
||||
"interval" = 10;
|
||||
"format" = "{}% ";
|
||||
"max-length" = 10;
|
||||
"on-click" = "$HOME/.local/bin/wezapp btop";
|
||||
};
|
||||
|
||||
"network" = {
|
||||
"format-wifi" = "";
|
||||
"format-ethernet" = "";
|
||||
"format-disconnected" = "";
|
||||
"tooltip-format" = "{essid} {ifname}";
|
||||
"max-length" = 50;
|
||||
"on-click" = "$HOME/.local/bin/wezlauncher nmtui";
|
||||
};
|
||||
|
||||
"tray" = {
|
||||
"icon-size" = 20;
|
||||
"spacing" = 10;
|
||||
};
|
||||
|
||||
"clock" = {
|
||||
"format" = "{ =%a %d %b %Y %I =%M}";
|
||||
"on-click" = "gnome-calendar";
|
||||
"tooltip" = false;
|
||||
};
|
||||
|
||||
"wireplumber" = {
|
||||
"format" = "{volume}% {icon}";
|
||||
"format-muted" = "";
|
||||
"format-icons" = [
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
"on-click" = "pavucontrol";
|
||||
};
|
||||
|
||||
"mpris" = {
|
||||
"dynamic-order" = ["title"
|
||||
"artist"
|
||||
"album"
|
||||
"length"];
|
||||
"format" = "{player_icon} {dynamic}";
|
||||
"format-paused" = "{status_icon} <i>{dynamic}</i>";
|
||||
"dynamic-len" = 75;
|
||||
"player-icons" = {
|
||||
"default" = "";
|
||||
};
|
||||
"status-icons" = {
|
||||
"paused" = "";
|
||||
};
|
||||
};
|
||||
|
||||
"wlr/taskbar" = {
|
||||
"format" = "{icon}";
|
||||
"icon-size" = 20;
|
||||
"tooltip-format" = "{title}";
|
||||
"on-click" = "activate";
|
||||
"app_ids-mapping" = {
|
||||
"firefoxdeveloperedition" = "firefox-developer-edition";
|
||||
};
|
||||
"ignore-list" = [
|
||||
"Signal"
|
||||
];
|
||||
"rewrite" = {
|
||||
"Firefox Web Browser" = "Firefox";
|
||||
};
|
||||
};
|
||||
|
||||
"niri/workspaces" = {
|
||||
"format" = "{icon}";
|
||||
"format-icons" = {
|
||||
"main" = "";
|
||||
"scratchpad" = "";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
style = ''
|
||||
* {
|
||||
border: none;
|
||||
font-size: 12pt;
|
||||
|
|
@ -155,7 +311,4 @@ window#waybar {
|
|||
}
|
||||
'';
|
||||
};
|
||||
|
||||
xdg.configFile."waybar/config".source = ../../homes/emenel/dotfiles/dot_config/waybar/config;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,10 +7,13 @@
|
|||
initLua = ../../homes/emenel/dotfiles/dot_config/yazi/init.lua;
|
||||
keymap = {
|
||||
manager.prepend_keymap = [
|
||||
{ on = ["c" "d"]; run = "shell 'ripdrag \"$@\" -x 2>/dev/null &' --confirm"; desc = "drag selection";}
|
||||
{ on = ["c" "d"]; run = "shell 'ripdrag \"$@\" -x 2>/dev/null &' --confirm"; desc = "Drag selection";}
|
||||
{ on = ["c" "c"]; run = "yank"; desc = "Copy file"; }
|
||||
{ on = ["c" "n"]; run = "copy filename"; desc = "Copy file name"; }
|
||||
{ on = ["c" "N"]; run = "copy name_without_ext"; desc = "Copy file name without extension"; }
|
||||
{ on = "y"; run = ["shell 'for path in \"$@\"; do echo \"file://$path\"; done | wl-copy -t text/uri-list'\n" "yank"]; }
|
||||
{ on = ["g" "r"]; run = "shell 'ya emit cd \"$(git rev-parse --show-toplevel)\"'\n"; desc = "go to top of git repo"; }
|
||||
{ on = ["g" "p"]; run = "cd ~/Projects"; desc = "go to ~/Projects"; }
|
||||
{ on = ["g" "r"]; run = "shell 'ya emit cd \"$(git rev-parse --show-toplevel)\"'\n"; desc = "Go to top of git repo"; }
|
||||
{ on = ["g" "p"]; run = "cd ~/Projects"; desc = "Go to ~/Projects"; }
|
||||
{ on = ["t" "p"]; run = "plugin toggle-view parent"; desc = "Toggle parent"; }
|
||||
{ on = ["t" "c"]; run = "plugin toggle-view current"; desc = "Toggle current"; }
|
||||
{ on = ["t" "r"]; run = "plugin toggle-view preview"; desc = "Toggle preview"; }
|
||||
|
|
@ -32,6 +35,8 @@
|
|||
{ on = "l"; run = "plugin smart-enter"; desc = "Enter the child directory, or open the file"; }
|
||||
{ on = "<Enter>"; run = "plugin smart-enter"; desc = "Enter the child directory, or open the file"; }
|
||||
{ on = "<Right>"; run = "plugin smart-enter"; desc = "Enter the child directory, or open the file"; }
|
||||
{ on = "<Delete>"; run = "remove"; }
|
||||
{ on = "<Backspace>"; run = "remove"; }
|
||||
];
|
||||
};
|
||||
settings = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue