zoey/config
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

updates

Browse source
This commit is contained in:
zoey 2025-05-28 12:33:51 -04:00
parent 0c30b1ed0d
commit 283241b727
Signed by: zoey
GPG key ID: 81FB9FECDD6A33E2
5 changed files with 67 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/home/apps/tools/git/default.nix
View file

@ -13,7 +13,7 @@ in {
enable = mkBoolOpt false "Enable Git Integration";
signByDefault = mkBoolOpt true "Sign by default";
signingKey = mkStringOpt "EE8A2B709E2401D1" "The KeyID of your GPG signingKey";
signingKey = mkStringOpt "81FB9FECDD6A33E2" "The KeyID of your GPG signingKey";
};
config = mkIf cfg.enable {

2
modules/home/shells/fish/default.nix
View file

@ -16,7 +16,7 @@ in {
config = mkIf cfg.enable {
programs.fish = {
enable = true;
generateCompletions = true;
generateCompletions = false;
interactiveShellInit = ''
set -gx LC_ALL en_US.UTF-8
set -gx SSH_AUTH_SOCK /run/user/1000/keyring/ssh

19
systems/x86_64-linux/earth/default.nix
View file

@ -142,8 +142,7 @@
boot.loader.efi.canTouchEfiVariables = true;
networking.hostName = "earth"; # Define your hostname.
networking.extraHosts = "127.0.0.1 local-cald.io";
networking.hostId = "a2a8bfcc";
networking.networkmanager = {
enable = true;
@ -183,16 +182,26 @@
hardware.bluetooth.powerOnBoot = true;
services.blueman.enable = true;
services.wg.enable = true;
services.wg.enable = false;
# home-manager.useGlobalPkgs = false;
environment.systemPackages = [
pkgs.sbctl
pkgs.kdiskmark
pkgs.mangohud
(pkgs.shadps4.overrideAttrs {
version = "0.9.0";
src = pkgs.fetchFromGitHub {
owner = "AzaharPlus";
repo = "shadPS4Plus";
tag = "SHADPS4PLUS_0_9_0_A";
hash = "sha256-ZwP+bOE4roWt51Ii53blDZzdq/SxK4Q69I4rLCNARLA=";
fetchSubmodules = true;
};
})
(pkgs.lutris.override {
extraPkgs = pkgs: [
inputs.nix-gaming.packages.${pkgs.system}.wine-tkg-zoey
pkgs.winetricks
];
})
@ -256,7 +265,7 @@
openFirewall = true;
settings = {
"SteamLibrary" = {
path = "/mnt/bk"; # Update this path to your drive's mount point
path = "/mnt/zbk"; # Update this path to your drive's mount point
browseable = true;
writable = true;
guestOk = true; # Allow access without authentication

90
systems/x86_64-linux/earth/disk-config.nix
View file

@ -1,7 +1,7 @@
{
disko.devices = {
disk = {
root = {
main = {
type = "disk";
device = "/dev/nvme0n1";
content = {
@ -14,7 +14,7 @@
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = ["nofail"];
mountOptions = ["umask=0077" "nofail"];
};
};
zfs = {
@ -33,11 +33,11 @@
content = {
type = "gpt";
partitions = {
zfs = {
zbk = {
size = "100%";
content = {
type = "zfs";
pool = "zbackup";
pool = "zbk";
};
};
};
@ -45,59 +45,71 @@
};
};
zpool = {
zroot = {
zbk = {
type = "zpool";
rootFsOptions = {
mountpoint = "none";
compression = "zstd";
acltype = "posixacl";
atime = "off";
compression = "zstd";
mountpoint = "none";
xattr = "sa";
"com.sun:auto-snapshot" = "true";
autotrim = "on";
};
options.ashift = "12";
datasets = {
"root" = {
type = "zfs_fs";
mountpoint = "/";
};
"root/nix" = {
type = "zfs_fs";
options.mountpoint = "/nix";
mountpoint = "/nix";
};
# README MORE: https://wiki.archlinux.org/title/ZFS#Swap_volume
"root/swap" = {
type = "zfs_volume";
size = "32G";
content = {
type = "swap";
};
options = {
volblocksize = "4096";
compression = "zle";
logbias = "throughput";
sync = "always";
primarycache = "metadata";
secondarycache = "none";
"com.sun:auto-snapshot" = "false";
};
datasets = {
"zbk" = {
type = "zfs_fs";
options.mountpoint = "none";
};
"zbk/zbk" = {
type = "zfs_fs";
mountpoint = "/mnt/zbk";
options."sharesmb" = "on";
# Used by services.zfs.autoSnapshot options.
options."com.sun:auto-snapshot" = "true";
};
};
};
zbackup = {
zroot = {
type = "zpool";
rootFsOptions = {
mountpoint = "none";
compression = "zstd";
# https://wiki.archlinux.org/title/Install_Arch_Linux_on_ZFS
acltype = "posixacl";
atime = "off";
compression = "zstd";
mountpoint = "none";
xattr = "sa";
autotrim = "on";
};
options.ashift = "12";
datasets = {
"root" = {
"local" = {
type = "zfs_fs";
mountpoint = "/mnt/zbk";
options.mountpoint = "none";
};
"local/home" = {
type = "zfs_fs";
mountpoint = "/home";
# Used by services.zfs.autoSnapshot options.
options."com.sun:auto-snapshot" = "true";
};
"local/nix" = {
type = "zfs_fs";
mountpoint = "/nix";
options."com.sun:auto-snapshot" = "false";
};
"local/persist" = {
type = "zfs_fs";
mountpoint = "/persist";
options."com.sun:auto-snapshot" = "false";
};
"local/root" = {
type = "zfs_fs";
mountpoint = "/";
options."com.sun:auto-snapshot" = "false";
postCreateHook = "zfs list -t snapshot -H -o name | grep -E '^zroot/local/root@blank$' || zfs snapshot zroot/local/root@blank";
};
};
};

23
systems/x86_64-linux/earth/hardware-configuration.nix
View file

@ -17,29 +17,6 @@
boot.kernelModules = ["kvm-amd" "ntsync"];
boot.extraModulePackages = [];
fileSystems."/" = {
device = "/dev/disk/by-uuid/ad6fa764-31b2-4dfd-9fc7-f2638c2e2e5e";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/AACF-2693";
fsType = "vfat";
options = ["fmask=0077" "dmask=0077"];
};
fileSystems."/mnt/bk" = {
device = "/dev/disk/by-partuuid/f352c9b5-2207-4313-bcb4-ba0491de72fe";
fsType = "ext4";
options = [
"auto" # Mount at boot
];
};
swapDevices = [
{device = "/dev/disk/by-uuid/5c74e955-26c7-4f71-9b48-975a89b1d5ec";}
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction