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

tmp

Browse Source
This commit is contained in:
mjallen18
2024-11-08 22:31:09 -06:00
parent 2743309214
commit 96a05612c6
13 changed files with 193 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
flake.lock generated
View File

@@ -14,11 +14,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1730387901,
"narHash": "sha256-XnO0bx330mgfiLGIEnUEH4fBhKx5DcZTXl47VjLCeok=",
"lastModified": 1730835992,
"narHash": "sha256-XYr4WQMxJdZkrQlsouyURMY4iNL5SS2RlQ7XGnjEQBU=",
"owner": "nix-community",
"repo": "authentik-nix",
"rev": "74b5a8c5ffbca16f7af1def137e06a97a958a098",
"rev": "5af11599eaec65b5b6e6e39d77b541db361c08aa",
"type": "github"
},
"original": {
@@ -30,16 +30,16 @@
"authentik-src": {
"flake": false,
"locked": {
"lastModified": 1730315123,
"narHash": "sha256-UYOdBlkGeIGCG/pCGLANWv1bKTdBEUp6jTiLG7BpY7E=",
"lastModified": 1730826392,
"narHash": "sha256-EuNOfMy7yVa1OqWwCtNtmdeIQeQCTCKBXgJdz0QCPIU=",
"owner": "goauthentik",
"repo": "authentik",
"rev": "e8b5e4c1272151f4a3666e53754f7deefb8e2fb3",
"rev": "665de8ef2211524f3cc13dce9344bd59c61c3a5c",
"type": "github"
},
"original": {
"owner": "goauthentik",
"ref": "version/2024.8.4",
"ref": "version/2024.10.1",
"repo": "authentik",
"type": "github"
}
@@ -52,11 +52,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1730555728,
"narHash": "sha256-jBr4WUPat+R/79DBdk85hKyqDfoJII4Z+V+GoevYNDY=",
"lastModified": 1730767100,
"narHash": "sha256-SGkgP2H+i1jewNFBuAs4+grutNrfm5by+JUERUdXIRo=",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "e734744bc2e9ca9aa577555bf028c5ea51eb5f77",
"rev": "f8969fe1947ed81785a9e52f62622c03d3e58971",
"type": "github"
},
"original": {
@@ -76,11 +76,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1730597759,
"narHash": "sha256-DStWygV/fV3aU8VWN4wIG4Mjpq7s540gUD4A103u+Zo=",
"lastModified": 1730830166,
"narHash": "sha256-F2SA8PkrV+Ed8WZKwEimO2oBxQJFJU2ni/wqIbupX4Y=",
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
"rev": "db3975340480a6c2532398991f3a47f74df17eed",
"rev": "49ee81f51e7449314af27915f3719cc76e9abe1f",
"type": "github"
},
"original": {
@@ -178,11 +178,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1726153070,
"narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=",
"lastModified": 1727826117,
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a",
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
"type": "github"
},
"original": {
@@ -295,11 +295,11 @@
]
},
"locked": {
"lastModified": 1730016908,
"narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
"lastModified": 1730633670,
"narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e83414058edd339148dc142a8437edb9450574c8",
"rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661",
"type": "github"
},
"original": {
@@ -373,11 +373,11 @@
]
},
"locked": {
"lastModified": 1730248099,
"narHash": "sha256-Fl7BSdpLk0uTXF6ol/MR0q1EB4XQ8tn0ftig0pyYh5Y=",
"lastModified": 1730625581,
"narHash": "sha256-vFxtzNCxtUIrmv8tluquZHjNTwMkCGtT0NCoVuwlqd4=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "c11bab124fc55a37cbd854ed28ea121ed609231f",
"rev": "e6195c6bfc037617e20d6d7d4d6c9cdeee6aba6d",
"type": "github"
},
"original": {
@@ -444,11 +444,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1730600078,
"narHash": "sha256-BoyFmE59HDF3uybBySsWVoyjNuHvz3Wv8row/mSb958=",
"lastModified": 1730779758,
"narHash": "sha256-5WI9AnsBwhLzVRnQm3Qn9oAbROnuLDQTpaXeyZCK8qw=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "4652874d014b82cb746173ffc64f6a70044daa7e",
"rev": "0e3f3f017c14467085f15d42343a3aaaacd89bcb",
"type": "github"
},
"original": {
@@ -466,11 +466,11 @@
]
},
"locked": {
"lastModified": 1703863825,
"narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=",
"lastModified": 1729742964,
"narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=",
"owner": "nix-community",
"repo": "nix-github-actions",
"rev": "5163432afc817cf8bd1f031418d1869e4c9d5547",
"rev": "e04df33f62cdcf93d73e9a04142464753a16db67",
"type": "github"
},
"original": {
@@ -524,11 +524,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1730537918,
"narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=",
"lastModified": 1730828750,
"narHash": "sha256-XrnZLkLiBYNlwV5gus/8DT7nncF1TS5la6Be7rdVOpI=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "f6e0cd5c47d150c4718199084e5764f968f1b560",
"rev": "2e78b1af8025108ecd6edaa3ab09695b8a4d3d55",
"type": "github"
},
"original": {
@@ -540,11 +540,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1730200266,
"narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
"lastModified": 1730531603,
"narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
"rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
"type": "github"
},
"original": {
@@ -556,23 +556,23 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1725233747,
"narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=",
"lastModified": 1727825735,
"narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1730327045,
"narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=",
"lastModified": 1730602179,
"narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "080166c15633801df010977d9d7474b4a6c549d7",
"rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c",
"type": "github"
},
"original": {
@@ -600,11 +600,11 @@
},
"nixpkgs-stable_3": {
"locked": {
"lastModified": 1730327045,
"narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=",
"lastModified": 1730741070,
"narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "080166c15633801df010977d9d7474b4a6c549d7",
"rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
"type": "github"
},
"original": {
@@ -648,11 +648,11 @@
},
"nixpkgs-unstable-small": {
"locked": {
"lastModified": 1730642263,
"narHash": "sha256-UXqvGZOHUDeAo8Sv5A5oObiQgBPELVgHQi130TU0jMU=",
"lastModified": 1730815137,
"narHash": "sha256-/SMEl8lpjVJOH5OQ11OLn6O2DeHb0yo3oIz1mi2bvWY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "650fe87347086b30a6dbcc32b55987ce5a23c6ae",
"rev": "78366fc8acbc8092d898f021354ab61ca161c412",
"type": "github"
},
"original": {
@@ -726,11 +726,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1727169160,
"narHash": "sha256-m/3tT0Wvk2V4H15riZC/yT7i7t+8V58HTDpthKV5yhk=",
"lastModified": 1730284601,
"narHash": "sha256-eHYcKVLIRRv3J1vjmxurS6HVdGphB53qxUeAkylYrZY=",
"owner": "nix-community",
"repo": "poetry2nix",
"rev": "7624b3e0275d9b52dbdda46ef7ffee66b36ff823",
"rev": "43a898b4d76f7f3f70df77a2cc2d40096bc9d75e",
"type": "github"
},
"original": {
@@ -792,11 +792,11 @@
]
},
"locked": {
"lastModified": 1730514457,
"narHash": "sha256-cjFX208s9pyaOfMvF9xI6WyafyXINqdhMF7b1bMQpLI=",
"lastModified": 1730687492,
"narHash": "sha256-xQVadjquBA/tFxDt5A55LJ1D1AvkVWsnrKC2o+pr8F4=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "1ff38ca26eb31858e4dfe7fe738b6b3ce5d74922",
"rev": "41814763a2c597755b0755dbe3e721367a5e420f",
"type": "github"
},
"original": {
@@ -852,11 +852,11 @@
"nixpkgs-stable": "nixpkgs-stable_4"
},
"locked": {
"lastModified": 1730605784,
"narHash": "sha256-1NveNAMLHbxOg0BpBMSVuZ2yW2PpDnZLbZ25wV50PMc=",
"lastModified": 1730746162,
"narHash": "sha256-ZGmI+3AbT8NkDdBQujF+HIxZ+sWXuyT6X8B49etWY2g=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "e9b5eef9b51cdf966c76143e13a9476725b2f760",
"rev": "59d6988329626132eaf107761643f55eb979eef1",
"type": "github"
},
"original": {
@@ -904,11 +904,11 @@
]
},
"locked": {
"lastModified": 1719749022,
"narHash": "sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg=",
"lastModified": 1730120726,
"narHash": "sha256-LqHYIxMrl/1p3/kvm2ir925tZ8DkI0KA10djk8wecSk=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd",
"rev": "9ef337e492a5555d8e17a51c911ff1f02635be15",
"type": "github"
},
"original": {

4
flake.nix
View File

@@ -84,7 +84,7 @@
nixosConfigurations = {
# Desktop
"matt-nixos" = nixpkgs-unstable-small.lib.nixosSystem {
"matt-nixos" = nixpkgs-stable.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
inherit inputs outputs;
@@ -95,7 +95,7 @@
./hosts/desktop/configuration.nix
./share/impermanence
chaotic.nixosModules.default
home-manager.nixosModules.home-manager
home-manager-stable.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;

2
hosts/default.nix
View File

@@ -38,7 +38,7 @@ in
enableAllFirmware = lib.mkForce true;
# Disable pulse audio in favor of pipewire
pulseaudio.enable = lib.mkDefault false;
pulseaudio.enable = lib.mkForce false;
};
# Services configs

2
hosts/desktop/boot.nix
View File

@@ -2,7 +2,7 @@
let
configLimit = 5;
default = "@saved";
kernel = pkgs.linuxPackages_latest;
kernel = pkgs.unstable.linuxPackages_latest;
in
{
# Configure bootloader with lanzaboot and secureboot

91
hosts/desktop/configuration.nix
View File

@@ -4,7 +4,7 @@
{
config,
# outputs,
outputs,
lib,
pkgs,
...
@@ -27,8 +27,80 @@ let
fi
'';
fixWifiScript = pkgs.writeScriptBin "fix-wifi" ''
/home/matt/nix-config/scripts/fix-wifi.py
'';
#!/usr/bin/env python3
import subprocess
import socket
import logging
from typing import List, Optional
def check_internet_connection(hosts_to_check: Optional[List[str]] = None) -> bool:
"""
Check internet connectivity by attempting to connect to reliable hosts.
:param hosts_to_check: Optional list of hosts to check.
:return: Boolean indicating if internet connection is available
"""
if hosts_to_check is None:
hosts_to_check = [
"8.8.8.8", # Google DNS
"1.1.1.1", # Cloudflare DNS
"9.9.9.9" # Quad9 DNS
]
for host in hosts_to_check:
try:
# Create a socket connection with a 5-second timeout
socket.create_connection((host, 53), timeout=5)
return True
except (socket.error, socket.timeout):
continue
return False
def reset_wifi_card() -> bool:
"""
Execute WiFi card reset commands.
:return: Boolean indicating if reset commands were successful
"""
reset_commands = [
"echo 1 | sudo -u root tee /sys/bus/pci/devices/0000:09:00.0/reset",
"sudo rmmod iwlwifi",
"sudo modprobe iwlwifi"
]
try:
for command in reset_commands:
result = subprocess.run(
command,
shell=True,
check=True,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
text=True
)
print(f"Executed: {command}")
print(f"Output: {result.stdout}")
return True
except subprocess.CalledProcessError as e:
print(f"Error resetting WiFi: {e}")
print(f"Error output: {e.stderr}")
return False
def main():
"""
Check internet connection and reset WiFi if not connected.
"""
if not check_internet_connection():
print("No internet connection detected. Attempting WiFi reset...")
reset_wifi_card()
else:
print("Internet connection is stable. No reset needed.")
if __name__ == "__main__":
main()
'';
in
{
imports = [
@@ -211,7 +283,9 @@ in
kdePackages.ksvg
lact
memtest86-efi
memtest86plus
memtest86plus
unstable.mesa
unstable.driversi686Linux.mesa
nano
onlyoffice-bin
os-prober
@@ -270,9 +344,12 @@ in
};
# Configure nixpkgs
nixpkgs.config.permittedInsecurePackages = [
# ...
];
nixpkgs = {
overlays = [ outputs.overlays.nixpkgs-unstable ];
config.permittedInsecurePackages = [
# ...
];
};
# Define a user account. Don't forget to set a password with ‘passwd’.
users.users."${user}" = {

5
hosts/desktop/gnome/default.nix
View File

@@ -18,7 +18,7 @@
displayManager.defaultSession = "gnome";
# Enable Flatpak
flatpak.enable = true;
flatpak.enable = false;
# disable plasma
displayManager.sddm.enable = false;
@@ -28,9 +28,10 @@
environment = {
systemPackages = with pkgs; [
colloid-gtk-theme
gnome-tweaks
unstable.gnome-tweaks
gnomeExtensions.appindicator
gnomeExtensions.arcmenu
gnomeExtensions.dash-to-dock
gnomeExtensions.dash-to-panel
gnomeExtensions.tiling-assistant
];

4
hosts/desktop/gnome/home.nix
View File

@@ -9,7 +9,7 @@
"org/gnome/desktop/interface".font-antialiasing = "grayscale";
"org/gnome/desktop/interface".font-hinting = "slight";
"org/gnome/desktop/interface".gtk-theme = lib.mkDefault "Colloid-Dark";
"org/gnome/desktop/interface".icon-theme = lib.mkDefault "Colloid-Dark";
"org/gnome/desktop/interface".icon-theme = lib.mkDefault "Colloid-dark";
"org/gnome/desktop/peripherals/mouse".accel-profile = "flat";
"org/gnome/desktop/peripherals/touchpad".two-finger-scrolling-enabled = true;
"org/gnome/desktop/peripherals/touchpad".tap-to-click = true;
@@ -22,8 +22,8 @@
"appindicatorsupport@rgcjonas.gmail.com"
"arcmenu@arcmenu.com"
"user-theme@gnome-shell-extensions.gcampax.github.com"
"dash-to-panel@jderose9.github.com"
"tiling-assistant@leleat-on-github"
"dash-to-dock@micxgx.gmail.com"
];
"org/gnome/shell/extensions/dash-to-panel".primary-monitor = 1;
"org/gnome/shell/extensions/dash-to-panel".multi-monitors = false;

8
hosts/desktop/home.nix
View File

@@ -58,23 +58,21 @@ in
programs.command-not-found.enable = true;
home.packages = with pkgs; [
# gamescope # using chaotic git version
# gamescope-wsi # using chaotic git version
age
apple-cursor
bottles
chromium
colloid-icon-theme
colloid-kde
compose2nix
unstable.compose2nix
coolercontrol.coolercontrol-gui
deadnix
discord
fastfetch
firefox
freerdp
gamescope_git
gamescope-wsi_git
gamescope
gamescope-wsi
goverlay
heroic
home-manager

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

@@ -11,7 +11,7 @@ let
in
{
environment.systemPackages = with pkgs; [
adwaita-icon-theme
unstable.adwaita-icon-theme
apple-cursor
catppuccin-sddm
colloid-gtk-theme
@@ -19,19 +19,19 @@ in
ddcutil
dunst
egl-wayland
file-roller
unstable.file-roller
glib
gnome-tweaks
gnome-disk-utility
gnome-system-monitor
gsettings-desktop-schemas
unstable.gnome-tweaks
unstable.gnome-disk-utility
unstable.gnome-system-monitor
unstable.gsettings-desktop-schemas
hyprcursor
hyprland
hyprshot
libnotify
mako
meson
nautilus
unstable.nautilus
networkmanagerapplet
nm-tray
nwg-drawer

4
hosts/nas/impermanence.nix
View File

@@ -17,6 +17,10 @@
group = "authentik";
mode = "u=rwx,g=,o=";
}
{
directory = "/var/lib/private";
mode = "u=rwx,g=rx,o=";
}
{
directory = "/var/lib/colord";
user = "colord";

19
hosts/nas/services.nix
View File

@@ -6,6 +6,24 @@ in
# Services configs
services = {
caddy = {
enable = false;
email = "jalle008@proton.me";
enableReload = true;
user = "nix-apps";
group = "jallen-nas";
dataDir = "/media/nas/ssd/nix-app-data/caddy";
virtualHosts = {
"authentik.mjallen.dev".extraConfig = ''
reverse_proxy http://10.0.1.18:9000
'';
"jellyfin.mjallen.dev".extraConfig = ''
reverse_proxy http://10.0.1.18:8096
'';
};
};
minecraft-server = {
enable = true;
eula = true;
@@ -135,6 +153,7 @@ in
"--advertise-exit-node"
"--accept-dns=false"
"--advertise-routes=10.0.1.0/24"
"--hostname=jallen-nas"
];
extraSetFlags = [
"--advertise-exit-node"

13
share/amd/default.nix
View File

@@ -4,14 +4,13 @@
config,
...
}:
with lib;
let
cfg = config.share.hardware.amd;
in
{
imports = [ ./options.nix ];
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
boot.kernelParams = [ (if cfg.enable then "amdgpu.ppfeaturemask=0xffffffff" else null) ];
# Configure programs
@@ -26,9 +25,11 @@ in
# Hardware configs
hardware = {
# Enable graphics
graphics = {
opengl = {
enable = true;
enable32Bit = true;
extraPackages = [ pkgs.unstable.mesa ];
driSupport32Bit = true;
extraPackages32 = [ pkgs.unstable.pkgsi686Linux.mesa ];
};
};
@@ -49,7 +50,7 @@ in
};
# nixpkg is broken so need to manually define
systemd.services.lactd = mkIf cfg.lact.enable {
systemd.services.lactd = lib.mkIf cfg.lact.enable {
description = "AMDGPU Control Daemon";
path = [
pkgs.bash
@@ -64,7 +65,7 @@ in
# Configure environment
environment = {
systemPackages = mkIf cfg.lact.enable [ pkgs.lact ];
systemPackages = lib.mkIf cfg.lact.enable [ pkgs.lact ];
sessionVariables = lib.mkDefault { STEAM_FORCE_DESKTOPUI_SCALING = "1"; };
};
};

3
share/gaming/default.nix
View File

@@ -1,12 +1,11 @@
{ lib, config, ... }:
with lib;
let
cfg = config.share.gaming;
in
{
imports = [ ./options.nix ];
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
# Network option required using sysctl to let Ubisoft Connect work as of 7-12-2023
boot.kernel.sysctl."net.ipv4.tcp_mtu_probing" = 1;