Changed Files :o

This commit is contained in:
Jack Mechem 2026-02-23 17:52:44 -08:00
parent 5f4b193744
commit 6f5a131860
7 changed files with 317 additions and 349 deletions

18
flake.lock generated
View file

@ -61,11 +61,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1763574263, "lastModified": 1770876102,
"narHash": "sha256-01zZBQQbcEWhQ5hFpVUt2iexWWS2aVpKXWMwcleNGKQ=", "narHash": "sha256-jHWptGWM4BIW8/k/uV5nKWsiArWUUdZAV27IQSO0AVg=",
"owner": "JackMechem", "owner": "JackMechem",
"repo": "gtkbar", "repo": "gtkbar",
"rev": "968f3395bedd92720e384d5c7037578a1ebd1625", "rev": "4513fa37d035e93f68df33c63385e3af06ff0147",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -81,11 +81,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770654520, "lastModified": 1770818644,
"narHash": "sha256-mg5WZMIPGsFu9MxSrUcuJUPMbfMsF77el5yb/7rc10k=", "narHash": "sha256-DYS4jIRpRoKOzJjnR/QqEd/MlT4OZZpt8CrBLv+cjsE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6c4fdbe1ad198fac36c320fd45c5957324a80b8e", "rev": "0acbd1180697de56724821184ad2c3e6e7202cd7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -210,11 +210,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770707140, "lastModified": 1770872317,
"narHash": "sha256-3ZRA2+o5p1+FKWx988WbwB1SQ2Mz5aL95zxhL5iD+O0=", "narHash": "sha256-3EWU4/yYtR71zMK0qP3Uysd/McFaHeDfQgtrvh8ELLE=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "db14437f8667f7f09784e2a4e73c105bdc1c7023", "rev": "40ec16210240665705a32ab0150e852f21fd6668",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -1,74 +1,76 @@
{ {
config, config,
lib, lib,
pkgs, pkgs,
inputs, inputs,
... ...
}: }:
{ {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
../../modules/nixos/gtkapps.nix ../../modules/nixos/gtkapps.nix
../../modules/nixos/gtkbar.nix ../../modules/nixos/gtkbar.nix
../../modules/nixos/fonts.nix ../../modules/nixos/fonts.nix
../../modules/nixos/system-packages.nix ../../modules/nixos/system-packages.nix
../../modules/nixos/user-jack.nix ../../modules/nixos/user-jack.nix
../../modules/nixos/sound.nix ../../modules/nixos/sound.nix
../../modules/nixos/print.nix ../../modules/nixos/print.nix
]; ];
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_6; boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_6;
networking.hostName = "jackdesk"; networking.hostName = "jackdesk";
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
nix.settings.experimental-features = [ nix.settings.experimental-features = [
"nix-command" "nix-command"
"flakes" "flakes"
]; ];
time.timeZone = "America/Los_Angeles"; time.timeZone = "America/Los_Angeles";
services.dbus.enable = true; services.dbus.enable = true;
programs.zsh.enable = true; programs.zsh.enable = true;
programs.thunar.enable = true; programs.thunar.enable = true;
programs.dconf.enable = true; programs.dconf.enable = true;
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
# services.midirun = { # services.midirun = {
# enable = true; # enable = true;
# }; # };
xdg.portal = { xdg.portal = {
enable = true; enable = true;
wlr.enable = true; wlr.enable = true;
extraPortals = with pkgs; [ extraPortals = with pkgs; [
xdg-desktop-portal-gtk xdg-desktop-portal-gtk
xdg-desktop-portal-hyprland xdg-desktop-portal-hyprland
xdg-desktop-portal-gnome xdg-desktop-portal-gnome
]; ];
};
home-manager = {
extraSpecialArgs = { inherit inputs; };
users = {
"jack" = import ./home.nix;
}; };
};
services.libinput.enable = true; home-manager = {
extraSpecialArgs = { inherit inputs; };
users = {
"jack" = import ./home.nix;
};
};
services.openssh.enable = true; services.libinput.enable = true;
system.stateVersion = "25.11"; services.openssh.enable = true;
services.gvfs.enable = true;
system.stateVersion = "25.11";
} }

View file

@ -14,6 +14,7 @@
../../modules/home-manager/hyprland-desktop.nix ../../modules/home-manager/hyprland-desktop.nix
../../modules/home-manager/homepackages.nix ../../modules/home-manager/homepackages.nix
../../modules/home-manager/shell-aliases.nix ../../modules/home-manager/shell-aliases.nix
../../modules/home-manager/neovimpackages.nix
]; ];
programs.home-manager.enable = true; programs.home-manager.enable = true;

View file

@ -1,44 +1,26 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
pkgs.sway-contrib.grimshot ### Desktop Stuff
waypaper pkgs.sway-contrib.grimshot
hyprpaper waypaper
swaybg hyprpaper
gtk3 swaybg
glib
zlib
# Neovim plugin dependencies ### Audio
deno playerctl
spotify
# LSPs pavucontrol
lua-language-server
nil
nixfmt-rfc-style
stylua
nodejs_20
typescript
nodePackages.typescript-language-server
nodePackages.vscode-langservers-extracted
nodePackages.bash-language-server
nodePackages.prettier
nodePackages.eslint_d
nodePackages.eslint
nixd
alejandra
lunar-client ### Chat apps
discord lunar-client
discord
zoom-us
spotify ### Random Libraries and Dependencies
pavucontrol gtk3
glib
zoom-us zlib
]; deno
];
# environment.variables = {
# WEBKIT_DISABLE_COMPOSITING_MODE = "1";
# };
} }

View file

@ -1,268 +1,223 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
extraConfig = ''
$monitor1 = DP-1 settings =
$monitor2 = DP-2 let
$monitor3 = HDMI-A-1 monitor1 = "DP-1";
monitor2 = "DP-2";
monitor3 = "HDMI-A-1";
mainMod = "SUPER";
in
{
# --- Monitor Configuration ---
monitor = [
"${monitor1},2560x1440@144,0x0,1,bitdepth,10"
"${monitor2},1920x1080@75,2560x0,1,bitdepth,10"
"${monitor3},1920x1080@60,-2560x0,1,bitdepth,10"
];
# Configure Monitors # --- Workspaces ---
monitor=$monitor1,2560x1440@144,0x0,1,bitdepth,10 workspace = [
monitor=$monitor2,1920x1080@75,2560x0,1,bitdepth,10 "1,monitor:${monitor1},default:true"
monitor=HDMI-A-1,1920x1080@60,-2560x0,1,bitdepth,10 "2,monitor:${monitor1}"
"3,monitor:${monitor1}"
"4,monitor:${monitor1}"
"5,monitor:${monitor1}"
"6,monitor:${monitor2},default:true"
"7,monitor:${monitor2}"
"8,monitor:${monitor2}"
"9,monitor:${monitor2}"
"10,monitor:${monitor2}"
"11,monitor:${monitor3},default:true"
"12,monitor:${monitor3}"
];
# Workspaces # --- Exec Once ---
workspace=1,monitor:$monitor1,default:true exec-once = [
workspace=2,monitor:$monitor1 "waypaper --restore"
workspace=3,monitor:$monitor1 "gtkbar"
workspace=4,monitor:$monitor1 "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
workspace=5,monitor:$monitor1 "solaar -w hide"
workspace=6,monitor:$monitor2,default:true ];
workspace=7,monitor:$monitor2
workspace=8,monitor:$monitor2
workspace=9,monitor:$monitor2
workspace=10,monitor:$monitor2
workspace=11,monitor:$monitor3,default:true
workspace=12,monitor:$monitor3
# --- Variables ---
"$terminal" = "ghostty";
"$fileManager" = "thunar";
"$menu" = "gtkapps";
env = [
"XCURSOR_SIZE,24"
"QT_QPA_PLATFORMTHEME,qt5ct"
];
# Start Shit # --- Input ---
#exec-once = sh /home/jack/.config/waybar/launch-waybar.sh & waypaper --restore input = {
exec-once = waypaper --restore kb_layout = "us";
exec-once = gtkbar follow_mouse = 1;
exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP mouse_refocus = false;
exec-once=solaar -w hide touchpad = {
# Source a file (multi-file configs) natural_scroll = "no";
# source = ~/.config/hypr/myColors.conf };
accel_profile = "flat";
sensitivity = 0;
};
# Set programs that you use # --- General ---
$terminal = ghostty general = {
$fileManager = thunar gaps_in = 3;
#$menu = XDG_DATA_DIRS="/usr/share:/usr/local/share:/var/lib/flatpak/exports/share:/home/jack/.local/share/flatpak/exports/share" wofi --show drun gaps_out = "10,10,10,10";
$menu = gtkapps border_size = 2;
"col.active_border" = "rgba(e4687690)";
"col.inactive_border" = "rgba(2c2b3180)";
layout = "dwindle";
allow_tearing = false;
};
# Some default env vars. # --- Decoration ---
env = XCURSOR_SIZE,24 decoration = {
env = QT_QPA_PLATFORMTHEME,qt5ct # change to qt6ct if you have that rounding = 12;
blur = {
enabled = true;
new_optimizations = true;
size = 8;
passes = 2;
};
shadow = {
enabled = true;
range = 20;
render_power = 5;
color = "rgba(00000040)";
};
};
# For all categories, see https://wiki.hyprland.org/Configuring/Variables/ # --- Animations ---
input { animations = {
kb_layout = us enabled = false;
kb_variant = bezier = "myBezier, 0.05, 0.9, 0.1, 1";
kb_model = animation = [
kb_options = "windows, 1, 3, myBezier"
kb_rules = "windowsOut, 1, 7, default, popin 80%"
"border, 1, 10, default"
"borderangle, 1, 8, default"
"fade, 1, 7, default"
"workspaces, 1, 6, default"
];
};
follow_mouse = 1 dwindle = {
mouse_refocus = false pseudotile = "yes";
preserve_split = "yes";
};
touchpad { misc = {
natural_scroll = no force_default_wallpaper = 0;
} };
accel_profile = flat # --- Keybinds ---
bind = [
# System/Rice
"${mainMod}, grave, exec, rice-settings"
"${mainMod}, RETURN, exec, $terminal"
"${mainMod} SHIFT, RETURN, exec, [float] $terminal"
"${mainMod}, Q, killactive"
"${mainMod} SHIFT, M, exit"
"${mainMod}, E, exec, $fileManager"
"${mainMod} SHIFT, E, exec, [float] $fileManager"
"${mainMod}, W, exec, zen-browser"
"${mainMod}, TAB, togglefloating"
"${mainMod}, SPACE, exec, $menu"
"${mainMod}, P, pseudo"
"${mainMod}, V, togglesplit"
"${mainMod}, M, fullscreen, 1"
"${mainMod}, F, fullscreen, 0"
"${mainMod}, Escape, focuscurrentorlast"
"${mainMod} SHIFT, P, exec, killall ags || exec ags"
"${mainMod} SHIFT, S, exec, grimshot savecopy area"
"${mainMod}, HOME, exec, wofi-emoji"
sensitivity = 0 # -1.0 to 1.0, 0 means no modification. # Focus
} "${mainMod}, h, movefocus, l"
"${mainMod}, l, movefocus, r"
general { "${mainMod}, k, movefocus, u"
gaps_in = 3 "${mainMod}, j, movefocus, d"
gaps_out = 10,10,10,10
border_size = 2 # Move
col.active_border = rgba(e4687690) "${mainMod} SHIFT, h, movewindow, l"
col.inactive_border = rgba(2c2b3180) "${mainMod} SHIFT, l, movewindow, r"
"${mainMod} SHIFT, k, movewindow, u"
# Every other layout is bad "${mainMod} SHIFT, j, movewindow, d"
layout = dwindle
# Resize
# Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on (Why tf would you turn this on) "${mainMod} ALT, h, resizeactive, -160 0"
allow_tearing = false "${mainMod} ALT, l, resizeactive, 160 0"
} "${mainMod} ALT, k, resizeactive, 0 -160"
"${mainMod} ALT, j, resizeactive, 0 160"
decoration {
# See https://wiki.hyprland.org/Configuring/Variables/ for more # Workspaces
"${mainMod}, 1, workspace, 1"
rounding = 12 "${mainMod}, 2, workspace, 2"
"${mainMod}, 3, workspace, 3"
blur { "${mainMod}, 4, workspace, 4"
enabled = true "${mainMod}, 5, workspace, 5"
new_optimizations = true "${mainMod}, 6, workspace, 6"
size = 8 "${mainMod}, 7, workspace, 7"
passes = 2 "${mainMod}, 8, workspace, 8"
} "${mainMod}, 9, workspace, 9"
"${mainMod}, 0, workspace, 10"
shadow { "${mainMod} ALT, 1, workspace, 11"
enabled = true "${mainMod} ALT, 2, workspace, 12"
range = 20
render_power = 5 # Move to Workspace
color = rgba(00000040) "${mainMod} SHIFT, 1, movetoworkspace, 1"
} "${mainMod} SHIFT, 2, movetoworkspace, 2"
"${mainMod} SHIFT, 3, movetoworkspace, 3"
#layerrule = blur,notifications "${mainMod} SHIFT, 4, movetoworkspace, 4"
#layerrule = ignorezero,notifications "${mainMod} SHIFT, 5, movetoworkspace, 5"
#layerrule = blur,gtk4-layer-shell "${mainMod} SHIFT, 6, movetoworkspace, 6"
#layerrule = ignorealpha 0.3,gtk4-layer-shell "${mainMod} SHIFT, 7, movetoworkspace, 7"
#layerrule = blur,gtkapps "${mainMod} SHIFT, 8, movetoworkspace, 8"
} "${mainMod} SHIFT, 9, movetoworkspace, 9"
"${mainMod} SHIFT, 0, movetoworkspace, 10"
animations { "${mainMod} ALT SHIFT, 1, movetoworkspace, 11"
enabled = false "${mainMod} ALT SHIFT, 2, movetoworkspace, 12"
# Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more # Special
"${mainMod}, O, togglespecialworkspace, magic"
bezier = myBezier, 0.05, 0.9, 0.1, 1 "${mainMod} SHIFT, O, movetoworkspace, special:magic"
animation = windows, 1, 3, myBezier # Multimedia
animation = windowsOut, 1, 7, default, popin 80% ", XF86AudioPrev, exec, playerctl previous"
animation = border, 1, 10, default ", XF86AudioPlay, exec, playerctl play-pause"
animation = borderangle, 1, 8, default ", XF86AudioPause, exec, playerctl pause"
animation = fade, 1, 7, default ", XF86AudioNext, exec, playerctl next"
animation = workspaces, 1, 6, default
} # Custom scripts
"${mainMod}, b, exec, bash -c 'pgrep gtkbar &>/dev/null && killall gtkbar || gtkbar &'"
dwindle { "${mainMod}, minus, exec, ~/.config/hypr/togglemonitor.sh ${monitor3}"
# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more ];
pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
preserve_split = yes # you probably want this bindle = [
} ", XF86AudioRaiseVolume, exec, pamixer -i 2"
", XF86AudioLowerVolume, exec, pamixer -d 2"
# master { ];
# # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
# new_is_master = true bindl = [
# } ", XF86AudioMute, exec, pamixer -t"
", XF86AudioMicMute, exec, pamixer --default-source -t"
];
misc {
# See https://wiki.hyprland.org/Configuring/Variables/ for more bindm = [
force_default_wallpaper = 0 # Set to 0 or 1 to disable the anime mascot wallpapers "${mainMod}, mouse:272, movewindow"
} "${mainMod}, mouse:273, resizewindow"
];
# Example windowrule v1 # Mouse scroll workspaces
# windowrule = float, ^(kitty)$ bindn = [
# Example windowrule v2 "${mainMod}, mouse_down, workspace, e+1"
# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ "${mainMod}, mouse_up, workspace, e-1"
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more ];
#windowrule = suppressevent maximize, class:.* # You'll probably like this. };
#windowrule = float,class:^(pavucontrol)$ };
#windowrule = float,class:^(nwg-look)$
#windowrule = float,class:^(waypaper)$
#windowrule = float,class:^(openrgb)$
#windowrule = float,class:^(solaar)$
#windowrule = float,class:^(rice-settings)$
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
$mainMod = SUPER
# Rice Settings (Developed by me)
bind = SUPER, grave, exec, rice-settings
# Multimedia Keys
bindle = , XF86AudioRaiseVolume, exec, pamixer -i 2
bindle = , XF86AudioLowerVolume, exec, pamixer -d 2
bindl = , XF86AudioMute, exec, pamixer -t
bindl = , XF86AudioMicMute, exec, pamixer --default-source -t
bind = , XF86AudioPrev, exec, playerctl previous
bind = , XF86AudioPlay, exec, playerctl play-pause
bind = , XF86AudioPause, exec, playerctl pause
bind = , XF86AudioNext, exec, playerctl next
bind = $mainMod, RETURN, exec, $terminal
bind = $mainMod SHIFT, RETURN, exec, [float] $terminal
bind = $mainMod, Q, killactive,
bind = $mainMod SHIFT, M, exit,
bind = $mainMod, E, exec, $fileManager
bind = $mainMod SHIFT, E, exec, [float] $fileManager
bind = $mainMod, W, exec, zen-browser
bind = $mainMod, TAB, togglefloating,
bind = $mainMod, SPACE, exec, $menu
bind = $mainMod, P, pseudo, # dwindle
bind = $mainMod, V, togglesplit, # dwindle
bind = $mainMod, M, fullscreen, 1
bind = $mainMod, F, fullscreen, 0
# mouse_refocus = false work around since I need this set to false for zoom to work properly...
bind = $mainMod, Escape, focuscurrentorlast
# Hide Bar
bind = $mainMod SHIFT, P, exec, killall ags || exec ags
# screenshot
bind = $mainMod SHIFT, S, exec, grimshot savecopy area
# emojis
bind = $mainMod, HOME, exec, wofi-emoji
# Window focus
bind = SUPER, h, movefocus, l
bind = SUPER, l, movefocus, r
bind = SUPER, k, movefocus, u
bind = SUPER, j, movefocus, d
# Move window
bind = SUPER SHIFT, h, movewindow, l
bind = SUPER SHIFT, l, movewindow, r
bind = SUPER SHIFT, k, movewindow, u
bind = SUPER SHIFT, j, movewindow, d
# Resize window
bind = SUPER ALT, h, resizeactive, -160 0
bind = SUPER ALT, l, resizeactive, 160 0
bind = SUPER ALT, k, resizeactive, 0 -160
bind = SUPER ALT, j, resizeactive, 0 160
# Switch workspaces with mainMod + [0-9]
bind = $mainMod, 1, workspace, 1
bind = $mainMod, 2, workspace, 2
bind = $mainMod, 3, workspace, 3
bind = $mainMod, 4, workspace, 4
bind = $mainMod, 5, workspace, 5
bind = $mainMod, 6, workspace, 6
bind = $mainMod, 7, workspace, 7
bind = $mainMod, 8, workspace, 8
bind = $mainMod, 9, workspace, 9
bind = $mainMod, 0, workspace, 10
bind = $mainMod ALT, 1, workspace, 11
bind = $mainMod ALT, 2, workspace, 12
# Move active window to a workspace with mainMod + SHIFT + [0-9]
bind = $mainMod SHIFT, 1, movetoworkspace, 1
bind = $mainMod SHIFT, 2, movetoworkspace, 2
bind = $mainMod SHIFT, 3, movetoworkspace, 3
bind = $mainMod SHIFT, 4, movetoworkspace, 4
bind = $mainMod SHIFT, 5, movetoworkspace, 5
bind = $mainMod SHIFT, 6, movetoworkspace, 6
bind = $mainMod SHIFT, 7, movetoworkspace, 7
bind = $mainMod SHIFT, 8, movetoworkspace, 8
bind = $mainMod SHIFT, 9, movetoworkspace, 9
bind = $mainMod SHIFT, 0, movetoworkspace, 10
bind = $mainMod ALT SHIFT, 1, movetoworkspace, 11
bind = $mainMod ALT SHIFT, 2, movetoworkspace, 12
# Example special workspace (scratchpad)
bind = $mainMod, O, togglespecialworkspace, magic
bind = $mainMod SHIFT, O, movetoworkspace, special:magic
# Scroll through existing workspaces with mainMod + scroll
bind = $mainMod, mouse_down, workspace, e+1
bind = $mainMod, mouse_up, workspace, e-1
# Move/resize windows with mainMod + LMB/RMB and dragging
bindm = $mainMod, mouse:272, movewindow
bindm = $mainMod, mouse:273, resizewindow
# Toggle bar
bind = $mainMod,b,exec,bash -c 'pgrep gtkbar &>/dev/null && killall gtkbar || gtkbar &'
# Toggle extra monitor
bind = $mainMod, minus, exec, ~/.config/hypr/togglemonitor.sh $monitor3
'';
};
} }

View file

@ -0,0 +1,28 @@
{pkgs, ... }:
{
programs.neovim = {
enable = true;
extraPackages = with pkgs; [
# lua
lua-language-server
stylua
# javascript/typescript/react
nodejs_20
typescript
nodePackages.typescript-language-server
nodePackages.vscode-langservers-extracted
nodePackages.bash-language-server
nodePackages.prettier
nodePackages.eslint_d
nodePackages.eslint
# nix
nil
nixd
alejandra
nixfmt
# clang
clang-tools
];
};
}

View file

@ -10,7 +10,7 @@
# List packages installed in system profile. # List packages installed in system profile.
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
neovim # neovim
tree tree
vim # Both vim and neovim just in case vim # Both vim and neovim just in case
wget wget