mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'macbook-hyprland'

Browse Source
This commit is contained in:
mjallen18
2025-07-07 11:19:38 -05:00
parent 42db510b8f 2bf33d8743
commit 46adb33771
48 changed files with 714 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/apps/your-spotify/default.nix
View File

@@ -22,7 +22,7 @@ in
CLIENT_ENDPOINT = "https://your-spotify.mjallen.dev";
SPOTIFY_PUBLIC = "e270589d72a6494680a17d325af8670d";
SPOTIFY_SECRET = "423cb7b69fe8486e89eccd01e0c22924";
MONGO_ENDPOINT = "mongodb://10.0.1.18:27017";
MONGO_ENDPOINT = "mongodb://10.0.1.3:27017";
};
};

2
modules/desktop-environments/hyprland/config/btop/default.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, hyprlandSettings, ... }:
let
settings = import ../../settings.nix { inherit pkgs; };
in

42
modules/desktop-environments/hyprland/config/hypr/default.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, hyprlandSettings, ... }:
let
settings = import ../../settings.nix { inherit pkgs; };
drawer = "nwg-drawer -fm nautilus -term kitty -mb 10 -mt 10 -ml 10 -mr 10 -pbuseicontheme -i ${settings.iconTheme}";
@@ -35,16 +35,18 @@ in
bind = [
"$mod, Return, exec, ${settings.defaultApps.terminal.pname}"
"$mod, SPACE, exec, wofi --show drun"
", xf86Search, exec, wofi --show drun"
"$mod, Q, killactive, "
"$mod, M, exec, wlogout --protocol layer-shell"
"$mod, E, exec, nautilus"
"$mod, E, exec, ${settings.defaultApps.fileExplorer.pname}"
"$mod, V, togglefloating, "
"$mod, D, exec, ${drawer}"
"$mod, P, pseudo, " # dwindle
"$mod, S, togglesplit, " # dwindle
"$mod SHIFT, Q, exec, hyprlock"
"$mod SHIFT, 4, exec, hyprshot -m region --clipboard-only"
"$mod,F,exec,hyprctl dispatch fullscreen active"
"$mod, F, fullscreen, 1"
"$mod SHIFT, F, fullscreen, 0"
"$mod SHIFT, E, exec, smile"
"$mod, mouse:276, movecurrentworkspacetomonitor, ${settings.displayLeft.input}"
@@ -112,12 +114,20 @@ in
", XF86AudioPlay, exec, playerctl play-pause"
", XF86AudioPrev, exec, playerctl previous"
", XF86AudioNext, exec, playerctl next"
", XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
", XF86MonBrightnessUp, exec, brightnessctl set +5%"
", XF86MonBrightnessDown, exec, brightnessctl set 5%-"
"$mod, XF86MonBrightnessUp, exec, brightnessctl -d kbd_backlight set +10%"
"$mod, XF86MonBrightnessDown, exec, brightnessctl -d kbd_backlight set 10%-"
];
monitor = [
"${settings.displayLeft.input},${settings.displayLeft.resolution}@${settings.displayLeft.refreshRate},0x0,1,bitdepth,10,cm,hdr,sdrbrightness,1.2,sdrsaturation,0.98"
"${settings.displayRight.input},${settings.displayRight.resolution}@${settings.displayRight.refreshRate},3840x0,1,bitdepth,10,cm,hdr,sdrbrightness,1.5,sdrsaturation,0.98"
];
# monitor = [
# "${settings.displayLeft.input},${settings.displayLeft.resolution}@${settings.displayLeft.refreshRate},0x0,1.0,bitdepth,10,cm,hdr,sdrbrightness,1.2,sdrsaturation,0.98"
# ];
monitor = hyprlandSettings.monitor;
render = {
cm_fs_passthrough = 1;
@@ -183,11 +193,7 @@ in
force_default_wallpaper = 0;
};
workspace = [
"name:firefox, monitor:${settings.displayRight.input}, default:false, special, class:(.*firefox.*)"
"name:discord, monitor:${settings.displayRight.input}, default:true, special, title:(.*vesktop.*), title:(.*Apple Music.*)"
"name:steam, monitor:${settings.displayLeft.input}, default:false, special, class:(.*[Ss]team.*)"
];
workspace = hyprlandSettings.workspace;
windowrule = [
"float, title:(file_progress)"
@@ -255,11 +261,11 @@ in
"renderunfocused, tag:horizonrdp"
"idleinhibit, tag:horizonrdp"
"float, tag:horizonrdp"
"size 2160 7680, tag:horizonrdp"
# "size 2160 7680, tag:horizonrdp"
# "move onscreen 0 0, tag:horizonrdp"
# float the vmware window cause its annoying to use in fullscreen
"float, class:(.*[Vv][Mm]ware-view),title:([Vv][Mm]ware [Hh]orizon [Cc]lient)"
];
] ++ hyprlandSettings.windowRule;
input = {
kb_layout = "us";
@@ -274,7 +280,8 @@ in
follow_mouse = 1;
touchpad = {
natural_scroll = "no";
clickfinger_behavior = 1;
natural_scroll = "yes";
};
sensitivity = 0; # -1.0 - 1.0, 0 means no modification.
@@ -296,11 +303,6 @@ in
exec-once = xhost +SI:localuser:root
exec-once = nwg-look -a
exec-once = nwg-dock-hyprland -d
exec-once = nm-applet
exec-once = [silent] firefox
exec-once = [silent] vesktop
exec-once = [silent] chromium --app="https://music.apple.com"
exec-once = [silent] steam
'';
};
}

2
modules/desktop-environments/hyprland/config/kitty/default.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, hyprlandSettings, ... }:
let
settings = import ../../settings.nix { inherit pkgs; };
in

2
modules/desktop-environments/hyprland/config/mako/default.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, hyprlandSettings, ... }:
let
settings = import ../../settings.nix { inherit pkgs; };
in

2
modules/desktop-environments/hyprland/config/nwg-dock/default.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, hyprlandSettings, ... }:
let
settings = import ../../settings.nix { inherit pkgs; };
in

2
modules/desktop-environments/hyprland/config/nwg-drawer/default.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, hyprlandSettings, ... }:
let
settings = import ../../settings.nix { inherit pkgs; };
in

2
modules/desktop-environments/hyprland/config/nwg-panel/default.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, hyprlandSettings, ... }:
let
settings = import ../../settings.nix { inherit pkgs; };
in

107
modules/desktop-environments/hyprland/config/waybar/default.nix
View File

@@ -1,24 +1,33 @@
{ pkgs, ... }:
{ pkgs, hyprlandSettings, ... }:
let
settings = import ../../settings.nix { inherit pkgs; };
defaultOpacity = "opacity: 0.85;";
defaultBorderRadius = "border-radius: 1rem;";
defaultCenterOptions = ''
padding: 0.5rem 1rem;
margin: 5px 0;
padding-top: 0.5rem;
padding-bottom: 0.5rem;
padding-left: 0.5rem;
padding-right: 0.5rem;
margin: 3px 0;
'';
borderRight = ''
padding: 0.5rem 1rem;
margin: 5px 0;
padding-top: 0.5rem;
padding-bottom: 0.5rem;
padding-left: 0.5rem;
padding-right: 0.5rem;
margin: 3px 0;
border-radius: 0rem 1rem 1rem 0rem;
margin-right: 1rem;
margin-right: 0.5rem;
'';
borderLeft = ''
padding: 0.5rem 1rem;
margin: 5px 0;
padding-top: 0.5rem;
padding-bottom: 0.5rem;
padding-left: 0.5rem;
padding-right: 0.5rem;
margin: 3px 0;
border-radius: 1rem 0rem 0rem 1rem;
margin-left: 1rem;
margin-left: 0.5rem;
'';
in
{
@@ -34,7 +43,7 @@ in
systemd.enable = true;
settings = {
mainBar = {
layer = "bottom";
layer = "top";
position = "top";
mod = "dock";
exclusive = true;
@@ -47,20 +56,22 @@ in
modules-center = [ "hyprland/window" ];
modules-right = [
"tray"
"custom/lights"
"temperature"
"temperature#gpu"
"keyboard-state#capslock"
"keyboard-state#numlock"
"wireplumber#sink"
"wireplumber#source"
"bluetooth"
"idle_inhibitor"
"clock"
"custom/weather"
];
# modules-right = [
# "tray"
# "custom/lights"
# "temperature"
# "temperature#gpu"
# "keyboard-state#capslock"
# "keyboard-state#numlock"
# "wireplumber#sink"
# "wireplumber#source"
# "bluetooth"
# "idle_inhibitor"
# "clock"
# "custom/weather"
# ];
modules-right = hyprlandSettings.waybar.modules-right;
# Module Definitions
# Left
@@ -203,6 +214,19 @@ in
tooltip-format-connected = "{status}";
tooltip-format-enumerate-connected = { };
};
network = {
interface = "wlan0";
format = "{ifname}";
format-wifi = ""; # "{essid} ({signalStrength}%) ";
format-ethernet = "󰊗"; # "{ipaddr}/{cidr} 󰊗";
format-disconnected = "" ; # An empty format will hide the module.
tooltip-format = "{ifname} via {gwaddr} 󰊗";
tooltip-format-wifi = "{essid} ({signalStrength}%) ";
tooltip-format-ethernet = "{ifname} ";
tooltip-format-disconnected = "Disconnected";
max-length = 50;
};
idle_inhibitor = {
format = "{icon}";
@@ -226,6 +250,18 @@ in
};
};
battery = {
# bat = "macsmc-ac";
interval = 60;
states = {
warning = 30;
critical = 15;
};
format = "{capacity}% {icon}";
format-icons = ["" "" "" "" ""];
max-length = 25;
};
"custom/weather" = {
tooltip = true;
format = { };
@@ -301,8 +337,8 @@ in
${defaultOpacity}
${defaultBorderRadius}
${defaultCenterOptions}
margin-left: 6rem;
margin-right: 6rem;
margin-left: 4rem;
margin-right: 100rem;
}
#custom-weather {
@@ -312,6 +348,14 @@ in
${borderRight}
}
#battery {
color: ${settings.nord.aurora.nord15};
background-color: ${settings.nord.polarNight.nord0};
${defaultOpacity}
${defaultCenterOptions}
border-radius: 0;
}
#clock {
color: ${settings.nord.frost.nord9};
background-color: ${settings.nord.polarNight.nord0};
@@ -328,6 +372,14 @@ in
${borderRight}
}
#network {
color: ${settings.nord.aurora.nord15};
background-color: ${settings.nord.polarNight.nord0};
${defaultOpacity}
${borderRight}
padding-right: 15px;
}
#bluetooth {
color: ${settings.nord.frost.nord9};
background-color: ${settings.nord.polarNight.nord0};
@@ -380,8 +432,7 @@ in
color: ${settings.nord.frost.nord9};
background-color: ${settings.nord.polarNight.nord0};
${defaultOpacity}
${defaultCenterOptions}
border-radius: 0;
${borderLeft}
}
#custom-lights {

2
modules/desktop-environments/hyprland/config/wlogout/default.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, hyprlandSettings, ... }:
let
settings = import ../../settings.nix { inherit pkgs; };
in

2
modules/desktop-environments/hyprland/config/wofi/default.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, hyprlandSettings, ... }:
let
settings = import ../../settings.nix { inherit pkgs; };
in

10
modules/desktop-environments/hyprland/default.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, lib, ... }:
{ config, pkgs, lib, hyprlandSettings, ... }:
let
settings = import ./settings.nix { inherit pkgs; };
@@ -19,7 +19,9 @@ in
./environment.nix
];
home-manager.users."${settings.user}" = import ./home.nix;
environment.systemPackages = [ bing-wallpaper pkgs.jq ];
home-manager.users."${settings.user}" = (import ./home.nix {inherit lib pkgs hyprlandSettings;});
services = {
displayManager = {
@@ -152,8 +154,8 @@ in
xdg.portal = {
enable = true;
wlr.enable = false;
xdgOpenUsePortal = false;
wlr.enable = true;
xdgOpenUsePortal = true;
extraPortals = [
pkgs.xdg-desktop-portal-hyprland
pkgs.xdg-desktop-portal-gnome

3
modules/desktop-environments/hyprland/environment.nix
View File

@@ -1,6 +1,8 @@
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [
box64
brightnessctl
ddcutil
dunst
egl-wayland
@@ -24,6 +26,7 @@
hyprsysteminfo
kdePackages.qtmultimedia
libnotify
libz
mako
meson
nautilus

8
modules/desktop-environments/hyprland/home.nix
View File

@@ -1,16 +1,16 @@
{ lib, pkgs, ... }:
{ lib, pkgs, hyprlandSettings, ... }:
let
settings = import ./settings.nix { inherit pkgs; };
settings = import ./settings.nix { inherit pkgs hyprlandSettings; };
wallpaper = "/run/wallpaper.jpg";
in
{
imports = [
./config.nix
./config/btop
./config/hypr
(import ./config/hypr {inherit pkgs hyprlandSettings;})
./config/kitty
./config/mako
./config/waybar
(import ./config/waybar {inherit pkgs hyprlandSettings;})
./config/wofi
];

14
modules/desktop-environments/hyprland/settings.nix
View File

@@ -20,9 +20,9 @@ in
# Displays
displayLeft = {
input = "DP-1";
resolution = "3840x2160";
refreshRate = "240.00000";
input = "eDP-1";
resolution = "3456x2234"; # "3356x2160";
refreshRate = "60.00000";
};
displayRight = {
input = "DP-2";
@@ -81,6 +81,13 @@ in
catppuccin-sddm
colloid-gtk-theme
colloid-icon-theme
nemo
nemo-python
nemo-emblems
nemo-preview
nemo-seahorse
nemo-fileroller
nemo-qml-plugin-dbus
papirus-folders
sddm-astronaut
];
@@ -88,6 +95,7 @@ in
defaultApps = {
browser = pkgs.firefox;
editor = pkgs.micro;
fileExplorer = pkgs.nemo;
visual = pkgs.vscodium;
terminal = pkgs.kitty;
office = pkgs.onlyoffice-bin_latest;

1
modules/impermanence/default.nix
View File

@@ -7,6 +7,7 @@
hideMounts = true;
directories = [
"/var/lib/bluetooth"
"/var/lib/iwd"
"/var/lib/nixos"
"/var/lib/libvirt"
"/var/lib/waydroid"