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

stuff for sure

Browse Source
This commit is contained in:
mjallen18
2024-08-20 11:32:56 -05:00
parent 1bf2b400c7
commit 0b408700c3
19 changed files with 337 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
flake.lock generated
View File

@@ -89,11 +89,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1723685697, "lastModified": 1723813484,
"narHash": "sha256-Fp0MmV8FWrWFzYkLzPhkrc7Lj3NhMThCceDiETqEp9k=", "narHash": "sha256-nL9jkzzkArUr4XRqIohBlgAkQKfLsq9nzYrd/Dh+IRo=",
"owner": "lilyinstarlight", "owner": "lilyinstarlight",
"repo": "nixos-cosmic", "repo": "nixos-cosmic",
"rev": "4e1950ec1b6ff25a0f20ff590bf22a3065b62022", "rev": "7d3dd56cca20e409261ff8c69867d38376f7ecae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -735,11 +735,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1723556749, "lastModified": 1723688146,
"narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=", "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4a92571f9207810b559c9eac203d1f4d79830073", "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -799,11 +799,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1723362943, "lastModified": 1723637854,
"narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=", "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a58bc8ad779655e790115244571758e8de055e3d", "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1057,11 +1057,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723602049, "lastModified": 1723688259,
"narHash": "sha256-Z/noCSn9WPkv7O77dWKLcBxe4Ub4bWyNzsL5JhjaQfw=", "narHash": "sha256-WzeUR1MG9MnJnh9T7qcVe/v12qHvJvzdc3Z5HCeE2ns=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "ea0bf33a11a26a62c60123c49d96011da396602c", "rev": "6e75319846684326d900daff1e2e11338cc80d2b",
"type": "github" "type": "github"
}, },
"original": { "original": {

23
hosts/desktop/boot.nix
View File

@@ -1,17 +1,15 @@
{ { lib, pkgs, ... }:
config, let
lib, configLimit = 5;
outputs, default = "@saved";
pkgs, kernel = pkgs.linuxPackages_latest;
... in
}:
{ {
# Configure bootloader with lanzaboot and secureboot # Configure bootloader with lanzaboot and secureboot
boot = { boot = {
loader = { loader = {
systemd-boot = { systemd-boot = {
enable = false; enable = lib.mkForce false;
configurationLimit = 2;
}; };
efi = { efi = {
@@ -24,14 +22,13 @@
enable = true; enable = true;
pkiBundle = "/etc/secureboot"; pkiBundle = "/etc/secureboot";
settings = { settings = {
default = "@saved"; default = default;
console-mode = "max"; console-mode = "max";
}; };
configurationLimit = 5; configurationLimit = configLimit;
}; };
# Override kernel to latest kernelPackages = kernel;
kernelPackages = pkgs.linuxPackages_latest;
kernelParams = [ kernelParams = [
"quiet" "quiet"

60
hosts/desktop/configuration.nix
View File

@@ -4,7 +4,7 @@
{ {
config, config,
outputs, # outputs,
lib, lib,
pkgs, pkgs,
... ...
@@ -35,28 +35,15 @@ in
./filesystems.nix ./filesystems.nix
./sops.nix ./sops.nix
../default.nix ../default.nix
# specialisations
./cosmic
./hyprland ./hyprland
./gnome ./gnome
]; ];
specialisation = { apps.discover-wrapped.enable = lib.mkDefault false;
cosmic.configuration = { nix.settings.trusted-users = lib.mkDefault [ "root" user ];
services = {
desktopManager.cosmic.enable = true;
displayManager.cosmic-greeter.enable = true;
# disable plasma
displayManager.sddm.enable = false;
desktopManager.plasma6.enable = false;
};
};
};
apps.discover-wrapped.enable = false;
nix.settings.trusted-users = [ "root" "matt" ];
services = { services = {
# Enable Desktop Environment. # Enable Desktop Environment.
@@ -76,8 +63,8 @@ in
# xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ]; # xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];
share.hardware.amd = { share.hardware.amd = {
enable = true; enable = lib.mkDefault true;
lact.enable = true; lact.enable = lib.mkDefault true;
}; };
share.gaming.enable = true; share.gaming.enable = true;
@@ -86,14 +73,14 @@ in
services = { services = {
# Enable the X11 windowing system. # Enable the X11 windowing system.
xserver = { xserver = {
enable = true; enable = lib.mkDefault true;
}; };
# enable auto discovery of printers # enable auto discovery of printers
avahi = { avahi = {
enable = true; enable = lib.mkDefault true;
nssmdns4 = true; nssmdns4 = lib.mkDefault true;
openFirewall = true; openFirewall = lib.mkDefault true;
}; };
borgbackup.jobs.home-matt = { borgbackup.jobs.home-matt = {
@@ -111,8 +98,8 @@ in
}; };
btrfs = { btrfs = {
autoScrub.enable = true; autoScrub.enable = lib.mkDefault true;
autoScrub.fileSystems = [ autoScrub.fileSystems = lib.mkDefault [
"/nix" "/nix"
"/root" "/root"
"/etc" "/etc"
@@ -121,12 +108,13 @@ in
]; ];
}; };
ratbagd.enable = true; ratbagd.enable = lib.mkDefault true;
}; };
systemd = { systemd = {
services = { services = {
fix-wifi = { fix-wifi = {
enable = lib.mkDefault true;
path = [ path = [
pkgs.bash pkgs.bash
pkgs.networkmanager pkgs.networkmanager
@@ -143,6 +131,7 @@ in
user.services = { user.services = {
rclone-home-proton = { rclone-home-proton = {
enable = lib.mkDefault true;
path = [ pkgs.bash pkgs.rclone ]; path = [ pkgs.bash pkgs.rclone ];
script = '' script = ''
rclone sync /home/matt proton-drive:backup-nix --exclude '/home/matt/Games/**' --exclude '/home/matt/1TB/**' --exclude '/home/matt/Downloads/**' rclone sync /home/matt proton-drive:backup-nix --exclude '/home/matt/Games/**' --exclude '/home/matt/1TB/**' --exclude '/home/matt/Downloads/**'
@@ -150,6 +139,7 @@ in
}; };
rsync-home = { rsync-home = {
enable = lib.mkDefault true;
path = [ pkgs.bash pkgs.rsync pkgs.openssh ]; path = [ pkgs.bash pkgs.rsync pkgs.openssh ];
script = '' script = ''
rsync -rtpogvPlHzs --ignore-existing --exclude={'/home/matt/Games', '/home/matt/1TB', '/home/matt/Downloads/*', '/home/matt/.cache'} -e ssh /home/matt admin@10.0.1.18:/media/nas/main/backup/desktop-nix/home rsync -rtpogvPlHzs --ignore-existing --exclude={'/home/matt/Games', '/home/matt/1TB', '/home/matt/Downloads/*', '/home/matt/.cache'} -e ssh /home/matt admin@10.0.1.18:/media/nas/main/backup/desktop-nix/home
@@ -163,19 +153,19 @@ in
hostName = hostname; hostName = hostname;
# Enable Network Manager # Enable Network Manager
networkmanager.enable = true; networkmanager.enable = lib.mkDefault true;
networkmanager.wifi.powersave = false; networkmanager.wifi.powersave = lib.mkDefault false;
networkmanager.settings.connectivity.uri = "http://nmcheck.gnome.org/check_network_status.txt"; networkmanager.settings.connectivity.uri = lib.mkDefault "http://nmcheck.gnome.org/check_network_status.txt";
}; };
# Time config # Time config
time = { time = {
hardwareClockInLocalTime = false; hardwareClockInLocalTime = lib.mkDefault false;
}; };
virtualisation.libvirtd.enable = true; virtualisation.libvirtd.enable = lib.mkDefault true;
programs.gamemode.enable = true; programs.gamemode.enable = lib.mkDefault true;
# Configure environment # Configure environment
environment = { environment = {
@@ -217,7 +207,7 @@ in
wineWowPackages.waylandFull wineWowPackages.waylandFull
]; ];
sessionVariables = { sessionVariables = lib.mkDefault {
STEAM_FORCE_DESKTOPUI_SCALING = "1"; STEAM_FORCE_DESKTOPUI_SCALING = "1";
}; };
@@ -230,7 +220,7 @@ in
# Define a user account. Don't forget to set a password with ‘passwd’. # Define a user account. Don't forget to set a password with ‘passwd’.
users.users."${user}" = { users.users."${user}" = {
isNormalUser = true; isNormalUser = lib.mkDefault true;
extraGroups = [ extraGroups = [
"wheel" "wheel"
"networkmanager" "networkmanager"

13
hosts/desktop/cosmic/default.nix Normal file
View File

@@ -0,0 +1,13 @@
{ pkgs, ... }:
{
specialisation.cosmic.configuration = {
services = {
desktopManager.cosmic.enable = true;
displayManager.cosmic-greeter.enable = true;
# disable plasma
displayManager.sddm.enable = false;
desktopManager.plasma6.enable = false;
};
};
}

8
hosts/desktop/home.nix
View File

@@ -2,11 +2,11 @@
let let
shellAliases = { shellAliases = {
ll = "ls -alh"; ll = "ls -alh";
update = "sudo nixos-rebuild switch --max-jobs 10"; update-boot = "sudo nixos-rebuild boot --max-jobs 10 --build-host admin@10.0.1.18";
update-switch = "sudo nixos-rebuild switch --max-jobs 10 --build-host admin@10.0.1.18";
update-flake = "sudo nix flake update ~/nix-config"; update-flake = "sudo nix flake update ~/nix-config";
update-specialisation = "sudo nixos-rebuild switch --specialisation --max-jobs 10"; update-nas = "nixos-rebuild switch --use-remote-sudo --target-host admin@10.0.1.18 --build-host admin@10.0.1.18 --flake ~/nix-config#jallen-nas";
nas-update = "nixos-rebuild switch --use-remote-sudo --target-host admin@10.0.1.18 --build-host localhost --flake ~/nix-config#jallen-nas"; nas-ssh = "kitten ssh admin@10.0.1.18";
nas-ssh = "ssh admin@10.0.1.18";
}; };
gitAliases = { gitAliases = {

2
hosts/desktop/hyprland/config/btop/default.nix
View File

@@ -2,7 +2,7 @@
programs.btop = { programs.btop = {
enable = true; enable = true;
settings = { settings = {
color_theme = "~/.config/btop/themes/catppuccin_macchiato.theme"; color_theme = "/home/matt/.config/btop/themes/catppuccin_macchiato.theme";
theme_background = true; theme_background = true;
truecolor = true; truecolor = true;
force_tty = false; force_tty = false;

156
hosts/desktop/hyprland/config/hypr/default.nix
View File

@@ -5,7 +5,13 @@
systemd.enable = true; systemd.enable = true;
settings = { settings = {
"$mainMod" = "SUPER"; "$mod" = "SUPER";
# Mouse
# mouse_[up|down] - scroll wheel
# middle_mouse - 274
# thumb_up - 276
# thumb_down - 275
# l -> locked, will also work when an input inhibitor (e.g. a lockscreen) is active. # l -> locked, will also work when an input inhibitor (e.g. a lockscreen) is active.
# r -> release, will trigger on release of a key. # r -> release, will trigger on release of a key.
@@ -18,66 +24,71 @@
# d -> has description, will allow you to write a description for your bind. # d -> has description, will allow you to write a description for your bind.
# p -> bypasses the app's requests to inhibit keybinds. # p -> bypasses the app's requests to inhibit keybinds.
# https://wiki.hyprland.org/Configuring/Binds/
# https://wiki.hyprland.org/Configuring/Binds/#mouse-buttons
bind = [ bind = [
"$mainMod, Return, exec, kitty" "$mod, Return, exec, kitty"
"$mainMod, Q, killactive, " "$mod, Q, killactive, "
"$mainMod, M, exec, wlogout --protocol layer-shell" "$mod, mouse:274, killactive, "
"$mainMod, E, exec, nautilus" "$mod, M, exec, wlogout --protocol layer-shell"
"$mainMod, V, togglefloating, " "$mod, E, exec, nautilus"
"$mainMod, D, exec, wofi --show drun" "$mod, V, togglefloating, "
"$mainMod, P, pseudo, "# dwindle "$mod, D, exec, wofi --show drun"
"$mainMod, S, togglesplit, "# dwindle "$mod, P, pseudo, "# dwindle
"$mainMod SHIFT, Q, exec, hyprlock" "$mod, S, togglesplit, "# dwindle
"$mod SHIFT, Q, exec, hyprlock"
", PRINT, exec, hyprshot -m region --clipboard-only" ", PRINT, exec, hyprshot -m region --clipboard-only"
"$mod,F,exec,hyprctl dispatch fullscreen active"
# alt-tab between workspaces on active monitor # alt-tab between workspaces on active monitor
"ALT, Tab, workspace, m+1" "ALT, Tab, workspace, m+1"
"ALT SHIFT, Tab, workspace, m-1" "ALT SHIFT, Tab, workspace, m-1"
"$mainMod, h, movefocus, l" "$mod, h, movefocus, l"
"$mainMod, l, movefocus, r" "$mod, l, movefocus, r"
"$mainMod, k, movefocus, u" "$mod, k, movefocus, u"
"$mainMod, j, movefocus, d" "$mod, j, movefocus, d"
"$mainMod, 1, workspace, 1" "$mod, 1, workspace, 1"
"$mainMod, 2, workspace, 2" "$mod, 2, workspace, 2"
"$mainMod, 3, workspace, 3" "$mod, 3, workspace, 3"
"$mainMod, 4, workspace, 4" "$mod, 4, workspace, 4"
"$mainMod, 5, workspace, 5" "$mod, 5, workspace, 5"
"$mainMod, 6, workspace, 6" "$mod, 6, workspace, 6"
"$mainMod, 7, workspace, 7" "$mod, 7, workspace, 7"
"$mainMod, 8, workspace, 8" "$mod, 8, workspace, 8"
"$mainMod, 9, workspace, 9" "$mod, 9, workspace, 9"
"$mainMod, 0, workspace, 10" "$mod, 0, workspace, 10"
"$mainMod SHIFT, 1, movetoworkspace, 1" "$mod SHIFT, 1, movetoworkspace, 1"
"$mainMod SHIFT, 2, movetoworkspace, 2" "$mod SHIFT, 2, movetoworkspace, 2"
"$mainMod SHIFT, 3, movetoworkspace, 3" "$mod SHIFT, 3, movetoworkspace, 3"
"$mainMod SHIFT, 4, movetoworkspace, 4" "$mod SHIFT, 4, movetoworkspace, 4"
"$mainMod SHIFT, 5, movetoworkspace, 5" "$mod SHIFT, 5, movetoworkspace, 5"
"$mainMod SHIFT, 6, movetoworkspace, 6" "$mod SHIFT, 6, movetoworkspace, 6"
"$mainMod SHIFT, 7, movetoworkspace, 7" "$mod SHIFT, 7, movetoworkspace, 7"
"$mainMod SHIFT, 8, movetoworkspace, 8" "$mod SHIFT, 8, movetoworkspace, 8"
"$mainMod SHIFT, 9, movetoworkspace, 9" "$mod SHIFT, 9, movetoworkspace, 9"
"$mainMod SHIFT, 0, movetoworkspace, 10" "$mod SHIFT, 0, movetoworkspace, discord"
"$mainMod CTRL, l, resizeactive, 10 0" "$mod CTRL, l, resizeactive, 10 0"
"$mainMod CTRL, h, resizeactive, -10 0" "$mod CTRL, h, resizeactive, -10 0"
"$mainMod CTRL, k, resizeactive, 0 -10" "$mod CTRL, k, resizeactive, 0 -10"
"$mainMod CTRL, j, resizeactive, 0 10" "$mod CTRL, j, resizeactive, 0 10"
"$mainMod SHIFT, l, movewindow, r" "$mod SHIFT, l, movewindow, r"
"$mainMod SHIFT, h, movewindow, l" "$mod SHIFT, h, movewindow, l"
"$mainMod SHIFT, k, movewindow, u" "$mod SHIFT, k, movewindow, u"
"$mainMod SHIFT, j, movewindow, d" "$mod SHIFT, j, movewindow, d"
"$mainMod, b, exec, firefox" "$mod, b, exec, firefox"
]; ];
bindm = [ bindm = [
# Move/resize windows with mainMod + LMB/RMB and dragging # Move/resize windows with mod + LMB/RMB and dragging
"$mainMod, mouse:272, movewindow" "$mod, mouse:272, movewindow"
"$mainMod, mouse:273, resizewindow" "$mod, mouse:273, resizewindow"
]; ];
bindel =[ bindel =[
@@ -104,7 +115,7 @@
"col.active_border" = "rgb(8aadf4) rgb(24273A) rgb(24273A) rgb(8aadf4) 45deg"; "col.active_border" = "rgb(8aadf4) rgb(24273A) rgb(24273A) rgb(8aadf4) 45deg";
"col.inactive_border" = "rgb(24273A) rgb(24273A) rgb(24273A) rgb(24273A) 45deg"; "col.inactive_border" = "rgb(24273A) rgb(24273A) rgb(24273A) rgb(24273A) 45deg";
layout = "dwindle"; layout = "dwindle";
allow_tearing = false; allow_tearing = true;
}; };
decoration = { decoration = {
@@ -153,6 +164,11 @@
force_default_wallpaper = 0; force_default_wallpaper = 0;
}; };
workspace = [
"name: discord, monitor:DP-2, default:true"
"name: steam, monitor:DP-2, default:false"
];
windowrule = [ windowrule = [
"float, file_progress" "float, file_progress"
"float, confirm" "float, confirm"
@@ -164,28 +180,53 @@
"float, confirmreset" "float, confirmreset"
"float, title:Open File" "float, title:Open File"
"float, title:branchdialog" "float, title:branchdialog"
"float,viewnior"
"float, pavucontrol-qt"
"float, pavucontrol" "float, pavucontrol"
"move onscreen cursor 0% 0%, pavucontrol"
"float, file-roller" "float, file-roller"
"fullscreen, wlogout" "fullscreen, wlogout"
"float, title:wlogout" "float, title:wlogout"
"fullscreen, title:wlogout" "fullscreen, title:wlogout"
"idleinhibit stayfocused, mpv" "idleinhibit stayfocused, mpv"
]; "fullscreen, title:BBar"
"fullscreen, title:Remote Desktop Connection"
"norounding, class:Remote Desktop Connection"
"noshadow, class:Remote Desktop Connection"
"immediate, class:Remote Desktop Connection"
"syncfullscreen, class:Remote Desktop Connection"
"allowsinput, class:Remote Desktop Connection"
"noanim, class:Remote Desktop Connection"
"noblur, class:Remote Desktop Connection"
"noborder, class:Remote Desktop Connection"
"nodim, class:Remote Desktop Connection"
"nomaxsize, class:Remote Desktop Connection"
"minsize 3840 2160, class:Remote Desktop Connection"
];
windowrulev2 = [ windowrulev2 = [
"float, class:Vmware-view,title:VMware Horizon Client"
"size 3840 2160, class:Remote Desktop Connection"
# "float, class:Remote Desktop Connection,title:BBar"
# "float, class:Remote Desktop Connection,title:Remote Desktop Connection"
"float, class:Credential Manager UI Host,title:Windows Security"
"float, title:^(Media viewer)$" "float, title:^(Media viewer)$"
# Picture in picture windows # Picture in picture windows
# "float, class:pavucontrol,title:pavucontrol" # ?????
"float, title:^(Picture-in-Picture)$" "float, title:^(Picture-in-Picture)$"
"pin, title:^(Picture-in-Picture)$" "pin, title:^(Picture-in-Picture)$"
"float, class:^(vesktop)$,title:^(Discord Popout)$" "float, class:^(vesktop)$,title:^(Discord Popout)$"
"pin, class:^(vesktop)$,title:^(Discord Popout)$" "pin, class:^(vesktop)$,title:^(Discord Popout)$"
"float, class:^(steam)$,title:^(Friends List)$" "float, class:^(steam)$,title:^(Friends List)$"
# Workspace assign # Workspace assign
"workspace: 1, class:^(kitty)$" # "workspace: 1, class:^(kitty)$"
"workspace: 2, class:^(firefox)$" # "workspace: name:discord, class:^(firefox)$"
"workspace: 5, class:^(steam)$" "workspace: name:discord, class:^(vesktop)$"
"workspace: 10, class:^(vesktop)$"
# Steam
"float, class:^([Ss]team)$, title:^((?![Ss]team).*)$"
"workspace name:steam silent, class:^([Ss]team)$, title:^([Ss]team)$"
"tile, class:^([Ss]team)$, title:^([Ss]team)$"
# Game Tearing??? https://wiki.hyprland.org/Configuring/Tearing/
"immediate, class:gamescope"
]; ];
@@ -214,9 +255,10 @@
exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
exec-once = nwg-look -a exec-once = nwg-look -a
exec-once = [workspace 2 silent] firefox exec-once = [workspace name:discord silent] firefox
exec-once = [workspace 10 silent] vesktop exec-once = [workspace name:discord silent] vesktop
exec-once = [workspace 5 silent] steam exec-once = [workspace name:discord silent] spotify
exec-once = [workspace name:steam silent] steam
''; '';
}; };
} }

6
hosts/desktop/hyprland/config/waybar/default.nix
View File

@@ -1,10 +1,12 @@
{ {
# https://github.com/Alexays/Waybar/wiki/Module:-Hyprland
programs.waybar = { programs.waybar = {
enable = true; enable = true;
systemd.enable = true; systemd.enable = true;
settings = { settings = {
mainBar = { mainBar = {
layer = "top"; layer = "bottom";
position = "top"; position = "top";
mod = "dock"; mod = "dock";
exclusive = true; exclusive = true;
@@ -67,6 +69,7 @@
tooltip = false; tooltip = false;
format-muted = " Muted"; format-muted = " Muted";
on-click = "pamixer -t"; on-click = "pamixer -t";
on-click-right = "pavucontrol -t 1";
on-scroll-up = "pamixer -i 5"; on-scroll-up = "pamixer -i 5";
on-scroll-down = "pamixer -d 5"; on-scroll-down = "pamixer -d 5";
scroll-step = 5; scroll-step = 5;
@@ -86,6 +89,7 @@
format-source = "🎙{volume}%"; format-source = "🎙{volume}%";
format-source-muted = "🎙Muted"; format-source-muted = "🎙Muted";
on-click = "pamixer --default-source -t"; on-click = "pamixer --default-source -t";
on-click-right = "pavucontrol -t 2";
on-scroll-up = "pamixer --default-source -i 5"; on-scroll-up = "pamixer --default-source -i 5";
on-scroll-down = "pamixer --default-source -d 5"; on-scroll-down = "pamixer --default-source -d 5";
scroll-step = 5; scroll-step = 5;

7
hosts/desktop/hyprland/default.nix
View File

@@ -1,4 +1,7 @@
{ pkgs, ... }: { pkgs, ... }:
let
sddmTheme = "catppuccin-mocha";
in
{ {
specialisation.hyprland.configuration = { specialisation.hyprland.configuration = {
imports = [ imports = [
@@ -10,12 +13,14 @@
services = { services = {
displayManager.sddm.enable = true; displayManager.sddm.enable = true;
displayManager.sddm.package = pkgs.kdePackages.sddm; displayManager.sddm.package = pkgs.kdePackages.sddm;
displayManager.sddm.theme = "catppuccin-mocha"; displayManager.sddm.theme = sddmTheme;
displayManager.defaultSession = "hyprland"; displayManager.defaultSession = "hyprland";
# disable plasma # disable plasma
desktopManager.plasma6.enable = false; desktopManager.plasma6.enable = false;
dbus.enable = true; dbus.enable = true;
ddccontrol.enable = true;
}; };
programs.hyprland = { programs.hyprland = {

3
hosts/desktop/hyprland/environment.nix
View File

@@ -17,6 +17,7 @@ in
catppuccin-sddm catppuccin-sddm
colloid-gtk-theme colloid-gtk-theme
colloid-icon-theme colloid-icon-theme
ddcutil
dunst dunst
glib glib
gnome-disk-utility gnome-disk-utility
@@ -31,6 +32,7 @@ in
nwg-look nwg-look
pamixer pamixer
papirus-folders papirus-folders
pavucontrol
playerctl playerctl
polkit polkit
polkit_gnome polkit_gnome
@@ -41,6 +43,7 @@ in
waybarWeatherScript waybarWeatherScript
wayland-protocols wayland-protocols
wayland-utils wayland-utils
wev
wl-clipboard wl-clipboard
wlogout wlogout
wlroots wlroots

80
hosts/desktop/hyprland/home.nix
View File

@@ -1,4 +1,21 @@
{ pkgs, ... }: { pkgs, ... }:
let
wallpaper = "/home/matt/.config/wallpapers/wall.png";
cursorTheme = "macOS-Monterey";
cursorThemePkg = pkgs.apple-cursor;
cursorSize = 24;
gtkThemeSize = "compact";
gtkThemeAccent = "blue";
gtkThemeVariant = "macchiato";
gtkTheme = "catppuccin-${gtkThemeVariant}-${gtkThemeAccent}-${gtkThemeSize}";
gtkThemePkg = pkgs.catppuccin-gtk.override {
size = gtkThemeSize;
accents = [ gtkThemeAccent ];
variant = gtkThemeVariant;
};
iconTheme = "Colloid-dark"; # Colloid, Colloid-light, Colloid-dark
iconThemePkg = pkgs.colloid-icon-theme;
in
{ {
imports = [ imports = [
./config.nix ./config.nix
@@ -14,10 +31,10 @@
hyprpaper = { hyprpaper = {
enable = true; enable = true;
settings = { settings = {
preload = [ "~/.config/wallpapers/wall.png" ]; preload = [ wallpaper ];
wallpaper = [ wallpaper = [
"DP-1, ~/.config/wallpapers/wall.png" "DP-1, ${wallpaper}"
"DP-2, ~/.config/wallpapers/wall.png" "DP-2, ${wallpaper}"
]; ];
splash = false; splash = false;
}; };
@@ -27,13 +44,29 @@
enable = true; enable = true;
settings = { settings = {
general = { general = {
after_sleep_cmd = "hyprctl dispatch dpms on"; before_sleep_cmd = "loginctl lock-session"; # lock before suspend.
after_sleep_cmd = "hyprctl dispatch dpms on"; # to avoid having to press a key twice to turn on the display.
ignore_dbus_inhibit = false; ignore_dbus_inhibit = false;
lock_cmd = "hyprlock"; lock_cmd = "pidof hyprlock || hyprlock"; # avoid starting multiple hyprlock instances.
}; };
listener = [ listener = [
# {
# timeout = 300; # 5min
# on-timeout = "brightnessctl -s set 10"; # set monitor backlight to minimum, avoid 0 on OLED monitor.
# on-resume = "brightnessctl -r"; # monitor backlight restore.
# }
{ {
timeout = 3600; timeout = 900; # 15 min
on-timeout = "loginctl lock-session"; # lock screen when timeout has passed
}
{
timeout = 930; # 15.5 min
on-timeout = "hyprctl dispatch dpms off"; # screen off when timeout has passed
on-resume = "hyprctl dispatch dpms on"; # screen on when activity is detected after timeout has fired.
}
{
timeout = 3600; # 1hr
on-timeout = "systemctl suspend"; # suspend pc
} }
]; ];
}; };
@@ -46,7 +79,7 @@
background = [ background = [
{ {
monitor = ""; monitor = "";
path = "/home/matt/.config/wallpapers/wall.png"; # supports png, jpg, webp (no animations, though) path = wallpaper; # supports png, jpg, webp (no animations, though)
color = "rgba(25, 20, 20, 1.0)"; color = "rgba(25, 20, 20, 1.0)";
# all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
@@ -63,12 +96,13 @@
{ {
size = "200, 50"; size = "200, 50";
position = "0, -80"; position = "0, -80";
monitor = ""; monitor = "DP-1";
dots_center = true; dots_center = true;
fade_on_empty = false; fade_on_empty = true;
font_color = "rgb(202, 211, 245)"; font_color = "rgb(202, 211, 245)";
inner_color = "rgb(91, 96, 120)"; inner_color = "rgb(91, 96, 120)";
outer_color = "rgb(24, 25, 38)"; outer_color = "rgb(24, 25, 38)";
bothlock_color = -1;
outline_thickness = 5; outline_thickness = 5;
placeholder_text = ''<span foreground="##cad3f5">Password...</span>''; placeholder_text = ''<span foreground="##cad3f5">Password...</span>'';
shadow_passes = 2; shadow_passes = 2;
@@ -94,9 +128,9 @@
# WLR_NO_HARDWARE_CURSORS = "1"; # WLR_NO_HARDWARE_CURSORS = "1";
CLUTTER_BACKEND = "wayland"; CLUTTER_BACKEND = "wayland";
# WLR_RENDERER = "vulkan"; # WLR_RENDERER = "vulkan";
XCURSOR_THEME = "macOS-Monterey"; XCURSOR_THEME = cursorTheme;
XCURSOR_SIZE = "24"; XCURSOR_SIZE = cursorSize;
GTK_THEME="catppuccin-macchiato-blue-compact"; GTK_THEME = gtkTheme;
XDG_CURRENT_DESKTOP = "Hyprland"; XDG_CURRENT_DESKTOP = "Hyprland";
XDG_SESSION_DESKTOP = "Hyprland"; XDG_SESSION_DESKTOP = "Hyprland";
XDG_SESSION_TYPE = "wayland"; XDG_SESSION_TYPE = "wayland";
@@ -110,31 +144,27 @@
home.pointerCursor = { home.pointerCursor = {
gtk.enable = true; gtk.enable = true;
package = pkgs.apple-cursor; package = cursorThemePkg;
name = "macOS-Monterey"; name = cursorTheme;
size = 24; size = cursorSize;
}; };
gtk = { gtk = {
enable = true; enable = true;
cursorTheme = { cursorTheme = {
name = "macOS-Monterey"; # macOS-[BigSur, Monterey]-[ , White, White-Windows, Windows] name = cursorTheme; # macOS-[BigSur, Monterey]-[ , White, White-Windows, Windows]
package = pkgs.apple-cursor; package = cursorThemePkg;
}; };
theme = { theme = {
name = "catppuccin-macchiato-blue-compact"; name = gtkTheme;
package = pkgs.catppuccin-gtk.override { package = gtkThemePkg;
size = "compact";
accents = ["blue"];
variant = "macchiato";
};
}; };
iconTheme = { iconTheme = {
name = "Colloid-dark"; # Colloid, Colloid-light, Colloid-dark name = iconTheme;
package = pkgs.colloid-icon-theme; package = iconThemePkg;
}; };
gtk3.extraConfig = { gtk3.extraConfig = {

3
hosts/nas/apps.nix
View File

@@ -66,5 +66,8 @@
tdarr.enable = true; tdarr.enable = true;
vscode.enable = true; vscode.enable = true;
wireguard.enable = true;
wireguard.configPath = "/media/nas/ssd/nix-app-data/wireguard/sidestore";
}; };
} }

2
hosts/nas/hardware-configuration.nix
View File

@@ -29,7 +29,7 @@
fsType = "tmpfs"; fsType = "tmpfs";
options = [ options = [
"defaults" "defaults"
"size=32G" "size=256G"
"mode=755" "mode=755"
]; ];
}; };

1
modules/apps/nextcloud/default.nix
View File

@@ -21,6 +21,7 @@ in
volumes = [ volumes = [
"${cfg.configPath}:/config" "${cfg.configPath}:/config"
"${cfg.dataPath}:/data" "${cfg.dataPath}:/data"
"${cfg.tmpPath}:/data-tmp"
"${cfg.redisSock}:/var/redis/redis.sock" "${cfg.redisSock}:/var/redis/redis.sock"
]; ];
environment = { environment = {

5
modules/apps/nextcloud/options.nix
View File

@@ -39,6 +39,11 @@ with lib;
default = "/media/nas/main/nextcloud"; default = "/media/nas/main/nextcloud";
}; };
tmpPath = mkOption {
type = types.str;
default = "/media/nas/ssd/nix-app-data/tmp";
};
redisSock = mkOption { redisSock = mkOption {
type = types.str; type = types.str;
default = ""; default = "";

33
modules/apps/wireguard/default.nix Normal file
View File

@@ -0,0 +1,33 @@
{
lib,
pkgs,
config,
...
}:
with lib;
let
cfg = config.nas-apps.wireguard;
in
{
imports = [ ./options.nix ];
config = mkIf cfg.enable {
virtualisation.oci-containers.containers."${cfg.name}" = {
autoStart = cfg.autoStart;
image = cfg.image;
ports = [ "${cfg.port}:51820/udp" ];
extraOptions = [
"--cap-add=NET_ADMIN"
"--sysctl=\"net.ipv4.conf.all.src_valid_mark=1\""
];
volumes = [
"${cfg.configPath}:/config"
];
environment = {
PUID = cfg.puid;
PGID = cfg.pgid;
TZ = cfg.timeZone;
};
};
};
}

47
modules/apps/wireguard/options.nix Normal file
View File

@@ -0,0 +1,47 @@
{ lib, ... }:
with lib;
{
options.nas-apps.wireguard = {
enable = mkEnableOption "wireguard docker service";
autoStart = mkOption {
type = types.bool;
default = true;
};
port = mkOption {
type = types.str;
default = "51820";
};
name = mkOption {
type = types.str;
default = "wireguard";
};
image = mkOption {
type = types.str;
default = "lscr.io/linuxserver/wireguard";
};
configPath = mkOption {
type = types.str;
default = "/media/nas/ssd/nix-app-data/wireguard";
};
puid = mkOption {
type = types.str;
default = "911";
};
pgid = mkOption {
type = types.str;
default = "1000";
};
timeZone = mkOption {
type = types.str;
default = "America/Chicago";
};
};
}

1
modules/default.nix
View File

@@ -22,5 +22,6 @@
./apps/swag ./apps/swag
./apps/tdarr ./apps/tdarr
./apps/vscode ./apps/vscode
./apps/wireguard
]; ];
} }

14
share/gaming/default.nix
View File

@@ -22,7 +22,19 @@ in
remotePlay.openFirewall = true; remotePlay.openFirewall = true;
# Open ports in the firewall for Source Dedicated Server # Open ports in the firewall for Source Dedicated Server
dedicatedServer.openFirewall = true; dedicatedServer.openFirewall = true;
};
gamescopeSession = {
enable = true;
args = [
"-f"
"-H 2160"
"-W 3840"
"-r 240"
"--hdr-enabled"
"--adaptive-sync"
];
};
};#"gamescope -f -H 2160 -W 3840 -r 240 --adaptive-sync --hdr-enabled
# Hardware configs # Hardware configs
hardware = { hardware = {