Skip to content

helix: use extraPackages #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hollymlem wants to merge 2 commits into
base: main
Choose a base branch
from
Open

helix: use extraPackages #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a520afb
Switch from Swaylock/-idle to Hyprlock/-idle
cloudlena Jun 18, 2024
31a3dab
helix: use extraPackages
hollymlem Jun 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

184 changes: 147 additions & 37 deletions home/editor.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,47 +15,157 @@
};
languages = {
language-server = {
gopls = { config."formatting.gofumpt" = true; };
gopls = {
config."formatting.gofumpt" = true;
};
nil = {
config."nil.nix.flake.autoEvalInputs" = true;
};
};
language = [
{ name = "bash"; auto-format = true; formatter = { command = "${pkgs.shfmt}/bin/shfmt"; }; }
{ name = "css"; formatter = { command = "${pkgs.nodePackages.prettier}/bin/prettier"; args = [ "--parser" "css" ]; }; }
{ name = "html"; formatter = { command = "${pkgs.nodePackages.prettier}/bin/prettier"; args = [ "--parser" "html" ]; }; }
{ name = "javascript"; auto-format = true; formatter = { command = "${pkgs.nodePackages.prettier}/bin/prettier"; args = [ "--parser" "typescript" ]; }; }
{ name = "json"; formatter = { command = "${pkgs.nodePackages.prettier}/bin/prettier"; args = [ "--parser" "json" ]; }; }
{ name = "markdown"; auto-format = true; formatter = { command = "${pkgs.nodePackages.prettier}/bin/prettier"; args = [ "--parser" "markdown" ]; }; }
{ name = "nix"; auto-format = true; formatter = { command = "${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt"; }; }
{ name = "python"; auto-format = true; formatter = { command = "${pkgs.black}/bin/black"; args = [ "--quiet" "-" ]; }; }
{ name = "svelte"; auto-format = true; formatter = { command = "${pkgs.nodePackages.prettier}/bin/prettier"; args = [ "--parser" "svelte" ]; }; }
{ name = "typescript"; auto-format = true; formatter = { command = "${pkgs.nodePackages.prettier}/bin/prettier"; args = [ "--parser" "typescript" ]; }; }
{ name = "yaml"; auto-format = true; formatter = { command = "${pkgs.nodePackages.prettier}/bin/prettier"; args = [ "--parser" "yaml" ]; }; }
{
name = "bash";
auto-format = true;
formatter = {
command = "shfmt";
};
}
{
name = "css";
formatter = {
command = "prettier";
args = [
"--parser"
"css"
];
};
}
{
name = "html";
formatter = {
command = "prettier";
args = [
"--parser"
"html"
];
};
}
{
name = "javascript";
auto-format = true;
formatter = {
command = "prettier";
args = [
"--parser"
"typescript"
];
};
}
{
name = "json";
formatter = {
command = "prettier";
args = [
"--parser"
"json"
];
};
}
{
name = "markdown";
auto-format = true;
formatter = {
command = "prettier";
args = [
"--parser"
"markdown"
];
};
}
{
name = "nix";
auto-format = true;
formatter = {
command = "nix";
args = [
"fmt"
"--"
"-"
];
};
}
{
name = "python";
auto-format = true;
formatter = {
command = "black";
args = [
"--quiet"
"-"
];
};
}
{
name = "svelte";
auto-format = true;
formatter = {
command = "prettier";
args = [
"--parser"
"svelte"
];
};
}
{
name = "typescript";
auto-format = true;
formatter = {
command = "prettier";
args = [
"--parser"
"typescript"
];
};
}
{
name = "yaml";
auto-format = true;
formatter = {
command = "prettier";
args = [
"--parser"
"yaml"
];
};
}
];
};
};

home.packages = with pkgs; [
# Language servers
docker-compose-language-service
gopls
golangci-lint-langserver
marksman
nil
nodePackages.bash-language-server
nodePackages.dockerfile-language-server-nodejs
nodePackages.svelte-language-server
nodePackages.typescript-language-server
nodePackages.yaml-language-server
python311Packages.python-lsp-server
rust-analyzer
terraform-ls
vscode-langservers-extracted
extraPackages = with pkgs; [
# Language servers
docker-compose-language-service
gopls
golangci-lint-langserver
marksman
nil
nodePackages.bash-language-server
nodePackages.dockerfile-language-server-nodejs
nodePackages.svelte-language-server
nodePackages.typescript-language-server
nodePackages.yaml-language-server
python311Packages.python-lsp-server
rust-analyzer
terraform-ls
vscode-langservers-extracted

# Debuggers
delve
lldb
# Debuggers
delve
lldb

# Formatters
nodePackages.prettier
rustfmt
];
# Formatters
nodePackages.prettier
rustfmt
black
shfmt
];
};
}
65 changes: 47 additions & 18 deletions home/window-manager.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,18 @@
enable = true;
settings = {
"$mod" = "SUPER";
"$wallpaper" = "${config.xdg.dataHome}/wallpapers/bespinian.png";
"$launcherCmd" = "${pkgs.fuzzel}/bin/fuzzel --prompt '󱉺 '";
general = {
border_size = 2;
gaps_in = 0;
gaps_out = 0;
"col.active_border" = "rgb(bb9af7)";
"cursor_inactive_timeout" = 8;
};
input = {
kb_options = "caps:escape,compose:ralt";
touchpad.natural_scroll = true;
};
cursor.inactive_timeout = 8;
gestures = {
workspace_swipe = true;
workspace_swipe_min_speed_to_force = 5;
Expand All @@ -39,7 +38,6 @@
monitor = "eDP-1,preferred,auto,1.5";
exec-once = [
"${pkgs.waybar}/bin/waybar"
"${pkgs.swaybg}/bin/swaybg --image $wallpaper --mode fill"
];
bind = [
# Window manager
Expand All @@ -55,8 +53,8 @@
"$mod, W, exec, ${pkgs.brave}/bin/brave"
"$mod, C, exec, ${pkgs.cliphist}/bin/cliphist list | ${pkgs.fuzzel}/bin/fuzzel --dmenu --prompt '󰆏 ' | ${pkgs.cliphist}/bin/cliphist decode | ${pkgs.wl-clipboard}/bin/wl-copy"
"$mod, E, exec, ${pkgs.bemoji}/bin/bemoji -n"
"$mod, P, exec, ${pkgs.hyprpicker}/bin/hyprpicker"
"SUPER_CTRL, Q, exec, ${pkgs.swaylock}/bin/swaylock --daemonize"
"$mod, P, exec, ${pkgs.hyprpicker}/bin/hyprpicker --autocopy"
"SUPER_CTRL, Q, exec, ${pkgs.systemd}/bin/loginctl lock-session"

# Media keys
", XF86AudioRaiseVolume, exec, ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
Expand Down Expand Up @@ -336,28 +334,59 @@
};
};

# Lock screen manager
swaylock = {
# Screen lock
hyprlock = {
enable = true;
settings = {
image = "${config.xdg.dataHome}/wallpapers/bespinian.png";
general = {
hide_cursor = true;
};
background = [
{
path = "${config.xdg.dataHome}/wallpapers/bespinian.png";
blur_passes = 3;
}
];
input-field = [
{
font_color = "rgb(c0caf5)";
inner_color = "rgb(1a1b26)";
outer_color = "rgb(1a1b26)";
check_color = "rgb(e0af68)";
fail_color = "rgb(f7768e)";
}
];
};
};
};

services = {
# Background image
hyprpaper = {
enable = true;
settings = {
preload = [ "${config.xdg.dataHome}/wallpapers/bespinian.png" ];
wallpaper = [ ",${config.xdg.dataHome}/wallpapers/bespinian.png" ];
splash = false;
ipc = false;
};
};

# Idle manager
swayidle = {
hypridle = {
enable = true;
timeouts = [
{ timeout = 600; command = "${pkgs.swaylock}/bin/swaylock --daemonize"; }
{ timeout = 900; command = "${pkgs.hyprland}/bin/hyprctl dispatch dpms off"; resumeCommand = "${pkgs.hyprland}/bin/hyprctl dispatch dpms on"; }
{ timeout = 1200; command = "${pkgs.systemd}/bin/systemctl suspend"; }
];
events = [
{ event = "before-sleep"; command = "${pkgs.swaylock}/bin/swaylock --daemonize"; }
{ event = "lock"; command = "${pkgs.swaylock}/bin/swaylock --daemonize"; }
];
settings = {
general = {
lock_cmd = "pidof hyprlock || ${pkgs.hyprlock}/bin/hyprlock";
before_sleep_cmd = "${pkgs.systemd}/bin/loginctl lock-session";
after_sleep_cmd = "${pkgs.hyprland}/bin/hyprctl dispatch dpms on";
};
listener = [
{ timeout = 600; on-timeout = "${pkgs.systemd}/bin/loginctl lock-session"; }
{ timeout = 900; on-timeout = "${pkgs.hyprland}/bin/hyprctl dispatch dpms off"; on-resume = "${pkgs.hyprland}/bin/hyprctl dispatch dpms on"; }
{ timeout = 1200; on-timeout = "${pkgs.systemd}/bin/systemctl suspend"; }
];
};
};

# Clipboard manager
Expand Down
3 changes: 0 additions & 3 deletions system/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@
# AppArmor
security.apparmor.enable = true;

# Temporary fix for Swaylock issue
security.pam.services.swaylock = { };

# Containers
virtualisation.podman.enable = true;

Expand Down