Get (most) symbols working in VSCode, improve support for system rebuild workflow, clean up waybar, switch to grimblast (w/ keybind)
Some checks are pending
SSH and echo to file / ssh (push) Waiting to run

This commit is contained in:
Joey Hafner 2024-10-15 16:57:00 -07:00
parent 9abb87ace5
commit 9cb1c6d080
6 changed files with 57 additions and 20 deletions

View File

@ -39,7 +39,7 @@
}; };
userSettings = { userSettings = {
user = "joey"; user = "joey";
theme = "nature-blue"; theme = "gruvbox-warm";
wm = "hyprland"; wm = "hyprland";
}; };
lib = nixpkgs.lib; lib = nixpkgs.lib;

View File

@ -1,4 +1,4 @@
{ pkgs, ... }: { pkgs, lib, ... }:
{ {
## Nix LSP ## Nix LSP
home.packages = with pkgs; [ nixd ]; home.packages = with pkgs; [ nixd ];
@ -6,6 +6,7 @@
programs.vscode = { programs.vscode = {
enable = true; enable = true;
package = pkgs.vscodium; package = pkgs.vscodium;
mutableExtensionsDir = true;
extensions = with pkgs.vscode-extensions; [ extensions = with pkgs.vscode-extensions; [
jnoortheen.nix-ide jnoortheen.nix-ide
continue.continue continue.continue
@ -14,6 +15,31 @@
"nix.serverPath" = "nixd"; "nix.serverPath" = "nixd";
"nix.enableLanguageServer" = true; "nix.enableLanguageServer" = true;
"explorer.confirmDragAndDrop" = false; "explorer.confirmDragAndDrop" = false;
"workbench.colorTheme" = "Stylix";
"editor.fontFamily" = lib.mkForce "'Symbols Nerd Font Mono', 'PowerlineSymbols', 'DejaVu Sans Mono'";
};
userTasks = {
version = "2.0.0";
tasks = [
{
type = "shell";
label = "NixOS Rebuild Switch";
command = "sudo nixos-rebuild switch --flake ~/Jafner.net/nix";
problemMatcher = [];
}
{
type = "shell";
label = "Home-Manager Switch";
command = "home-manager switch -b bak --flake ~/Jafner.net/nix";
problemMatcher = [];
}
{
label = "System Rebuild";
dependsOn = ["NixOS Rebuild Switch" "Home-Manager Switch" ];
dependsOrder = "sequence";
problemMatcher = [];
}
];
}; };
}; };
} }

View File

@ -6,13 +6,19 @@
plugins = []; plugins = [];
settings = { settings = {
monitor = ",1920x1080@60,0x0,1"; monitor = ",1920x1080@60,0x0,1";
# Declare default applications
"$terminal" = "kitty"; "$terminal" = "kitty";
"$fileManager" = "dolphin"; "$fileManager" = "dolphin";
"$bar" = "killall .waybar-wrapped; waybar --style ~/.config/waybar/waybar.css"; "$browser" = "flatpak run io.github.zen_browser.zen";
"$bar" = "killall .waybar-wrapped; waybar"; #"$bar" = "killall .waybar-wrapped; waybar --style ~/.config/waybar/waybar.css";
"$menu" = "wofi --show drun"; "$menu" = "wofi --show drun";
"$notifd" = "mako"; "$notifd" = "mako";
"$wallpaperd" = "swww-daemon"; "$wallpaperd" = "swww-daemon";
"$screenshot" = "grimblast copy area";
# Scripted actions
"$commandRebuildNix" = "$terminal sudo nixos-rebuild switch --flake ~/Jafner.net/nix";
"$commandRebuildHomeManager" = "$terminal home-manager switch -b bak --flake ~/Jafner.net/nix";
exec-once = [ exec-once = [
"$terminal" "$terminal"
@ -38,7 +44,7 @@
decoration = { decoration = {
rounding = "10"; rounding = "10";
active_opacity = "1.0"; active_opacity = "1.0";
inactive_opacity = "0.9"; inactive_opacity = "0.99";
drop_shadow = true; drop_shadow = true;
shadow_range = "4"; shadow_range = "4";
shadow_render_power = "3"; shadow_render_power = "3";
@ -105,6 +111,10 @@
"$mainMod, R, exec, $menu" "$mainMod, R, exec, $menu"
"$mainMod, P, pseudo," "$mainMod, P, pseudo,"
"$mainMod, J, togglesplit," "$mainMod, J, togglesplit,"
"$mainMod CTRL, S, exec, $screenshot"
"$mainMod CTRL, Z, exec, $browser"
"$mainMod CTRL ALT, N, exec, $commandRebuildNix"
"$mainMod CTRL ALT, H, exec, $commandRebuildHomeManager"
"$mainMod, left, movefocus, l" "$mainMod, left, movefocus, l"
"$mainMod, right, movefocus, r" "$mainMod, right, movefocus, r"
"$mainMod, up, movefocus, u" "$mainMod, up, movefocus, u"

View File

@ -8,8 +8,8 @@
position = "top"; position = "top";
height = 30; height = 30;
spacing = 30; spacing = 30;
margin-left = 40; margin-left = 0;
margin-right = 40; margin-right = 0;
modules-left = [ "custom/appmenu" "wlr/taskbar" "hyprland/window" "tray" ]; modules-left = [ "custom/appmenu" "wlr/taskbar" "hyprland/window" "tray" ];
modules-center = [ "hyprland/workspaces" ]; modules-center = [ "hyprland/workspaces" ];
modules-right = [ modules-right = [
@ -49,11 +49,11 @@
separate-outputs = true; separate-outputs = true;
}; };
"custom/appmenu" = { "custom/appmenu" = {
format = " "; format = " "; # Manual padding to move it further from left edge
on-click = "wofi --show drun"; on-click = "wofi --show drun";
}; };
"custom/exit" = { "custom/exit" = {
format = " "; format = " "; # Manual padding to move it further from right edge
on-click = "wlogout"; on-click = "wlogout";
tooltip-format = "Power Menu"; tooltip-format = "Power Menu";
}; };
@ -109,7 +109,7 @@
format = ''{volume}% {icon} {format_source}''; format = ''{volume}% {icon} {format_source}'';
format-bluetooth = ''{volume}% {icon} {format_source}''; format-bluetooth = ''{volume}% {icon} {format_source}'';
format-bluetooth-muted = ''{icon} {format_source}''; format-bluetooth-muted = ''{icon} {format_source}'';
format-muted = '' {format_source}''; format-muted = ''{format_source}'';
format-source = ''{volume}% ''; format-source = ''{volume}% '';
format-source-muted = '' ''; format-source-muted = '' '';
format-icons = { format-icons = {
@ -143,8 +143,8 @@
# with '-c ~/.config/waybar/waybar.css', which will add our snippets # with '-c ~/.config/waybar/waybar.css', which will add our snippets
# and then source the original, default '~/.config/waybar/style.css' # and then source the original, default '~/.config/waybar/style.css'
# created by Stylix. # created by Stylix.
home.file."waybar.css" = { # home.file."waybar.css" = {
target = ".config/waybar/waybar.css"; # target = ".config/waybar/waybar.css";
source = ./waybar.css; # source = ./waybar.css;
}; # };
} }

View File

@ -12,7 +12,7 @@
dolphin dolphin
power-profiles-daemon power-profiles-daemon
pavucontrol pavucontrol
grim slurp grimblast
]; ];
} }

View File

@ -1,9 +1,10 @@
{ pkgs, ... }: { { pkgs, ... }: {
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
noto-fonts noto-fonts-cjk noto-fonts-emoji
liberation_ttf
fira-code fira-code-symbols
font-awesome font-awesome
nerdfonts noto-fonts
]; noto-fonts-cjk
noto-fonts-emoji
powerline-symbols
(pkgs.nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
];
} }