Compare commits

..

No commits in common. "089cef5e37c222210e345e23d1a5c3af803394f5" and "29431eded802296f4f63da22bc1013f2bf781d95" have entirely different histories.

9 changed files with 23 additions and 106 deletions

45
flake.lock generated
View File

@ -8,11 +8,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1752784378, "lastModified": 1751641756,
"narHash": "sha256-/SCDPErJkEuKEdZjj9wwyq4otLeyGMU4pe51saRABno=", "narHash": "sha256-5fXKpa5iVpsnsHUhiqMQ1gXdOGwEKc61fXhaMZn7Gb4=",
"owner": "AtaraxiaSjel", "owner": "AtaraxiaSjel",
"repo": "nur", "repo": "nur",
"rev": "b8efe256d1eba2247ef98b1cc49cf0bab32531d7", "rev": "73e0fbc32ab305d50b84ab351c31604f003b50a8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1077,7 +1077,6 @@
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"quadlet-nix": "quadlet-nix", "quadlet-nix": "quadlet-nix",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"spicetify-nix": "spicetify-nix",
"srvos": "srvos", "srvos": "srvos",
"walker": "walker" "walker": "walker"
} }
@ -1123,27 +1122,6 @@
"type": "github" "type": "github"
} }
}, },
"spicetify-nix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_4"
},
"locked": {
"lastModified": 1752381641,
"narHash": "sha256-R2iDZb94RosuCeuIukacZVVXxzWYr4jn/QI/ax15nW8=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
"rev": "8f9fd947c52aa6adb6bafe72516eccf186708954",
"type": "github"
},
"original": {
"owner": "Gerg-L",
"repo": "spicetify-nix",
"type": "github"
}
},
"srvos": { "srvos": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -1210,21 +1188,6 @@
} }
}, },
"systems_4": { "systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_5": {
"locked": { "locked": {
"lastModified": 1689347949, "lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@ -1262,7 +1225,7 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_5" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1752655476, "lastModified": 1752655476,

View File

@ -65,10 +65,6 @@
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
spicetify-nix = {
url = "github:Gerg-L/spicetify-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
srvos = { srvos = {
url = "github:nix-community/srvos"; url = "github:nix-community/srvos";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

View File

@ -13,7 +13,6 @@ let
cfgOcis = config.services.ocis; cfgOcis = config.services.ocis;
in in
{ {
environment.systemPackages = [ pkgs.sing-box-extended ];
# Tailscale exit-node # Tailscale exit-node
services.tailscale = { services.tailscale = {
enable = true; enable = true;

View File

@ -2,49 +2,24 @@
config, config,
lib, lib,
pkgs, pkgs,
inputs,
... ...
}: }:
let let
inherit (lib) mkEnableOption mkIf; inherit (lib) getExe mkEnableOption mkIf;
cfg = config.ataraxia.programs.spotify; cfg = config.ataraxia.programs.spotify;
spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.hostPlatform.system};
in in
{ {
imports = [ inputs.spicetify-nix.homeManagerModules.default ];
options.ataraxia.programs.spotify = { options.ataraxia.programs.spotify = {
enable = mkEnableOption "Enable spotify program"; enable = mkEnableOption "Enable spotify program";
spicetify = mkEnableOption "Enable spicetify module" // {
default = true;
};
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.spicetify = mkIf cfg.spicetify { home.packages = with pkgs; [
enable = true; spotifywm
experimentalFeatures = true;
enabledExtensions = with spicePkgs.extensions; [
adblockify
hidePodcasts
shuffle
];
theme = spicePkgs.themes.catppuccin;
colorScheme = if config ? catppuccin then config.catppuccin.flavor else "mocha";
windowManagerPatch = true;
};
home.packages = mkIf (!cfg.spicetify) [
pkgs.spotifywm
]; ];
defaultApplications.spotify = { defaultApplications.spotify = {
cmd = cmd = getExe pkgs.spotifywm;
if cfg.spicetify then
"${config.programs.spicetify.spicedSpotify}/bin/spotify"
else
"${pkgs.spotifywm}/bin/spotify";
desktop = "spotify"; desktop = "spotify";
}; };

View File

@ -32,7 +32,7 @@ in
}; };
imports = [ imports = [
inputs.nix-index-database.homeModules.nix-index inputs.nix-index-database.hmModules.nix-index
]; ];
config = config =

View File

@ -16,10 +16,11 @@ in
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.corectrl.enable = true; programs.corectrl = {
enable = true;
hardware.amdgpu.overdrive.enable = true; gpuOverclock.enable = true;
# hardware.amdgpu.overdrive.ppfeaturemask = "0xffffffff"; # gpuOverclock.ppfeaturemask = "0xffffffff";
};
home-manager = mkIf useHomeManager { home-manager = mkIf useHomeManager {
users.${defaultUser} = { users.${defaultUser} = {

View File

@ -28,6 +28,7 @@ let
"0.0.0.0:7000:7000" "0.0.0.0:7000:7000"
"0.0.0.0:7000:7000/udp" "0.0.0.0:7000:7000/udp"
]; ];
pod-dns = "10.10.10.1";
in in
{ {
imports = [ imports = [
@ -66,6 +67,7 @@ in
virtualisation.quadlet.pods.media-stack = { virtualisation.quadlet.pods.media-stack = {
podConfig = { podConfig = {
dns = [ pod-dns ];
networks = [ networks.br-services.ref ]; networks = [ networks.br-services.ref ];
publishPorts = open-ports; publishPorts = open-ports;
}; };

View File

@ -6,12 +6,7 @@
... ...
}: }:
let let
inherit (lib) inherit (lib) mkEnableOption mkIf optionals;
mapAttrs
mkEnableOption
mkIf
optionals
;
cfg = config.ataraxia.virtualisation; cfg = config.ataraxia.virtualisation;
defaultUser = config.ataraxia.defaults.users.defaultUser; defaultUser = config.ataraxia.defaults.users.defaultUser;
@ -80,13 +75,14 @@ in
spiceUSBRedirection.enable = cfg.libvirt; spiceUSBRedirection.enable = cfg.libvirt;
quadlet = { quadlet = {
enable = cfg.podman; enable = true;
autoEscape = true; autoEscape = true;
autoUpdate.enable = false; autoUpdate.enable = false;
networks = { networks = {
br-services.networkConfig = { br-services.networkConfig = {
disableDns = false; # TODO: enable dns, fix dns resolution
dns = [ "10.10.10.1" ]; # dns = [ "10.10.10.1" ];
disableDns = true;
driver = "bridge"; driver = "bridge";
ipamDriver = "host-local"; ipamDriver = "host-local";
ipv6 = false; ipv6 = false;
@ -114,22 +110,7 @@ in
]; ];
}; };
networking.firewall = { networking.firewall.trustedInterfaces = mkIf cfg.libvirt [ "virbr0" ];
trustedInterfaces = mkIf cfg.libvirt [ "virbr0" ];
interfaces =
{
"podman*".allowedUDPPorts = mkIf cfg.podman [
53
5353
];
}
// mapAttrs (_: _: {
allowedUDPPorts = [
53
5353
];
}) config.virtualisation.quadlet.networks;
};
security.unprivilegedUsernsClone = true; security.unprivilegedUsernsClone = true;

View File

@ -42,7 +42,7 @@ in
# youtube-to-mpv = prev.callPackage ./packages/youtube-to-mpv.nix { term = config.defaultApplications.term.cmd; }; # youtube-to-mpv = prev.callPackage ./packages/youtube-to-mpv.nix { term = config.defaultApplications.term.cmd; };
# yt-archivist = prev.callPackage ./packages/yt-archivist { }; # yt-archivist = prev.callPackage ./packages/yt-archivist { };
yt-dlp = unstable.yt-dlp; yt-dlp = unstable.yt-dlp;
sing-box = final.sing-box-extended; sing-box = unstable.sing-box;
wine = prev.wineWow64Packages.stagingFull; wine = prev.wineWow64Packages.stagingFull;
# Patch spotify with spotx # Patch spotify with spotx