diff --git a/deployNodes.nix b/deployNodes.nix index 6e3292c..a0fae5a 100644 --- a/deployNodes.nix +++ b/deployNodes.nix @@ -1,6 +1,5 @@ { nixosConfigurations, deploy-rs, ... }: -let - activateNixOS_x64_64-linux = deploy-rs.lib.x86_64-linux.activate.nixos; +let activateNixOS_x64_64-linux = deploy-rs.lib.x86_64-linux.activate.nixos; in { lappy = { hostname = "lappy.tailscale-internal.genderfucked.monster"; diff --git a/extras/laura-ssh-root.nix b/extras/laura-ssh-root.nix index d412cd2..9c1b44c 100644 --- a/extras/laura-ssh-root.nix +++ b/extras/laura-ssh-root.nix @@ -1,7 +1,7 @@ -{...}: { - users.users.root = { - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKWDArL4+m9kUmLyWcmUby5+CVrmBThP0KbQWep32+BF laura@zotan.network" - ]; - }; -} \ No newline at end of file +{ ... }: { + users.users.root = { + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKWDArL4+m9kUmLyWcmUby5+CVrmBThP0KbQWep32+BF laura@zotan.network" + ]; + }; +} diff --git a/flake.lock b/flake.lock index 28b42e6..7f321c8 100644 --- a/flake.lock +++ b/flake.lock @@ -52,38 +52,19 @@ "type": "github" } }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "home-manager-unstable": { "inputs": { - "flake-compat": "flake-compat_2", "nixpkgs": [ "nixpkgs-unstable" ], - "nmd": "nmd", - "nmt": "nmt", "utils": "utils_2" }, "locked": { - "lastModified": 1655858799, - "narHash": "sha256-Ws6BKlVuEVO29Ab3OEUfVLbWTECv/5Ax3yOMq/UeY0E=", + "lastModified": 1658751516, + "narHash": "sha256-Y/3dHoTjbvYBtWd+TTBQJUIgDPO9d+Gqt05C5dyR7E4=", "owner": "nix-community", "repo": "home-manager", - "rev": "06bb67ab24bd6e6c6d2bc97ecbcddd6c8b07ac18", + "rev": "dbed4c794d20d51027fc1107f063ec5be027dafc", "type": "github" }, "original": { @@ -94,7 +75,7 @@ }, "musicutil": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "nixpkgs": [ "nixpkgs-unstable" ], @@ -121,11 +102,11 @@ ] }, "locked": { - "lastModified": 1651916036, - "narHash": "sha256-UuD9keUGm4IuVEV6wdSYbuRm7CwfXE63hVkzKDjVsh4=", + "lastModified": 1657835815, + "narHash": "sha256-CnZszAYpNKydh6N7+xg+eRtWNVoAAGqc6bg+Lpgq1xc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "2f2bdf658d2b79bada78dc914af99c53cad37cba", + "rev": "54a24f042f93c79f5679f133faddedec61955cf2", "type": "github" }, "original": { @@ -153,11 +134,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1655770856, - "narHash": "sha256-GZRIyHjuCbOl0UA8ClKmyRxZkCQEh/rsvU0otH037BU=", + "lastModified": 1658346836, + "narHash": "sha256-c9BZZbi0tqCQ4j6CMVDlsut3Q3ET1Fezf+qIslCfkhs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63198c9ccefdbd337cef0d85db0ea2689f4ce418", + "rev": "a1fe662eb26ffc2a036b37c4670392ade632c413", "type": "github" }, "original": { @@ -169,11 +150,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1655624069, - "narHash": "sha256-7g1zwTdp35GMTERnSzZMWJ7PG3QdDE8VOX3WsnOkAtM=", + "lastModified": 1658737577, + "narHash": "sha256-xosJ5nJT9HX+b6UWsSX6R+ap4AdZOCrl/r+IKFp2ASQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0d68d7c857fe301d49cdcd56130e0beea4ecd5aa", + "rev": "5a0e0d73b944157328d54c4ded1cf2f0146a86a5", "type": "github" }, "original": { @@ -183,38 +164,6 @@ "type": "github" } }, - "nmd": { - "flake": false, - "locked": { - "lastModified": 1653339422, - "narHash": "sha256-RNLq09vfj21TyYuUCeD6BNTNC6Ew8bLhQULZytN4Xx8=", - "owner": "rycee", - "repo": "nmd", - "rev": "91dee681dd1c478d6040a00835d73c0f4a4c5c29", - "type": "gitlab" - }, - "original": { - "owner": "rycee", - "repo": "nmd", - "type": "gitlab" - } - }, - "nmt": { - "flake": false, - "locked": { - "lastModified": 1648075362, - "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=", - "owner": "rycee", - "repo": "nmt", - "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae", - "type": "gitlab" - }, - "original": { - "owner": "rycee", - "repo": "nmt", - "type": "gitlab" - } - }, "root": { "inputs": { "deploy-rs": "deploy-rs", diff --git a/home/apps/aegisub.nix b/home/apps/aegisub.nix index fdd6498..0f84900 100644 --- a/home/apps/aegisub.nix +++ b/home/apps/aegisub.nix @@ -1,6 +1,7 @@ -{pkgs, ...}: { - home.packages = with pkgs; [ - # NOINLINE - aegisub +{ pkgs, ... }: { + home.packages = with pkgs; + [ + # NOINLINE + aegisub ]; -} \ No newline at end of file +} diff --git a/home/apps/mullvad.nix b/home/apps/mullvad.nix index 24e3fe9..55f803e 100644 --- a/home/apps/mullvad.nix +++ b/home/apps/mullvad.nix @@ -1,3 +1 @@ -{pkgs, ...}: { - home.packages = with pkgs; [mullvad-vpn]; -} \ No newline at end of file +{ pkgs, ... }: { home.packages = with pkgs; [ mullvad-vpn ]; } diff --git a/home/base/nya.nix b/home/base/nya.nix index 6af5145..c91e287 100644 --- a/home/base/nya.nix +++ b/home/base/nya.nix @@ -1,4 +1,9 @@ { lib, ... }: { - home.file = - lib.mkMerge (map (x: { "${x}" = { text = "nyaa!~\n"; }; }) [ "girl" "boy" ]); + home.file = lib.mkMerge (map (x: { + "${x}" = { + text = '' + nyaa!~ + ''; + }; + }) [ "girl" "boy" ]); } diff --git a/home/dev/all/info.nix b/home/dev/all/info.nix index 0b70958..b1d7c75 100644 --- a/home/dev/all/info.nix +++ b/home/dev/all/info.nix @@ -1 +1,3 @@ -{ pkgs, ... }: { home.packages = with pkgs; [ neofetch inxi htop usbutils iotop ]; } +{ pkgs, ... }: { + home.packages = with pkgs; [ neofetch inxi htop usbutils iotop ]; +} diff --git a/home/gui/environments/gnome/default.nix b/home/gui/environments/gnome/default.nix index 6684ce5..bf28927 100644 --- a/home/gui/environments/gnome/default.nix +++ b/home/gui/environments/gnome/default.nix @@ -124,7 +124,7 @@ in { panel-in-overview = true; search = false; show-apps-button = true; - show-prefs-intro= false; + show-prefs-intro = false; theme = false; workspace = true; workspace-popup = false; diff --git a/home/programming/editors/sublime.nix b/home/programming/editors/sublime.nix index e9f03bd..132a996 100644 --- a/home/programming/editors/sublime.nix +++ b/home/programming/editors/sublime.nix @@ -1,3 +1 @@ -{pkgs,...}: { - home.packages = with pkgs; [sublime4]; -} +{ pkgs, ... }: { home.packages = with pkgs; [ sublime4 ]; } diff --git a/home/programming/editors/vscode.nix b/home/programming/editors/vscode.nix index 9757301..39ed24b 100644 --- a/home/programming/editors/vscode.nix +++ b/home/programming/editors/vscode.nix @@ -1,4 +1,5 @@ -{ config, pkgs, ... }: let +{ config, pkgs, ... }: +let configDir = "Code"; userDir = if pkgs.stdenv.hostPlatform.isDarwin then "$HOME/Library/Application Support/${configDir}/User" diff --git a/hosts/default.nix b/hosts/default.nix index adae80f..033fbf1 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -1,4 +1,4 @@ -{...}@inputs: { - nixosConfigurations = import ./nixos.nix inputs; - darwinConfigurations = import ./darwin.nix inputs; -} \ No newline at end of file +{ ... }@inputs: { + nixosConfigurations = import ./nixos.nix inputs; + darwinConfigurations = import ./darwin.nix inputs; +} diff --git a/hosts/hetzner-vm/services/mailserver/config.nix b/hosts/hetzner-vm/services/mailserver/config.nix index cca180e..8cd498f 100644 --- a/hosts/hetzner-vm/services/mailserver/config.nix +++ b/hosts/hetzner-vm/services/mailserver/config.nix @@ -1,9 +1,6 @@ { }: rec { fqdn = "mail.owo.monster"; - domains = [ - "owo.monster" - "kitteh.pw" - ]; + domains = [ "owo.monster" "kitteh.pw" ]; debug_mode = true; diff --git a/hosts/hetzner-vm/services/mailserver/opendkim.nix b/hosts/hetzner-vm/services/mailserver/opendkim.nix index 4856c61..d51eea3 100644 --- a/hosts/hetzner-vm/services/mailserver/opendkim.nix +++ b/hosts/hetzner-vm/services/mailserver/opendkim.nix @@ -71,6 +71,5 @@ in { PermissionsStartOnly = lib.mkForce false; }; }; - systemd.tmpfiles.rules = - [ "d '${keyDir}' - ${dkimUser} ${dkimGroup} - -" ]; + systemd.tmpfiles.rules = [ "d '${keyDir}' - ${dkimUser} ${dkimGroup} - -" ]; } diff --git a/hosts/hetzner-vm/services/mailserver/postfix.nix b/hosts/hetzner-vm/services/mailserver/postfix.nix index e080593..21c5c8f 100644 --- a/hosts/hetzner-vm/services/mailserver/postfix.nix +++ b/hosts/hetzner-vm/services/mailserver/postfix.nix @@ -135,7 +135,7 @@ in { smtpd_tls_exclude_ciphers = tls_disallow; smtp_tls_mandatory_exclude_ciphers = tls_disallow; smtpd_tls_mandatory_exclude_ciphers = tls_disallow; - + smtp_tls_ciphers = "high"; smtpd_tls_ciphers = "high"; smtp_tls_mandatory_ciphers = "high"; @@ -148,7 +148,10 @@ in { tls_random_source = "dev:/dev/urandom"; - smtpd_milters = [ "unix:/run/opendkim/opendkim.sock" "unix:/run/rspamd/rspamd-milter.sock" ]; + smtpd_milters = [ + "unix:/run/opendkim/opendkim.sock" + "unix:/run/rspamd/rspamd-milter.sock" + ]; non_smtpd_milters = [ "unix:/run/opendkim/opendkim.sock" ]; milter_protocol = "6"; diff --git a/hosts/hetzner-vm/services/mailserver/spam_sieve/report-ham.sieve b/hosts/hetzner-vm/services/mailserver/spam_sieve/report-ham.sieve index da74b34..2004d81 100644 --- a/hosts/hetzner-vm/services/mailserver/spam_sieve/report-ham.sieve +++ b/hosts/hetzner-vm/services/mailserver/spam_sieve/report-ham.sieve @@ -12,4 +12,4 @@ if environment :matches "imap.user" "*" { set "username" "${1}"; } -pipe :copy "sa-learn-ham.sh" [ "${username}" ]; \ No newline at end of file +pipe :copy "rspam-learn-ham.sh" [ "${username}" ]; \ No newline at end of file diff --git a/hosts/hetzner-vm/services/mailserver/spam_sieve/report-spam.sieve b/hosts/hetzner-vm/services/mailserver/spam_sieve/report-spam.sieve index 4024b7a..b600075 100644 --- a/hosts/hetzner-vm/services/mailserver/spam_sieve/report-spam.sieve +++ b/hosts/hetzner-vm/services/mailserver/spam_sieve/report-spam.sieve @@ -4,4 +4,4 @@ if environment :matches "imap.user" "*" { set "username" "${1}"; } -pipe :copy "sa-learn-spam.sh" [ "${username}" ]; \ No newline at end of file +pipe :copy "rspam-learn-spam.sh" [ "${username}" ]; \ No newline at end of file diff --git a/hosts/hetzner-vm/services/mailserver/ssl.nix b/hosts/hetzner-vm/services/mailserver/ssl.nix index 2b5d198..f645704 100644 --- a/hosts/hetzner-vm/services/mailserver/ssl.nix +++ b/hosts/hetzner-vm/services/mailserver/ssl.nix @@ -1,5 +1,6 @@ { pkgs, ... }: -let mail_config = (import ./config.nix { }); +let + mail_config = (import ./config.nix { }); acmeRoot = "/var/lib/acme/acme-challenge"; in { @@ -10,7 +11,7 @@ in { serverAliases = mail_config.domains; forceSSL = true; enableACME = true; - acmeRoot=acmeRoot; + acmeRoot = acmeRoot; }; }; diff --git a/hosts/lappy/lappy.nix b/hosts/lappy/lappy.nix index a7a29b6..b9dbe00 100644 --- a/hosts/lappy/lappy.nix +++ b/hosts/lappy/lappy.nix @@ -28,7 +28,7 @@ in { profiles.gui.base profiles.gui.environments.gnome - #profiles.gaming.steam + profiles.gaming.steam # for sci-hub and whenever websites break profiles.tor @@ -65,7 +65,7 @@ in { #home.gaming.emulators.ds #home.gaming.games.minecraft #home.gaming.games.osu - #home.gaming.platforms.steam + home.gaming.platforms.steam #home.bluetooth #home.network_manager diff --git a/hosts/raspberry/services/music-friend/helper-scripts.nix b/hosts/raspberry/services/music-friend/helper-scripts.nix index 79a08e6..7d74ce7 100644 --- a/hosts/raspberry/services/music-friend/helper-scripts.nix +++ b/hosts/raspberry/services/music-friend/helper-scripts.nix @@ -19,5 +19,5 @@ let mpc play "$POSITION" mpc seek "$CURRENT_TIMESTAMP" mpc play - ''; + ''; in { environment.systemPackages = [ sync-with-mpd-server ]; } diff --git a/outputs.nix b/outputs.nix index 3060c2e..11a206f 100644 --- a/outputs.nix +++ b/outputs.nix @@ -9,9 +9,9 @@ in { nixosConfigurations = hosts.nixosConfigurations; darwinConfigurations = hosts.darwinConfigurations; - deploy.nodes = (import ./deployNodes.nix { + deploy.nodes = (import ./deployNodes.nix { nixosConfigurations = self.nixosConfigurations; - deploy-rs = inputs.deploy-rs; + deploy-rs = inputs.deploy-rs; }); devShell."x86_64-linux" = pkgs-x86_64-linux.mkShell { diff --git a/profiles/base-darwin/terminals.nix b/profiles/base-darwin/terminals.nix index d4d14ba..93465fb 100644 --- a/profiles/base-darwin/terminals.nix +++ b/profiles/base-darwin/terminals.nix @@ -1,4 +1,4 @@ { pkgs, ... }: { environment.systemPackages = with pkgs; [ buildPackages.buildPackages.kitty.terminfo ]; -} \ No newline at end of file +} diff --git a/profiles/base/services.nix b/profiles/base/services.nix index 554b653..3e84411 100644 --- a/profiles/base/services.nix +++ b/profiles/base/services.nix @@ -1,4 +1,5 @@ -{ config, ... }: { -#services.localtimed.enable = true; +{ config, ... }: +{ + #services.localtimed.enable = true; } diff --git a/profiles/connectivity/network_manager/nm.nix b/profiles/connectivity/network_manager/nm.nix index e97768a..b5fd265 100644 --- a/profiles/connectivity/network_manager/nm.nix +++ b/profiles/connectivity/network_manager/nm.nix @@ -2,7 +2,7 @@ networking = { networkmanager = { enable = true; - connectionConfig = { "ipv6.ip6-privacy" = lib.mkForce 0; }; + connectionConfig = { "ipv6.ip6-privacy" = lib.mkForce 1; }; }; }; programs.nm-applet.enable = true; diff --git a/profiles/force_dns/force_dns.nix b/profiles/force_dns/force_dns.nix index 5751fce..3282c16 100644 --- a/profiles/force_dns/force_dns.nix +++ b/profiles/force_dns/force_dns.nix @@ -1,4 +1,4 @@ -{ lib, ...}: { +{ lib, ... }: { networking = { resolvconf.useLocalResolver = false; networkmanager.dns = "none"; diff --git a/profiles/gaming/steam.nix b/profiles/gaming/steam.nix index 04dd32b..52256a1 100644 --- a/profiles/gaming/steam.nix +++ b/profiles/gaming/steam.nix @@ -1 +1,7 @@ -{ pkgs, ... }: { programs.steam.enable = true; } +{ pkgs, ... }: { + programs.steam = { + enable = true; + remotePlay.openFirewall = true; + dedicatedServer.openFirewall = true; + }; +} diff --git a/profiles/gui/greeter/gdm.nix b/profiles/gui/greeter/gdm.nix index e69de29..b021e28 100644 --- a/profiles/gui/greeter/gdm.nix +++ b/profiles/gui/greeter/gdm.nix @@ -0,0 +1 @@ +{ }: { } diff --git a/profiles/gui/greeter/sddm.nix b/profiles/gui/greeter/sddm.nix index e69de29..b021e28 100644 --- a/profiles/gui/greeter/sddm.nix +++ b/profiles/gui/greeter/sddm.nix @@ -0,0 +1 @@ +{ }: { } diff --git a/treeConfig.nix b/treeConfig.nix index 0d402e8..be51e6f 100644 --- a/treeConfig.nix +++ b/treeConfig.nix @@ -1,4 +1,4 @@ -{mkTree, ...}: { +{ mkTree, ... }: { tree = mkTree { folder = ./.; config = { @@ -37,4 +37,4 @@ }; }; }; -} \ No newline at end of file +}