mirror of
https://github.com/MichaelFisher1997/nixos.git
synced 2025-06-15 19:53:13 +00:00
Nix
This commit is contained in:
parent
773601bb23
commit
c71674f97e
@ -13,6 +13,8 @@
|
|||||||
./docker.nix
|
./docker.nix
|
||||||
./hyprland.nix
|
./hyprland.nix
|
||||||
./networking.nix
|
./networking.nix
|
||||||
|
./gpu.nix
|
||||||
|
./sunshine.nix
|
||||||
#./i3.nix
|
#./i3.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
@ -27,6 +29,9 @@
|
|||||||
"cgroup_enable=cpuset,cpu,cpuacct,blkio,devices,freezer,net_cls,perf_event,net_prio,hugetlb,pids"
|
"cgroup_enable=cpuset,cpu,cpuacct,blkio,devices,freezer,net_cls,perf_event,net_prio,hugetlb,pids"
|
||||||
];
|
];
|
||||||
boot.supportedFilesystems = [ "ntfs" ];
|
boot.supportedFilesystems = [ "ntfs" ];
|
||||||
|
services.zfs.autoScrub.enable = true;
|
||||||
|
services.zfs.trim.enable = true;
|
||||||
|
|
||||||
# boot.supportedFilesystems = [ "zfs" ];
|
# boot.supportedFilesystems = [ "zfs" ];
|
||||||
# boot.zfs.forceImportRoot = false;
|
# boot.zfs.forceImportRoot = false;
|
||||||
# networking.hostId = "a44f5fde";
|
# networking.hostId = "a44f5fde";
|
||||||
@ -91,7 +96,7 @@
|
|||||||
xdg.portal = {
|
xdg.portal = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraPortals = [
|
extraPortals = [
|
||||||
pkgs.xdg-desktop-portal
|
pkgs.xdg-desktop-portal-hyprland
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -103,6 +108,7 @@
|
|||||||
|
|
||||||
# Enable sound with pipewire.
|
# Enable sound with pipewire.
|
||||||
hardware.pulseaudio.enable = false;
|
hardware.pulseaudio.enable = false;
|
||||||
|
|
||||||
#sound.enable = true;
|
#sound.enable = true;
|
||||||
services.flatpak.enable = true;
|
services.flatpak.enable = true;
|
||||||
services.blueman.enable = true;
|
services.blueman.enable = true;
|
||||||
@ -166,7 +172,7 @@
|
|||||||
|
|
||||||
hardware.opengl = {
|
hardware.opengl = {
|
||||||
enable = true;
|
enable = true;
|
||||||
#driSupport = true;
|
driSupport = true;
|
||||||
#driSupport32Bit = true;
|
#driSupport32Bit = true;
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
vulkan-loader
|
vulkan-loader
|
||||||
@ -175,6 +181,8 @@
|
|||||||
intel-media-driver # LIBVA_DRIVER_NAME=iHD
|
intel-media-driver # LIBVA_DRIVER_NAME=iHD
|
||||||
intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
|
intel-vaapi-driver # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
|
||||||
libvdpau-va-gl
|
libvdpau-va-gl
|
||||||
|
vaapiVdpau
|
||||||
|
mesa.drivers
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
10
gpu.nix
Normal file
10
gpu.nix
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
hardware.opengl.extraPackages = with pkgs; [
|
||||||
|
rocmPackages.clr.icd
|
||||||
|
];
|
||||||
|
environment.systemPackages = [
|
||||||
|
pkgs.rocmPackages.rpp
|
||||||
|
];
|
||||||
|
|
||||||
|
}
|
@ -29,6 +29,8 @@
|
|||||||
xfce.tumbler
|
xfce.tumbler
|
||||||
pavucontrol
|
pavucontrol
|
||||||
wlr-randr
|
wlr-randr
|
||||||
|
libcanberra-gtk3
|
||||||
|
pamixer
|
||||||
grim
|
grim
|
||||||
discocss
|
discocss
|
||||||
themechanger
|
themechanger
|
||||||
|
18
mnt.nix
18
mnt.nix
@ -1,14 +1,14 @@
|
|||||||
{ pkgs, ... }:
|
{... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
services.rpcbind.enable = true; # needed for NFS
|
services.rpcbind.enable = true; # needed for NFS
|
||||||
systemd.mounts = [{
|
systemd.mounts = [{
|
||||||
type = "nfs";
|
type = "nfs";
|
||||||
mountConfig = {
|
|
||||||
Options = "noatime";
|
|
||||||
};
|
|
||||||
what = "10.27.27.239:/BigNAS";
|
what = "10.27.27.239:/BigNAS";
|
||||||
where = "/mnt/BigNAS";
|
where = "/mnt/BigNAS";
|
||||||
|
mountConfig = {
|
||||||
|
Options = "noatime,nofail,x-systemd.device-timeout=5s";
|
||||||
|
};
|
||||||
}];
|
}];
|
||||||
|
|
||||||
systemd.automounts = [{
|
systemd.automounts = [{
|
||||||
@ -18,17 +18,13 @@
|
|||||||
};
|
};
|
||||||
where = "/mnt/BigNAS";
|
where = "/mnt/BigNAS";
|
||||||
}];
|
}];
|
||||||
fileSystems."/mnt/NV1" = {
|
fileSystems."/mnt/NVME" = {
|
||||||
device = "/dev/disk/by-uuid/a41cc08d-10f2-40dd-b76a-976764a50cea";
|
device = "/dev/disk/by-uuid/15b96913-a018-4ecc-950c-b8cf74b93315";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
|
options = [ "compress=zstd" "nofail" "x-systemd.device-timeout=5s" ];
|
||||||
};
|
};
|
||||||
fileSystems."/mnt/ssd2" = {
|
fileSystems."/mnt/ssd2" = {
|
||||||
device = "/dev/disk/by-uuid/bc0d1423-5682-4150-906f-b1a154a316ea";
|
device = "/dev/disk/by-uuid/bc0d1423-5682-4150-906f-b1a154a316ea";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
};
|
};
|
||||||
# fileSystems."/mnt/ntfs" = {
|
|
||||||
# device = "/dev/disk/by-uuid/c51b755c-24d3-11e6-a186-408d5c1ea148";
|
|
||||||
# fsType = "ntfs-3g";
|
|
||||||
# options = ["rw""uid=1000"];
|
|
||||||
# };
|
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
{ lib, ... }:
|
||||||
{
|
{
|
||||||
networking = {
|
networking = {
|
||||||
hostName = "hypr-nix";
|
hostName = "hypr-nix";
|
||||||
@ -8,6 +8,13 @@
|
|||||||
enp0s31f6.useDHCP = true;
|
enp0s31f6.useDHCP = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
networking.firewall = {
|
||||||
|
enable = true;
|
||||||
|
allowedTCPPorts = [ 47984 47989 47990 48010 ];
|
||||||
|
allowedUDPPortRanges = [
|
||||||
|
{ from = 47998; to = 48000; }
|
||||||
|
{ from = 8000; to = 8010; }
|
||||||
|
];
|
||||||
|
};
|
||||||
services.tailscale.enable = true;
|
services.tailscale.enable = true;
|
||||||
}
|
}
|
||||||
|
11
packages.nix
11
packages.nix
@ -12,9 +12,11 @@ in
|
|||||||
libsForQt5.kate
|
libsForQt5.kate
|
||||||
sublime
|
sublime
|
||||||
lunarvim
|
lunarvim
|
||||||
unstable.zed-editor
|
vscode
|
||||||
|
#unstable.zed-editor
|
||||||
|
|
||||||
# Development Tools
|
# Development Tools
|
||||||
|
openjdk
|
||||||
clang-tools
|
clang-tools
|
||||||
gcc
|
gcc
|
||||||
cmake
|
cmake
|
||||||
@ -41,6 +43,9 @@ in
|
|||||||
unstable.bun
|
unstable.bun
|
||||||
air
|
air
|
||||||
tailwindcss
|
tailwindcss
|
||||||
|
google-cloud-sdk-gce
|
||||||
|
kubo
|
||||||
|
hashcat
|
||||||
|
|
||||||
# Version Control
|
# Version Control
|
||||||
git
|
git
|
||||||
@ -81,6 +86,7 @@ in
|
|||||||
|
|
||||||
# System Utilities
|
# System Utilities
|
||||||
htop
|
htop
|
||||||
|
vault
|
||||||
btop
|
btop
|
||||||
amdgpu_top
|
amdgpu_top
|
||||||
parted
|
parted
|
||||||
@ -100,6 +106,8 @@ in
|
|||||||
nitrogen
|
nitrogen
|
||||||
pywal
|
pywal
|
||||||
ldmtool
|
ldmtool
|
||||||
|
smartmontools
|
||||||
|
gptfdisk
|
||||||
|
|
||||||
# Window Managers
|
# Window Managers
|
||||||
i3
|
i3
|
||||||
@ -182,6 +190,7 @@ in
|
|||||||
svt-av1
|
svt-av1
|
||||||
rav1e
|
rav1e
|
||||||
libaom
|
libaom
|
||||||
|
sunshine
|
||||||
|
|
||||||
# Miscellaneous
|
# Miscellaneous
|
||||||
fastfetch
|
fastfetch
|
||||||
|
2
result
2
result
@ -1 +1 @@
|
|||||||
/nix/store/4vlpsmid3byi5r6jp0sb7n1lqjhpb895-redot-redot-4.3-beta.2
|
/nix/store/2hqaqfwyqgx9fpfcpwzf1ajj723z7hk6-nixos-system-hypr-nix-24.05.7376.b134951a4c9f
|
17
sunshine.nix
Normal file
17
sunshine.nix
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
services.sunshine = {
|
||||||
|
enable = true;
|
||||||
|
autoStart = true;
|
||||||
|
capSysAdmin = true;
|
||||||
|
openFirewall = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
#security.wrappers.sunshine = {
|
||||||
|
# owner = "root";
|
||||||
|
# group = "root";
|
||||||
|
# capabilities = "cap_sys_admin+p";
|
||||||
|
# source = "${pkgs.sunshine}/bin/sunshine";
|
||||||
|
# };
|
||||||
|
}
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user