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

View file

@ -1,74 +1,76 @@
{
config,
lib,
pkgs,
inputs,
...
config,
lib,
pkgs,
inputs,
...
}:
{
imports = [
./hardware-configuration.nix
inputs.home-manager.nixosModules.default
../../modules/nixos/gtkapps.nix
../../modules/nixos/gtkbar.nix
../../modules/nixos/fonts.nix
../../modules/nixos/system-packages.nix
../../modules/nixos/user-jack.nix
../../modules/nixos/sound.nix
../../modules/nixos/print.nix
];
imports = [
./hardware-configuration.nix
inputs.home-manager.nixosModules.default
../../modules/nixos/gtkapps.nix
../../modules/nixos/gtkbar.nix
../../modules/nixos/fonts.nix
../../modules/nixos/system-packages.nix
../../modules/nixos/user-jack.nix
../../modules/nixos/sound.nix
../../modules/nixos/print.nix
];
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.loader.systemd-boot.enable = 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.networkmanager.enable = true;
networking.hostName = "jackdesk";
networking.networkmanager.enable = true;
nix.settings.experimental-features = [
"nix-command"
"flakes"
];
nix.settings.experimental-features = [
"nix-command"
"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 = {
# enable = true;
# };
xdg.portal = {
enable = true;
wlr.enable = true;
extraPortals = with pkgs; [
xdg-desktop-portal-gtk
xdg-desktop-portal-hyprland
xdg-desktop-portal-gnome
];
};
home-manager = {
extraSpecialArgs = { inherit inputs; };
users = {
"jack" = import ./home.nix;
xdg.portal = {
enable = true;
wlr.enable = true;
extraPortals = with pkgs; [
xdg-desktop-portal-gtk
xdg-desktop-portal-hyprland
xdg-desktop-portal-gnome
];
};
};
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/homepackages.nix
../../modules/home-manager/shell-aliases.nix
../../modules/home-manager/neovimpackages.nix
];
programs.home-manager.enable = true;

View file

@ -1,44 +1,26 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [
pkgs.sway-contrib.grimshot
waypaper
hyprpaper
swaybg
gtk3
glib
zlib
home.packages = with pkgs; [
### Desktop Stuff
pkgs.sway-contrib.grimshot
waypaper
hyprpaper
swaybg
# Neovim plugin dependencies
deno
### Audio
playerctl
spotify
pavucontrol
# LSPs
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
### Chat apps
lunar-client
discord
zoom-us
lunar-client
discord
spotify
pavucontrol
zoom-us
];
# environment.variables = {
# WEBKIT_DISABLE_COMPOSITING_MODE = "1";
# };
### Random Libraries and Dependencies
gtk3
glib
zlib
deno
];
}

View file

@ -1,268 +1,223 @@
{ pkgs, ... }:
{
wayland.windowManager.hyprland = {
enable = true;
extraConfig = ''
wayland.windowManager.hyprland = {
enable = true;
$monitor1 = DP-1
$monitor2 = DP-2
$monitor3 = HDMI-A-1
settings =
let
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
monitor=$monitor1,2560x1440@144,0x0,1,bitdepth,10
monitor=$monitor2,1920x1080@75,2560x0,1,bitdepth,10
monitor=HDMI-A-1,1920x1080@60,-2560x0,1,bitdepth,10
# --- Workspaces ---
workspace = [
"1,monitor:${monitor1},default:true"
"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
workspace=1,monitor:$monitor1,default:true
workspace=2,monitor:$monitor1
workspace=3,monitor:$monitor1
workspace=4,monitor:$monitor1
workspace=5,monitor:$monitor1
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
# --- Exec Once ---
exec-once = [
"waypaper --restore"
"gtkbar"
"dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
"solaar -w hide"
];
# --- Variables ---
"$terminal" = "ghostty";
"$fileManager" = "thunar";
"$menu" = "gtkapps";
env = [
"XCURSOR_SIZE,24"
"QT_QPA_PLATFORMTHEME,qt5ct"
];
# Start Shit
#exec-once = sh /home/jack/.config/waybar/launch-waybar.sh & waypaper --restore
exec-once = waypaper --restore
exec-once = gtkbar
exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
exec-once=solaar -w hide
# Source a file (multi-file configs)
# source = ~/.config/hypr/myColors.conf
# --- Input ---
input = {
kb_layout = "us";
follow_mouse = 1;
mouse_refocus = false;
touchpad = {
natural_scroll = "no";
};
accel_profile = "flat";
sensitivity = 0;
};
# Set programs that you use
$terminal = ghostty
$fileManager = thunar
#$menu = XDG_DATA_DIRS="/usr/share:/usr/local/share:/var/lib/flatpak/exports/share:/home/jack/.local/share/flatpak/exports/share" wofi --show drun
$menu = gtkapps
# --- General ---
general = {
gaps_in = 3;
gaps_out = "10,10,10,10";
border_size = 2;
"col.active_border" = "rgba(e4687690)";
"col.inactive_border" = "rgba(2c2b3180)";
layout = "dwindle";
allow_tearing = false;
};
# Some default env vars.
env = XCURSOR_SIZE,24
env = QT_QPA_PLATFORMTHEME,qt5ct # change to qt6ct if you have that
# --- Decoration ---
decoration = {
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/
input {
kb_layout = us
kb_variant =
kb_model =
kb_options =
kb_rules =
# --- Animations ---
animations = {
enabled = false;
bezier = "myBezier, 0.05, 0.9, 0.1, 1";
animation = [
"windows, 1, 3, myBezier"
"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
mouse_refocus = false
dwindle = {
pseudotile = "yes";
preserve_split = "yes";
};
touchpad {
natural_scroll = no
}
misc = {
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.
}
general {
gaps_in = 3
gaps_out = 10,10,10,10
border_size = 2
col.active_border = rgba(e4687690)
col.inactive_border = rgba(2c2b3180)
# Every other layout is bad
layout = dwindle
# Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on (Why tf would you turn this on)
allow_tearing = false
}
decoration {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
rounding = 12
blur {
enabled = true
new_optimizations = true
size = 8
passes = 2
}
shadow {
enabled = true
range = 20
render_power = 5
color = rgba(00000040)
}
#layerrule = blur,notifications
#layerrule = ignorezero,notifications
#layerrule = blur,gtk4-layer-shell
#layerrule = ignorealpha 0.3,gtk4-layer-shell
#layerrule = blur,gtkapps
}
animations {
enabled = false
# Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
bezier = myBezier, 0.05, 0.9, 0.1, 1
animation = windows, 1, 3, myBezier
animation = windowsOut, 1, 7, default, popin 80%
animation = border, 1, 10, default
animation = borderangle, 1, 8, default
animation = fade, 1, 7, default
animation = workspaces, 1, 6, default
}
dwindle {
# 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
}
# master {
# # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
# new_is_master = true
# }
misc {
# See https://wiki.hyprland.org/Configuring/Variables/ for more
force_default_wallpaper = 0 # Set to 0 or 1 to disable the anime mascot wallpapers
}
# Example windowrule v1
# windowrule = float, ^(kitty)$
# Example windowrule v2
# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
# 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
'';
};
# Focus
"${mainMod}, h, movefocus, l"
"${mainMod}, l, movefocus, r"
"${mainMod}, k, movefocus, u"
"${mainMod}, j, movefocus, d"
# Move
"${mainMod} SHIFT, h, movewindow, l"
"${mainMod} SHIFT, l, movewindow, r"
"${mainMod} SHIFT, k, movewindow, u"
"${mainMod} SHIFT, j, movewindow, d"
# Resize
"${mainMod} ALT, h, resizeactive, -160 0"
"${mainMod} ALT, l, resizeactive, 160 0"
"${mainMod} ALT, k, resizeactive, 0 -160"
"${mainMod} ALT, j, resizeactive, 0 160"
# Workspaces
"${mainMod}, 1, workspace, 1"
"${mainMod}, 2, workspace, 2"
"${mainMod}, 3, workspace, 3"
"${mainMod}, 4, workspace, 4"
"${mainMod}, 5, workspace, 5"
"${mainMod}, 6, workspace, 6"
"${mainMod}, 7, workspace, 7"
"${mainMod}, 8, workspace, 8"
"${mainMod}, 9, workspace, 9"
"${mainMod}, 0, workspace, 10"
"${mainMod} ALT, 1, workspace, 11"
"${mainMod} ALT, 2, workspace, 12"
# Move to Workspace
"${mainMod} SHIFT, 1, movetoworkspace, 1"
"${mainMod} SHIFT, 2, movetoworkspace, 2"
"${mainMod} SHIFT, 3, movetoworkspace, 3"
"${mainMod} SHIFT, 4, movetoworkspace, 4"
"${mainMod} SHIFT, 5, movetoworkspace, 5"
"${mainMod} SHIFT, 6, movetoworkspace, 6"
"${mainMod} SHIFT, 7, movetoworkspace, 7"
"${mainMod} SHIFT, 8, movetoworkspace, 8"
"${mainMod} SHIFT, 9, movetoworkspace, 9"
"${mainMod} SHIFT, 0, movetoworkspace, 10"
"${mainMod} ALT SHIFT, 1, movetoworkspace, 11"
"${mainMod} ALT SHIFT, 2, movetoworkspace, 12"
# Special
"${mainMod}, O, togglespecialworkspace, magic"
"${mainMod} SHIFT, O, movetoworkspace, special:magic"
# Multimedia
", XF86AudioPrev, exec, playerctl previous"
", XF86AudioPlay, exec, playerctl play-pause"
", XF86AudioPause, exec, playerctl pause"
", XF86AudioNext, exec, playerctl next"
# Custom scripts
"${mainMod}, b, exec, bash -c 'pgrep gtkbar &>/dev/null && killall gtkbar || gtkbar &'"
"${mainMod}, minus, exec, ~/.config/hypr/togglemonitor.sh ${monitor3}"
];
bindle = [
", XF86AudioRaiseVolume, exec, pamixer -i 2"
", XF86AudioLowerVolume, exec, pamixer -d 2"
];
bindl = [
", XF86AudioMute, exec, pamixer -t"
", XF86AudioMicMute, exec, pamixer --default-source -t"
];
bindm = [
"${mainMod}, mouse:272, movewindow"
"${mainMod}, mouse:273, resizewindow"
];
# Mouse scroll workspaces
bindn = [
"${mainMod}, mouse_down, workspace, e+1"
"${mainMod}, mouse_up, workspace, e-1"
];
};
};
}

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.
environment.systemPackages = with pkgs; [
neovim
# neovim
tree
vim # Both vim and neovim just in case
wget