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

fix some hyprland stuff

Browse Source
This commit is contained in:
mjallen18
2025-07-23 11:57:44 -05:00
parent 1bc7856d93
commit fa2d95e12f
48 changed files with 307 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/home/desktop/hyprland/default.nix
View File

@@ -145,7 +145,7 @@ in
"$mod, XF86MonBrightnessDown, exec, brightnessctl -d kbd_backlight set 10%-"
];
monitor = cfg.monitor or [ ];
monitor = cfg.monitor;
monitorv2 = cfg.monitorv2 or { };
render = {

6
modules/home/desktop/hyprland/options.nix
View File

@@ -20,7 +20,7 @@ with lib;
default = "3840x2160";
};
refreshRate = mkOptions {
refreshRate = mkOption {
type = types.str;
default = "240.00000";
};
@@ -37,7 +37,7 @@ with lib;
default = "3840x2160";
};
refreshRate = mkOptions {
refreshRate = mkOption {
type = types.str;
default = "240.00000";
};
@@ -99,7 +99,7 @@ with lib;
terminal = mkOption { type = types.package; default = pkgs.kitty; };
office = mkOption { type = types.package; default = pkgs.onlyoffice-bin_latest; };
video = mkOption { type = types.package; default = pkgs.vlc; };
imageViewer = mkOption { type = types.package; default = pkgs.gnome-photos; };
imageViewer = mkOption { type = types.package; default = pkgs.nomacs; };
};
};
description = "Default applications used across the system.";

1
modules/home/desktop/hyprland/packages.nix
View File

@@ -37,6 +37,7 @@ in
nautilus
networkmanagerapplet
nm-tray
nomacs
nwg-look
overskride
pamixer

4
modules/home/desktop/hyprland/services/hypridle/default.nix
View File

@@ -7,7 +7,7 @@ in
config = lib.mkIf cfg.enable {
services.hypridle = {
enable = true;
enable = false;
settings = {
general = {
before_sleep_cmd = "loginctl lock-session"; # lock before suspend.
@@ -38,4 +38,4 @@ in
};
};
};
}
}

2
modules/home/desktop/hyprland/services/hyprpaper/default.nix
View File

@@ -10,7 +10,7 @@ in
enable = true;
settings = {
preload = [ "/run/wallpaper.jpg" ];
wallpaper = "/run/wallpaper.jpg";
wallpaper = ",/run/wallpaper.jpg";
splash = false;
};
};

4
modules/home/home/default.nix
View File

@@ -103,5 +103,9 @@
services = {
nextcloud-client.enable = lib.mkDefault true;
pass-secret-service.enable = lib.mkDefault true;
kdeconnect = {
enable = true;
indicator = true;
};
};
}

4
modules/home/programs/waybar/default.nix
View File

@@ -371,8 +371,8 @@ in
${defaultOpacity}
${defaultBorderRadius}
${defaultCenterOptions}
margin-left: 4rem
margin-right: 4rem
margin-left: 4rem;
margin-right: 4rem;
}
/* make window module transparent when no windows present */

2
modules/nixos/desktop/hyprland/default.nix
View File

@@ -109,7 +109,7 @@ in
];
script = ''
bing-wallpaper
${pkgs.hyprland}/bin/hyprctl hyprpaper reload ,/run/wallpaper
${pkgs.hyprland}/bin/hyprctl hyprpaper reload ,/run/wallpaper.jpg
'';
serviceConfig = {
Type = "oneshot";

2
modules/nixos/desktop/hyprland/settings.nix
View File

@@ -101,7 +101,7 @@ in
terminal = pkgs.kitty;
office = pkgs.onlyoffice-bin_latest;
video = pkgs.vlc;
imageViewer = pkgs.gnome-photos;
imageViewer = pkgs.nomacs;
};
theme = nord;

145
modules/nixos/network/default.nix
View File

@@ -40,81 +40,90 @@ in
networking = {
hostName = lib.mkForce cfg.hostName;
# Enable Network Manager
networkmanager = {
enable = true;
wifi.powersave = lib.mkDefault false;
settings.connectivity.uri = lib.mkDefault "http://nmcheck.gnome.org/check_network_status.txt";
ensureProfiles = {
environmentFiles = [
config.sops.secrets.wifi.path
];
# Enable Network Manager
networkmanager = {
enable = true;
wifi.powersave = lib.mkDefault false;
settings.connectivity.uri = lib.mkDefault "http://nmcheck.gnome.org/check_network_status.txt";
ensureProfiles = {
environmentFiles = [
config.sops.secrets.wifi.path
];
profiles = {
"Joey's Jungle 6G" = {
connection = {
id = "Joey's Jungle 6G";
type = "wifi";
profiles = {
"Joey's Jungle 6G" = {
connection = {
id = "Joey's Jungle 6G";
type = "wifi";
};
ipv4 = if (cfg.ipv4.method == "auto")
then
{
method = "auto";
}
else
{
address1 = cfg.ipv4.address;
dns = cfg.ipv4.dns;
gateway = cfg.ipv4.gateway;
method = "manual";
};
ipv6 = {
addr-gen-mode = "stable-privacy";
method = "auto";
};
wifi = {
mode = "infrastructure";
ssid = "Joey's Jungle 6G";
};
wifi-security = {
key-mgmt = "sae";
psk = "$PSK";
};
};
ipv4 = if (cfg.ipv4.method == "auto")
then
{
method = "auto";
}
else
{
address1 = cfg.ipv4.address;
dns = cfg.ipv4.dns;
gateway = cfg.ipv4.gateway;
method = "manual";
};
ipv6 = {
addr-gen-mode = "stable-privacy";
method = "auto";
};
wifi = {
mode = "infrastructure";
ssid = "Joey's Jungle 6G";
};
wifi-security = {
key-mgmt = "sae";
psk = "$PSK";
};
};
"Joey's Jungle 5G" = {
connection = {
id = "Joey's Jungle 5G";
type = "wifi";
};
ipv4 = if (cfg.ipv4.method == "auto")
then
{
method = "auto";
}
else
{
address1 = cfg.ipv4.address;
dns = cfg.ipv4.dns;
gateway = cfg.ipv4.gateway;
method = "manual";
};
ipv6 = {
addr-gen-mode = "stable-privacy";
method = "auto";
};
wifi = {
mode = "infrastructure";
ssid = "Joey's Jungle 5G";
};
wifi-security = {
key-mgmt = "sae";
psk = "$PSK";
"Joey's Jungle 5G" = {
connection = {
id = "Joey's Jungle 5G";
type = "wifi";
};
ipv4 = if (cfg.ipv4.method == "auto")
then
{
method = "auto";
}
else
{
address1 = cfg.ipv4.address;
dns = cfg.ipv4.dns;
gateway = cfg.ipv4.gateway;
method = "manual";
};
ipv6 = {
addr-gen-mode = "stable-privacy";
method = "auto";
};
wifi = {
mode = "infrastructure";
ssid = "Joey's Jungle 5G";
};
wifi-security = {
key-mgmt = "sae";
psk = "$PSK";
};
};
};
};
};
};
firewall = {
allowedTCPPortRanges = [
{
from = 1714;
to = 1764;
}
];
allowedUDPPortRanges = config.networking.firewall.allowedTCPPortRanges;
};
};
};
}