shenanigan (at least one (1))
This commit is contained in:
parent
e6ce9fa166
commit
184e8b9274
|
@ -1,6 +1,5 @@
|
||||||
{ nixosConfigurations, deploy-rs, ... }:
|
{ nixosConfigurations, deploy-rs, ... }:
|
||||||
let
|
let activateNixOS_x64_64-linux = deploy-rs.lib.x86_64-linux.activate.nixos;
|
||||||
activateNixOS_x64_64-linux = deploy-rs.lib.x86_64-linux.activate.nixos;
|
|
||||||
in {
|
in {
|
||||||
lappy = {
|
lappy = {
|
||||||
hostname = "lappy.tailscale-internal.genderfucked.monster";
|
hostname = "lappy.tailscale-internal.genderfucked.monster";
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{...}: {
|
{ ... }: {
|
||||||
users.users.root = {
|
users.users.root = {
|
||||||
openssh.authorizedKeys.keys = [
|
openssh.authorizedKeys.keys = [
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKWDArL4+m9kUmLyWcmUby5+CVrmBThP0KbQWep32+BF laura@zotan.network"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKWDArL4+m9kUmLyWcmUby5+CVrmBThP0KbQWep32+BF laura@zotan.network"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
77
flake.lock
77
flake.lock
|
@ -52,38 +52,19 @@
|
||||||
"type": "github"
|
"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": {
|
"home-manager-unstable": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat_2",
|
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs-unstable"
|
"nixpkgs-unstable"
|
||||||
],
|
],
|
||||||
"nmd": "nmd",
|
|
||||||
"nmt": "nmt",
|
|
||||||
"utils": "utils_2"
|
"utils": "utils_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1655858799,
|
"lastModified": 1658751516,
|
||||||
"narHash": "sha256-Ws6BKlVuEVO29Ab3OEUfVLbWTECv/5Ax3yOMq/UeY0E=",
|
"narHash": "sha256-Y/3dHoTjbvYBtWd+TTBQJUIgDPO9d+Gqt05C5dyR7E4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "06bb67ab24bd6e6c6d2bc97ecbcddd6c8b07ac18",
|
"rev": "dbed4c794d20d51027fc1107f063ec5be027dafc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -94,7 +75,7 @@
|
||||||
},
|
},
|
||||||
"musicutil": {
|
"musicutil": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat_3",
|
"flake-compat": "flake-compat_2",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs-unstable"
|
"nixpkgs-unstable"
|
||||||
],
|
],
|
||||||
|
@ -121,11 +102,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1651916036,
|
"lastModified": 1657835815,
|
||||||
"narHash": "sha256-UuD9keUGm4IuVEV6wdSYbuRm7CwfXE63hVkzKDjVsh4=",
|
"narHash": "sha256-CnZszAYpNKydh6N7+xg+eRtWNVoAAGqc6bg+Lpgq1xc=",
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "2f2bdf658d2b79bada78dc914af99c53cad37cba",
|
"rev": "54a24f042f93c79f5679f133faddedec61955cf2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -153,11 +134,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1655770856,
|
"lastModified": 1658346836,
|
||||||
"narHash": "sha256-GZRIyHjuCbOl0UA8ClKmyRxZkCQEh/rsvU0otH037BU=",
|
"narHash": "sha256-c9BZZbi0tqCQ4j6CMVDlsut3Q3ET1Fezf+qIslCfkhs=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "63198c9ccefdbd337cef0d85db0ea2689f4ce418",
|
"rev": "a1fe662eb26ffc2a036b37c4670392ade632c413",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -169,11 +150,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1655624069,
|
"lastModified": 1658737577,
|
||||||
"narHash": "sha256-7g1zwTdp35GMTERnSzZMWJ7PG3QdDE8VOX3WsnOkAtM=",
|
"narHash": "sha256-xosJ5nJT9HX+b6UWsSX6R+ap4AdZOCrl/r+IKFp2ASQ=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0d68d7c857fe301d49cdcd56130e0beea4ecd5aa",
|
"rev": "5a0e0d73b944157328d54c4ded1cf2f0146a86a5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -183,38 +164,6 @@
|
||||||
"type": "github"
|
"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": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"deploy-rs": "deploy-rs",
|
"deploy-rs": "deploy-rs",
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{pkgs, ...}: {
|
{ pkgs, ... }: {
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs;
|
||||||
# NOINLINE
|
[
|
||||||
aegisub
|
# NOINLINE
|
||||||
|
aegisub
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +1 @@
|
||||||
{pkgs, ...}: {
|
{ pkgs, ... }: { home.packages = with pkgs; [ mullvad-vpn ]; }
|
||||||
home.packages = with pkgs; [mullvad-vpn];
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,4 +1,9 @@
|
||||||
{ lib, ... }: {
|
{ lib, ... }: {
|
||||||
home.file =
|
home.file = lib.mkMerge (map (x: {
|
||||||
lib.mkMerge (map (x: { "${x}" = { text = "nyaa!~\n"; }; }) [ "girl" "boy" ]);
|
"${x}" = {
|
||||||
|
text = ''
|
||||||
|
nyaa!~
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}) [ "girl" "boy" ]);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1 +1,3 @@
|
||||||
{ pkgs, ... }: { home.packages = with pkgs; [ neofetch inxi htop usbutils iotop ]; }
|
{ pkgs, ... }: {
|
||||||
|
home.packages = with pkgs; [ neofetch inxi htop usbutils iotop ];
|
||||||
|
}
|
||||||
|
|
|
@ -124,7 +124,7 @@ in {
|
||||||
panel-in-overview = true;
|
panel-in-overview = true;
|
||||||
search = false;
|
search = false;
|
||||||
show-apps-button = true;
|
show-apps-button = true;
|
||||||
show-prefs-intro= false;
|
show-prefs-intro = false;
|
||||||
theme = false;
|
theme = false;
|
||||||
workspace = true;
|
workspace = true;
|
||||||
workspace-popup = false;
|
workspace-popup = false;
|
||||||
|
|
|
@ -1,3 +1 @@
|
||||||
{pkgs,...}: {
|
{ pkgs, ... }: { home.packages = with pkgs; [ sublime4 ]; }
|
||||||
home.packages = with pkgs; [sublime4];
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
{ config, pkgs, ... }: let
|
{ config, pkgs, ... }:
|
||||||
|
let
|
||||||
configDir = "Code";
|
configDir = "Code";
|
||||||
userDir = if pkgs.stdenv.hostPlatform.isDarwin then
|
userDir = if pkgs.stdenv.hostPlatform.isDarwin then
|
||||||
"$HOME/Library/Application Support/${configDir}/User"
|
"$HOME/Library/Application Support/${configDir}/User"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{...}@inputs: {
|
{ ... }@inputs: {
|
||||||
nixosConfigurations = import ./nixos.nix inputs;
|
nixosConfigurations = import ./nixos.nix inputs;
|
||||||
darwinConfigurations = import ./darwin.nix inputs;
|
darwinConfigurations = import ./darwin.nix inputs;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,6 @@
|
||||||
{ }: rec {
|
{ }: rec {
|
||||||
fqdn = "mail.owo.monster";
|
fqdn = "mail.owo.monster";
|
||||||
domains = [
|
domains = [ "owo.monster" "kitteh.pw" ];
|
||||||
"owo.monster"
|
|
||||||
"kitteh.pw"
|
|
||||||
];
|
|
||||||
|
|
||||||
debug_mode = true;
|
debug_mode = true;
|
||||||
|
|
||||||
|
|
|
@ -71,6 +71,5 @@ in {
|
||||||
PermissionsStartOnly = lib.mkForce false;
|
PermissionsStartOnly = lib.mkForce false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
systemd.tmpfiles.rules =
|
systemd.tmpfiles.rules = [ "d '${keyDir}' - ${dkimUser} ${dkimGroup} - -" ];
|
||||||
[ "d '${keyDir}' - ${dkimUser} ${dkimGroup} - -" ];
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -135,7 +135,7 @@ in {
|
||||||
smtpd_tls_exclude_ciphers = tls_disallow;
|
smtpd_tls_exclude_ciphers = tls_disallow;
|
||||||
smtp_tls_mandatory_exclude_ciphers = tls_disallow;
|
smtp_tls_mandatory_exclude_ciphers = tls_disallow;
|
||||||
smtpd_tls_mandatory_exclude_ciphers = tls_disallow;
|
smtpd_tls_mandatory_exclude_ciphers = tls_disallow;
|
||||||
|
|
||||||
smtp_tls_ciphers = "high";
|
smtp_tls_ciphers = "high";
|
||||||
smtpd_tls_ciphers = "high";
|
smtpd_tls_ciphers = "high";
|
||||||
smtp_tls_mandatory_ciphers = "high";
|
smtp_tls_mandatory_ciphers = "high";
|
||||||
|
@ -148,7 +148,10 @@ in {
|
||||||
|
|
||||||
tls_random_source = "dev:/dev/urandom";
|
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" ];
|
non_smtpd_milters = [ "unix:/run/opendkim/opendkim.sock" ];
|
||||||
|
|
||||||
milter_protocol = "6";
|
milter_protocol = "6";
|
||||||
|
|
|
@ -12,4 +12,4 @@ if environment :matches "imap.user" "*" {
|
||||||
set "username" "${1}";
|
set "username" "${1}";
|
||||||
}
|
}
|
||||||
|
|
||||||
pipe :copy "sa-learn-ham.sh" [ "${username}" ];
|
pipe :copy "rspam-learn-ham.sh" [ "${username}" ];
|
|
@ -4,4 +4,4 @@ if environment :matches "imap.user" "*" {
|
||||||
set "username" "${1}";
|
set "username" "${1}";
|
||||||
}
|
}
|
||||||
|
|
||||||
pipe :copy "sa-learn-spam.sh" [ "${username}" ];
|
pipe :copy "rspam-learn-spam.sh" [ "${username}" ];
|
|
@ -1,5 +1,6 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
let mail_config = (import ./config.nix { });
|
let
|
||||||
|
mail_config = (import ./config.nix { });
|
||||||
acmeRoot = "/var/lib/acme/acme-challenge";
|
acmeRoot = "/var/lib/acme/acme-challenge";
|
||||||
|
|
||||||
in {
|
in {
|
||||||
|
@ -10,7 +11,7 @@ in {
|
||||||
serverAliases = mail_config.domains;
|
serverAliases = mail_config.domains;
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
acmeRoot=acmeRoot;
|
acmeRoot = acmeRoot;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ in {
|
||||||
profiles.gui.base
|
profiles.gui.base
|
||||||
profiles.gui.environments.gnome
|
profiles.gui.environments.gnome
|
||||||
|
|
||||||
#profiles.gaming.steam
|
profiles.gaming.steam
|
||||||
|
|
||||||
# for sci-hub and whenever websites break
|
# for sci-hub and whenever websites break
|
||||||
profiles.tor
|
profiles.tor
|
||||||
|
@ -65,7 +65,7 @@ in {
|
||||||
#home.gaming.emulators.ds
|
#home.gaming.emulators.ds
|
||||||
#home.gaming.games.minecraft
|
#home.gaming.games.minecraft
|
||||||
#home.gaming.games.osu
|
#home.gaming.games.osu
|
||||||
#home.gaming.platforms.steam
|
home.gaming.platforms.steam
|
||||||
|
|
||||||
#home.bluetooth
|
#home.bluetooth
|
||||||
#home.network_manager
|
#home.network_manager
|
||||||
|
|
|
@ -19,5 +19,5 @@ let
|
||||||
mpc play "$POSITION"
|
mpc play "$POSITION"
|
||||||
mpc seek "$CURRENT_TIMESTAMP"
|
mpc seek "$CURRENT_TIMESTAMP"
|
||||||
mpc play
|
mpc play
|
||||||
'';
|
'';
|
||||||
in { environment.systemPackages = [ sync-with-mpd-server ]; }
|
in { environment.systemPackages = [ sync-with-mpd-server ]; }
|
||||||
|
|
|
@ -9,9 +9,9 @@ in {
|
||||||
nixosConfigurations = hosts.nixosConfigurations;
|
nixosConfigurations = hosts.nixosConfigurations;
|
||||||
darwinConfigurations = hosts.darwinConfigurations;
|
darwinConfigurations = hosts.darwinConfigurations;
|
||||||
|
|
||||||
deploy.nodes = (import ./deployNodes.nix {
|
deploy.nodes = (import ./deployNodes.nix {
|
||||||
nixosConfigurations = self.nixosConfigurations;
|
nixosConfigurations = self.nixosConfigurations;
|
||||||
deploy-rs = inputs.deploy-rs;
|
deploy-rs = inputs.deploy-rs;
|
||||||
});
|
});
|
||||||
|
|
||||||
devShell."x86_64-linux" = pkgs-x86_64-linux.mkShell {
|
devShell."x86_64-linux" = pkgs-x86_64-linux.mkShell {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }: {
|
||||||
environment.systemPackages = with pkgs;
|
environment.systemPackages = with pkgs;
|
||||||
[ buildPackages.buildPackages.kitty.terminfo ];
|
[ buildPackages.buildPackages.kitty.terminfo ];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
{ config, ... }: {
|
{ config, ... }:
|
||||||
#services.localtimed.enable = true;
|
{
|
||||||
|
#services.localtimed.enable = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
networking = {
|
networking = {
|
||||||
networkmanager = {
|
networkmanager = {
|
||||||
enable = true;
|
enable = true;
|
||||||
connectionConfig = { "ipv6.ip6-privacy" = lib.mkForce 0; };
|
connectionConfig = { "ipv6.ip6-privacy" = lib.mkForce 1; };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
programs.nm-applet.enable = true;
|
programs.nm-applet.enable = true;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, ...}: {
|
{ lib, ... }: {
|
||||||
networking = {
|
networking = {
|
||||||
resolvconf.useLocalResolver = false;
|
resolvconf.useLocalResolver = false;
|
||||||
networkmanager.dns = "none";
|
networkmanager.dns = "none";
|
||||||
|
|
|
@ -1 +1,7 @@
|
||||||
{ pkgs, ... }: { programs.steam.enable = true; }
|
{ pkgs, ... }: {
|
||||||
|
programs.steam = {
|
||||||
|
enable = true;
|
||||||
|
remotePlay.openFirewall = true;
|
||||||
|
dedicatedServer.openFirewall = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
{ }: { }
|
|
@ -0,0 +1 @@
|
||||||
|
{ }: { }
|
|
@ -1,4 +1,4 @@
|
||||||
{mkTree, ...}: {
|
{ mkTree, ... }: {
|
||||||
tree = mkTree {
|
tree = mkTree {
|
||||||
folder = ./.;
|
folder = ./.;
|
||||||
config = {
|
config = {
|
||||||
|
@ -37,4 +37,4 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue