macronova/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Enable RetroArch on Steam Deck

Browse source
This commit is contained in:
Invariantspace 2024-03-03 00:11:51 -08:00
parent 202e5c098a
commit 8534c96c66
17 changed files with 127 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

39
common/constants.nix
View file

@ -16,13 +16,6 @@ with lib; {
The home directory for the default user. The home directory for the default user.
''; '';
}; };
wildcard = mkOption {
type = types.str;
default = "0.0.0.0";
description = ''
The localhost address.
'';
};
localhost = mkOption { localhost = mkOption {
type = types.str; type = types.str;
default = "127.0.0.1"; default = "127.0.0.1";
@ -52,6 +45,13 @@ with lib; {
The post master email address. The post master email address.
''; '';
}; };
privateKeyFiles = mkOption {
type = types.listOf types.str;
default = if config.services.openssh.enable then builtins.map (key: key.path) config.services.openssh.hostKeys else [ "/root/.ssh/${config.networking.hostName}" ];
description = ''
The private key files for sops.
'';
};
publicKeys = mkOption { publicKeys = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = [ default = [
@ -61,13 +61,6 @@ with lib; {
The public keys for SSH authentication. The public keys for SSH authentication.
''; '';
}; };
privateKeyFiles = mkOption {
type = types.listOf types.str;
default = if config.services.openssh.enable then builtins.map (key: key.path) config.services.openssh.hostKeys else [ "/root/.ssh/${config.networking.hostName}" ];
description = ''
The private key files for sops.
'';
};
sopsFile = mkOption { sopsFile = mkOption {
type = types.path; type = types.path;
default = ./secrets.yaml; default = ./secrets.yaml;
@ -75,6 +68,17 @@ with lib; {
The secrets file for device. The secrets file for device.
''; '';
}; };
syncthingDevices = mkOption {
type = types.attrsOf (types.attrsOf types.str);
default = {
blitzar.id = "KGCBCIZ-GG6KMQ2-FLK5BWW-GLCEDML-5LCI24S-UKO5UWL-HWNCPYX-ZWWD5AQ";
nebula.id = "NJXA5XS-2PSWECD-UHBV7JH-IR2RSWY-PRUPFTZ-AHL7IN6-RXSLZKB-2FUNRQH";
protostar.id = "MEEIJ3F-NYIB55Y-SDCWCLX-6XOR6YU-OQO477W-JAPG6F6-LRBGBGG-FENYPQE";
};
description = ''
The device information for syncthing
'';
};
userName = mkOption { userName = mkOption {
type = types.str; type = types.str;
default = "macronova"; default = "macronova";
@ -82,5 +86,12 @@ with lib; {
The username across all devices. The username across all devices.
''; '';
}; };
wildcard = mkOption {
type = types.str;
default = "0.0.0.0";
description = ''
The localhost address.
'';
};
}; };
} }

10
common/users.nix
View file

@ -1,6 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
home = config.constants.homeDir;
usr = config.constants.userName; usr = config.constants.userName;
usrPwdFile = "users/${usr}/password"; usrPwdFile = "users/${usr}/password";
in in
@ -89,6 +90,15 @@ in
}; };
}; };
resolved.enable = true; resolved.enable = true;
syncthing = {
configDir = "${home}/.config/syncthing";
dataDir = "${home}/.local/share/syncthing";
openDefaultPorts = true;
overrideDevices = true;
overrideFolders = true;
settings.devices = config.constants.syncthingDevices;
user = usr;
};
}; };
sops.secrets.${usrPwdFile}.neededForUsers = true; sops.secrets.${usrPwdFile}.neededForUsers = true;

36
flake.lock generated
View file

@ -21,11 +21,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1709286488, "lastModified": 1709439398,
"narHash": "sha256-RDpTZ72zLu05djvXRzK76Ysqp9zSdh84ax/edEaJucs=", "narHash": "sha256-MW0zp3ta7SvdpjvhVCbtP20ewRwQZX2vRFn14gTc4Kg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "bde7dd352c07d43bd5b8245e6c39074a391fdd46", "rev": "1f76b318aa11170c8ca8c225a9b4c458a5fcbb57",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -70,11 +70,11 @@
}, },
"hardware": { "hardware": {
"locked": { "locked": {
"lastModified": 1709147990, "lastModified": 1709410583,
"narHash": "sha256-vpXMWoaCtMYJ7lisJedCRhQG9BSsInEyZnnG5GfY9tQ=", "narHash": "sha256-esOSUoQ7mblwcsSea0K17McZuwAIjoS6dq/4b83+lvw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "33a97b5814d36ddd65ad678ad07ce43b1a67f159", "rev": "59e37017b9ed31dee303dbbd4531c594df95cfbc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -88,11 +88,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1709204054, "lastModified": 1709485962,
"narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=", "narHash": "sha256-rmFB4uE10+LJbcVE4ePgiuHOBlUIjQOeZt4VQVJTU8M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f3367769a93b226c467551315e9e270c3f78b15", "rev": "d579633ff9915a8f4058d5c439281097e92380a8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -253,11 +253,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1708819810, "lastModified": 1709428628,
"narHash": "sha256-1KosU+ZFXf31GPeCBNxobZWMgHsSOJcrSFA6F2jhzdE=", "narHash": "sha256-//ZCCnpVai/ShtO2vPjh3AWgo8riXCaret6V9s7Hew4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "89a2a12e6c8c6a56c72eb3589982c8e2f89c70ea", "rev": "66d65cb00b82ffa04ee03347595aa20e41fe3555",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -364,11 +364,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1708751719, "lastModified": 1709356872,
"narHash": "sha256-0uWOKSpXJXmXswOvDM5Vk3blB74apFB6rNGWV5IjoN0=", "narHash": "sha256-mvxCirJbtkP0cZ6ABdwcgTk0u3bgLoIoEFIoYBvD6+4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f63ce824cd2f036216eb5f637dfef31e1a03ee89", "rev": "458b097d81f90275b3fdf03796f0563844926708",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -397,11 +397,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1708987867, "lastModified": 1709434911,
"narHash": "sha256-k2lDaDWNTU5sBVHanYzjDKVDmk29RHIgdbbXu5sdzBA=", "narHash": "sha256-UN47hQPM9ijwoz7cYq10xl19hvlSP/232+M5vZDOMs4=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "a1c8de14f60924fafe13aea66b46157f0150f4cf", "rev": "075df9d85ee70cfb53e598058045e1738f05e273",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
linux/blitzar/default.nix
View file

@ -4,7 +4,7 @@
imports = with inputs; [ imports = with inputs; [
disko.nixosModules.default disko.nixosModules.default
hardware.nixosModules.asus-zephyrus-ga402 hardware.nixosModules.asus-zephyrus-ga402
] ++ [ ../../common
./audio.nix ./audio.nix
./configuration.nix ./configuration.nix
./device.nix ./device.nix
@ -16,6 +16,5 @@
./syncthing.nix ./syncthing.nix
./tailscale.nix ./tailscale.nix
./zfs.nix ./zfs.nix
../../common
]; ];
} }

1
linux/blitzar/gui.nix
View file

@ -5,7 +5,6 @@ let usr = config.constants.userName; in {
let xdgCfg = config.xdg; in { let xdgCfg = config.xdg; in {
gtk = { gtk = {
enable = true; enable = true;
gtk2.configLocation = "${xdgCfg.configHome}/gtk-2.0/gtkrc";
theme = { theme = {
name = "Sweet-Dark"; name = "Sweet-Dark";
package = pkgs.sweet; package = pkgs.sweet;

28
linux/blitzar/syncthing.nix
View file

@ -1,28 +1,14 @@
{ config, ... }: { ... }:
{ {
services.syncthing = let home = config.constants.homeDir; in { services.syncthing = {
enable = true; enable = true;
configDir = "${home}/.config/syncthing"; settings.folders.music = {
dataDir = "${home}/.local/share/syncthing"; enable = true;
openDefaultPorts = true; devices = [ "nebula" ];
overrideDevices = true; path = "~/Music";
overrideFolders = true; type = "sendonly";
settings = let media = "nebula"; in {
devices.${media} = {
name = media;
id = "NJXA5XS-2PSWECD-UHBV7JH-IR2RSWY-PRUPFTZ-AHL7IN6-RXSLZKB-2FUNRQH";
};
folders.music = {
enable = true;
devices = [ media ];
id = "Music";
label = "Music";
path = "~/Music";
type = "sendonly";
};
}; };
user = config.constants.userName;
}; };
} }

3
linux/comet/default.nix
View file

@ -3,11 +3,10 @@
{ {
imports = with inputs; [ imports = with inputs; [
hardware.nixosModules.common-cpu-intel hardware.nixosModules.common-cpu-intel
] ++ [ ../../common
./configuration.nix ./configuration.nix
./hardware-configuration.nix ./hardware-configuration.nix
./network.nix ./network.nix
./tailscale.nix ./tailscale.nix
../../common
]; ];
} }

3
linux/nebula/default.nix
View file

@ -5,7 +5,7 @@
disko.nixosModules.default disko.nixosModules.default
hardware.nixosModules.common-cpu-amd hardware.nixosModules.common-cpu-amd
hardware.nixosModules.common-cpu-amd-pstate hardware.nixosModules.common-cpu-amd-pstate
] ++ [ ../../common
./conduit.nix ./conduit.nix
./configuration.nix ./configuration.nix
./disko.nix ./disko.nix
@ -16,6 +16,5 @@
./syncthing.nix ./syncthing.nix
./tailscale.nix ./tailscale.nix
./zfs.nix ./zfs.nix
../../common
]; ];
} }

1
linux/nebula/network.nix
View file

@ -9,7 +9,6 @@
wifi.backend = "iwd"; wifi.backend = "iwd";
}; };
nftables.enable = true; nftables.enable = true;
tempAddresses = "disabled";
wireless.iwd.enable = true; wireless.iwd.enable = true;
}; };
services.openssh.enable = true; services.openssh.enable = true;

28
linux/nebula/syncthing.nix
View file

@ -1,27 +1,13 @@
{ config, ... }: { ... }:
{ {
services.syncthing = let home = config.constants.homeDir; in { services.syncthing = {
enable = true; enable = true;
configDir = "${home}/.config/syncthing"; settings.folders.music = {
dataDir = "${home}/.local/share/syncthing"; enable = true;
openDefaultPorts = true; devices = [ "blitzar" ];
overrideDevices = true; path = "~/Music";
overrideFolders = true; type = "receiveonly";
settings = let pc = "blitzar"; in {
devices.${pc} = {
name = pc;
id = "KGCBCIZ-GG6KMQ2-FLK5BWW-GLCEDML-5LCI24S-UKO5UWL-HWNCPYX-ZWWD5AQ";
};
folders.music = {
enable = true;
devices = [ pc ];
id = "Music";
label = "Music";
path = "~/Music";
type = "receiveonly";
};
}; };
user = config.constants.userName;
}; };
} }

11
linux/protostar/configuration.nix
View file

@ -6,10 +6,13 @@
{ {
# Configuration boot # Configuration boot
boot.loader = { boot = {
efi.canTouchEfiVariables = true; initrd.systemd.enable = true;
systemd-boot.enable = true; loader = {
timeout = 0; efi.canTouchEfiVariables = true;
systemd-boot.enable = true;
timeout = 0;
};
}; };
# Change secrets file # Change secrets file

4
linux/protostar/default.nix
View file

@ -4,15 +4,15 @@
imports = with inputs; [ imports = with inputs; [
disko.nixosModules.default disko.nixosModules.default
jovian.nixosModules.default jovian.nixosModules.default
] ++ [ ../../common
./configuration.nix ./configuration.nix
./disko.nix ./disko.nix
./gui.nix ./gui.nix
./hardware-configuration.nix ./hardware-configuration.nix
./locale.nix
./network.nix ./network.nix
./syncthing.nix ./syncthing.nix
./tailscale.nix ./tailscale.nix
./zfs.nix ./zfs.nix
../../common
]; ];
} }

28
linux/protostar/gui.nix
View file

@ -1,18 +1,30 @@
{ config, ... }: { config, inputs, pkgs, ... }:
let usr = config.constants.userName; in { let
usr = config.constants.userName;
jovianPkgs = pkgs.extend inputs.jovian.overlays.default;
in
{
home-manager.users.${usr}.home.packages = with jovianPkgs; [
(retroarch.override {
cores = with libretro; [
pcsx2
ppsspp
];
})
yuzu
];
jovian = { jovian = {
decky-loader = {
enable = true;
user = usr;
};
devices.steamdeck.enable = true; devices.steamdeck.enable = true;
steam = { steam = {
enable = true; enable = true;
autoStart = true; autoStart = true;
desktopSession = "plasma"; desktopSession = "gamescope-wayland";
user = usr; user = usr;
}; };
}; };
services.xserver = {
enable = true;
desktopManager.plasma6.enable = true;
};
} }

16
linux/protostar/locale.nix Normal file
View file

@ -0,0 +1,16 @@
{ pkgs, ... }:
{
# Configure default fonts
fonts = {
fontconfig.defaultFonts = {
serif = [ "Noto Serif" "Noto Serif CJK SC" ];
sansSerif = [ "Inter" "Noto Sans CJK SC" ];
monospace = [ "Iosevka" "Noto Sans Mono CJK SC" ];
};
packages = with pkgs; [
sarasa-gothic
noto-fonts-emoji
];
};
}

9
linux/protostar/network.nix
View file

@ -1,10 +1,15 @@
{ ... }: { config, ... }:
{ {
networking = { networking = {
firewall.trustedInterfaces = [ config.services.tailscale.interfaceName ];
hostId = "74247225"; hostId = "74247225";
networkmanager.enable = true; networkmanager = {
enable = true;
wifi.backend = "iwd";
};
nftables.enable = true; nftables.enable = true;
wireless.iwd.enable = true;
}; };
services.openssh.enable = true; services.openssh.enable = true;
} }

14
linux/protostar/syncthing.nix
View file

@ -1,18 +1,9 @@
{ config, ... }: { ... }:
{ {
services.syncthing = let home = config.constants.homeDir; in { services.syncthing = {
enable = true; enable = true;
configDir = "${home}/.config/syncthing";
dataDir = "${home}/.local/share/syncthing";
openDefaultPorts = true;
overrideDevices = true;
overrideFolders = true;
# settings = let pc = "blitzar"; in { # settings = let pc = "blitzar"; in {
# devices.${pc} = {
# name = pc;
# id = "KGCBCIZ-GG6KMQ2-FLK5BWW-GLCEDML-5LCI24S-UKO5UWL-HWNCPYX-ZWWD5AQ";
# };
# folders.music = { # folders.music = {
# enable = true; # enable = true;
# devices = [ pc ]; # devices = [ pc ];
@ -22,6 +13,5 @@
# type = "receiveonly"; # type = "receiveonly";
# }; # };
# }; # };
user = config.constants.userName;
}; };
} }

6
linux/singularity/default.nix
View file

@ -1,8 +1,9 @@
{ inputs, ... }: { inputs, ... }:
{ {
imports = [ imports = with inputs; [
inputs.mailserver.nixosModules.default mailserver.nixosModules.default
../../common
./caddy.nix ./caddy.nix
./configuration.nix ./configuration.nix
./hardware-configuration.nix ./hardware-configuration.nix
@ -10,6 +11,5 @@
./mailserver.nix ./mailserver.nix
./network.nix ./network.nix
./vaultwarden.nix ./vaultwarden.nix
../../common
]; ];
} }