xeovalyte/nix
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Desktop changes

Browse Source
This commit is contained in:
xeovalyte 2024-09-12 18:43:03 +02:00
parent 5d25dcf186
commit 3b7198327e
Signed by: xeovalyte
SSH Key Fingerprint: SHA256:GWI1hq+MNKR2UOcvk7n9tekASXT8vyazK7vDF9Xyciw
10 changed files with 94 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flake.lock generated
View File

@ -58,11 +58,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1720954236,
"narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=",
"lastModified": 1725001927,
"narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27",
"rev": "6e99f2a27d600612004fbd2c3282d614bfee6421",
"type": "github"
},
"original": {
@ -88,11 +88,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1720957393,
"narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
"lastModified": 1724819573,
"narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
"rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
"type": "github"
},
"original": {

17
hosts/desktop/default.nix
View File

@ -11,12 +11,17 @@
# CLI
../../modules/system/cli/common.nix
../../modules/system/cli/podman.nix
# Hardware
../../modules/system/hardware/firewall.nix
../../modules/system/hardware/garbage-collection.nix
../../modules/system/hardware/locale.nix
../../modules/system/hardware/nvidia.nix
# Containers
# ../../modules/containers/adguard.nix
# ../../modules/containers/caddy.nix
];
nix.settings = {
@ -45,7 +50,17 @@
extraGroups = [ "networkmanager" "wheel" "dialout" "fuse" ];
};
boot.kernelPackages = pkgs.linuxPackages_latest;
services.openssh.enable = true;
# boot.kernelPackages = pkgs.linuxPackages_latest;
# sunshine
services.sunshine = {
enable = true;
autoStart = true;
capSysAdmin = true;
openFirewall = true;
};
system.stateVersion = "24.05";

6
hosts/desktop/hardware-configuration.nix
View File

@ -8,18 +8,18 @@
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/b4cefbc5-dd3d-4a4b-84d0-031b2ed7655c";
{ device = "/dev/disk/by-uuid/f8dc500b-2b36-4ca8-940b-1716742d6cf3";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/9A7D-7464";
{ device = "/dev/disk/by-uuid/029A-9287";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
};

5
hosts/desktop/home.nix
View File

@ -30,7 +30,10 @@
host = "xv-desktop";
home.packages = with pkgs; [
unstable.prismlauncher
unstable.prismlauncher
unstable.modrinth-app
unstable.vesktop
unstable.blender
];
home.stateVersion = "24.05";

23
modules/containers/adguard.nix Normal file
View File

@ -0,0 +1,23 @@
{ pkgs, ... }:
{
virtualisation.oci-containers.containers = {
adguardhome = {
image = "docker.io/adguard/adguardhome";
autoStart = true;
ports = [
"192.168.100.107:53:53/udp"
"81:3000/tcp"
];
volumes = [
"workdir:/opt/adguardhome/work"
"confdir:/opt/adguardhome/conf"
];
};
};
networking.firewall = {
allowedTCPPorts = [ 81 53 ];
allowedUDPPorts = [ 53 ];
};
}

16
modules/containers/caddy.nix Normal file
View File

@ -0,0 +1,16 @@
{ pkgs, ... }:
pkgs.dockerTools.buildImage {
name = "caddy-custom";
tag = "latest";
fromImage = "docker.io/caddy";
fromImageName = null;
fromImageTag = "2.8.4-builder";
runAsRoot = ''
#!${pkgs.runtimeShell}
xcaddy build --with github.com/caddy-dns/cloudflare
'';
}

17
modules/home/gui/hyprland/default.nix
View File

@ -35,6 +35,13 @@
"lxqt-policykit-agent"
];
env = lib.mkIf (config.host == "xv-desktop") [
"LIBVA_DRIVER_NAME,nvidia"
"XDG_SESSION_TYPE,wayland"
"GBM_BACKEND,nvidia-drm"
"__GLX_VENDOR_LIBRARY_NAME,nvidia"
];
"$mod" = "SUPER";
input = {
@ -83,11 +90,11 @@
]
(lib.mkIf (config.host == "xv-desktop") [
"1, monitor:DP-2"
"2, monitor:DP-2"
"3, monitor:DP-2"
"4, monitor:DP-2"
"5, monitor:DP-2"
"1, monitor:DP-1"
"2, monitor:DP-1"
"3, monitor:DP-1"
"4, monitor:DP-1"
"5, monitor:DP-1"
"6, monitor:HDMI-A-1"
"7, monitor:HDMI-A-1"
"8, monitor:HDMI-A-1"

4
modules/home/gui/hyprland/waybar.nix
View File

@ -35,6 +35,10 @@
"DP-10" = [ 1 2 3 4 ];
"DP-9" = [ 5 6 7 ];
"eDP-1" = [ 8 9 10 ];
})
(lib.mkIf (config.host == "xv-desktop") {
"DP-1" = [ 1 2 3 4 5 ];
"HDMI-A-1" = [ 6 7 8 9 10 ];
})];
"format-icons" = {
"default" = "";

2
modules/system/cli/podman.nix
View File

@ -9,6 +9,8 @@
defaultNetwork.settings.dns_enabled = true;
};
virtualisation.oci-containers.backend = "podman";
environment.systemPackages = with pkgs; [
dive
podman-tui

9
modules/system/hardware/nvidia.nix
View File

@ -34,6 +34,13 @@
open = false;
nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.beta;
package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
version = "555.58.02";
sha256_64bit = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM=";
sha256_aarch64 = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM=";
openSha256 = "sha256-ZpuVZybW6CFN/gz9rx+UJvQ715FZnAOYfHn5jt5Z2C8=";
settingsSha256 = "sha256-ZpuVZybW6CFN/gz9rx+UJvQ715FZnAOYfHn5jt5Z2C8=";
persistencedSha256 = lib.fakeSha256;
};
};
}