ran nixfmt to standardize formatting

This commit is contained in:
Aly Raffauf 2024-03-24 19:44:09 -04:00
parent a3257404ad
commit b41949543e
20 changed files with 283 additions and 289 deletions

View file

@ -28,17 +28,17 @@
}; };
nixConfig = { nixConfig = {
extra-substituters = [ extra-substituters = [ "https://nixcache.raffauflabs.com" ];
"https://nixcache.raffauflabs.com"
];
extra-trusted-public-keys = [ extra-trusted-public-keys = [
"nixcache.raffauflabs.com:yFIuJde/izA4aUDI3MZmBLzynEsqVCT1OfCUghOLlt8=" "nixcache.raffauflabs.com:yFIuJde/izA4aUDI3MZmBLzynEsqVCT1OfCUghOLlt8="
]; ];
}; };
outputs = inputs@{ nixpkgs, home-manager, nixpkgs-unstable, home-manager-unstable, nixos-hardware, ... }: { outputs = inputs@{ nixpkgs, home-manager, nixpkgs-unstable
, home-manager-unstable, nixos-hardware, ... }: {
homeConfigurations."aly" = home-manager-unstable.lib.homeManagerConfiguration { homeConfigurations."aly" =
home-manager-unstable.lib.homeManagerConfiguration {
pkgs = import nixpkgs-unstable { system = "x86_64-linux"; }; pkgs = import nixpkgs-unstable { system = "x86_64-linux"; };
modules = [ ./home/aly.nix ]; modules = [ ./home/aly.nix ];
}; };

View file

@ -28,7 +28,7 @@ listener {
on-resume = hyprctl dispatch dpms on # screen on when activity is detected after timeout has fired. on-resume = hyprctl dispatch dpms on # screen on when activity is detected after timeout has fired.
} }
# listener { listener {
# timeout = 600 # 30min timeout = 600 # 30min
# on-timeout = systemctl suspend # suspend pc on-timeout = [[ $(hostname) != "mauville" ]] && systemctl suspend # suspend pc unless on mauville
# } }

View file

@ -6,9 +6,7 @@
enable = true; enable = true;
xkb.layout = "us"; xkb.layout = "us";
xkb.variant = ""; xkb.variant = "";
excludePackages = with pkgs; [ excludePackages = with pkgs; [ xterm ];
xterm
];
}; };
## Needed for Flatpaks ## Needed for Flatpaks

View file

@ -1,8 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = imports = [ # Include X settings.
[ # Include X settings.
../desktop.nix ../desktop.nix
]; ];

View file

@ -4,7 +4,8 @@
# Need to change the order pam loads its modules # Need to change the order pam loads its modules
# to get proper fingerprint behavior on GDM and the lockscreen. # to get proper fingerprint behavior on GDM and the lockscreen.
security.pam.services.login.fprintAuth = false; security.pam.services.login.fprintAuth = false;
security.pam.services.gdm-fingerprint = lib.mkIf (config.services.fprintd.enable) { security.pam.services.gdm-fingerprint =
lib.mkIf (config.services.fprintd.enable) {
text = '' text = ''
auth required pam_shells.so auth required pam_shells.so
auth requisite pam_nologin.so auth requisite pam_nologin.so

View file

@ -4,14 +4,14 @@
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
gnome = prev.gnome.overrideScope (gnomeFinal: gnomePrev: { gnome = prev.gnome.overrideScope (gnomeFinal: gnomePrev: {
mutter = gnomePrev.mutter.overrideAttrs ( old: { mutter = gnomePrev.mutter.overrideAttrs (old: {
src = pkgs.fetchgit { src = pkgs.fetchgit {
url = "https://gitlab.gnome.org/vanvugt/mutter.git"; url = "https://gitlab.gnome.org/vanvugt/mutter.git";
# GNOME 45: triple-buffering-v4-45 # GNOME 45: triple-buffering-v4-45
rev = "0b896518b2028d9c4d6ea44806d093fd33793689"; rev = "0b896518b2028d9c4d6ea44806d093fd33793689";
sha256 = "sha256-mzNy5GPlB2qkI2KEAErJQzO//uo8yO0kPQUwvGDwR4w="; sha256 = "sha256-mzNy5GPlB2qkI2KEAErJQzO//uo8yO0kPQUwvGDwR4w=";
}; };
} ); });
}); });
}) })
]; ];

View file

@ -45,7 +45,10 @@
virtualHosts."nixcache.raffauflabs.com" = { virtualHosts."nixcache.raffauflabs.com" = {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
locations."/".proxyPass = "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}"; locations."/".proxyPass =
"http://${config.services.nix-serve.bindAddress}:${
toString config.services.nix-serve.port
}";
}; };
virtualHosts."plex.raffauflabs.com" = { virtualHosts."plex.raffauflabs.com" = {

View file

@ -3,17 +3,14 @@
{ {
virtualisation.oci-containers.containers = { virtualisation.oci-containers.containers = {
audiobookshelf = { audiobookshelf = {
ports = ["0.0.0.0:13378:80"]; ports = [ "0.0.0.0:13378:80" ];
image = "ghcr.io/advplyr/audiobookshelf:latest"; image = "ghcr.io/advplyr/audiobookshelf:latest";
environment = { TZ = "America/New_York"; }; environment = { TZ = "America/New_York"; };
volumes = [ volumes =
"abs_config:/config" [ "abs_config:/config" "abs_metadata:/metadata" "/mnt/Media:/Media" ];
"abs_metadata:/metadata"
"/mnt/Media:/Media"
];
}; };
plex-server = { plex-server = {
ports = ["0.0.0.0:32400:32400"]; ports = [ "0.0.0.0:32400:32400" ];
image = "plexinc/pms-docker:public"; image = "plexinc/pms-docker:public";
environment = { TZ = "America/New_York"; }; environment = { TZ = "America/New_York"; };
volumes = [ volumes = [
@ -24,7 +21,7 @@
]; ];
}; };
transmission-server = { transmission-server = {
ports = ["0.0.0.0:9091:9091" "0.0.0.0:51413:51413"]; ports = [ "0.0.0.0:9091:9091" "0.0.0.0:51413:51413" ];
image = "linuxserver/transmission:latest"; image = "linuxserver/transmission:latest";
environment = { environment = {
PGID = "1000"; PGID = "1000";
@ -38,7 +35,7 @@
]; ];
}; };
jellyfin = { jellyfin = {
ports = ["0.0.0.0:8096:8096"]; ports = [ "0.0.0.0:8096:8096" ];
image = "jellyfin/jellyfin"; image = "jellyfin/jellyfin";
environment = { TZ = "America/New_York"; }; environment = { TZ = "America/New_York"; };
volumes = [ volumes = [

View file

@ -5,9 +5,7 @@
virtualisation = { virtualisation = {
libvirtd.enable = true; libvirtd.enable = true;
oci-containers = { oci-containers = { backend = "podman"; };
backend = "podman";
};
podman = { podman = {
# Required for containers under podman-compose to be able to talk to each other. # Required for containers under podman-compose to be able to talk to each other.
defaultNetwork.settings.dns_enabled = true; defaultNetwork.settings.dns_enabled = true;

View file

@ -1,8 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = imports = [ # Include X settings.
[ # Include X settings.
./desktop.nix ./desktop.nix
]; ];
@ -28,8 +27,8 @@
environment.sessionVariables.NIXOS_OZONE_WL = "1"; environment.sessionVariables.NIXOS_OZONE_WL = "1";
programs.kdeconnect.enable = true; programs.kdeconnect.enable = true;
# nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true; # nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true;
# nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-features=WaylandWindowDecorations --ozone-platform-hint=auto"; # nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-features=WaylandWindowDecorations --ozone-platform-hint=auto";
services.gnome.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
security.pam.services.sddm.enableGnomeKeyring = true; security.pam.services.sddm.enableGnomeKeyring = true;
} }

View file

@ -4,7 +4,9 @@
hardware.steam-hardware.enable = true; hardware.steam-hardware.enable = true;
programs.steam = { programs.steam = {
enable = true; enable = true;
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play remotePlay.openFirewall =
dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server true; # Open ports in the firewall for Steam Remote Play
dedicatedServer.openFirewall =
true; # Open ports in the firewall for Source Dedicated Server
}; };
} }

View file

@ -1,14 +1,11 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = imports = [ # Include X settings.
[ # Include X settings.
./desktop.nix ./desktop.nix
]; ];
services.xserver.displayManager = { services.xserver.displayManager = { sessionPackages = [ pkgs.sway ]; };
sessionPackages = [ pkgs.sway ];
};
programs.light.enable = true; # Brightness and volume control. programs.light.enable = true; # Brightness and volume control.
programs.dconf.enable = true; programs.dconf.enable = true;