Compare commits
29 Commits
panam
...
e8428e0487
| Author | SHA1 | Date | |
|---|---|---|---|
| e8428e0487 | |||
| c37126a731 | |||
| a7029d0f46 | |||
| 85050715fc | |||
| 41b9279bc9 | |||
| ea04829c71 | |||
| bcc9a7bf6e | |||
| d66a6f9895 | |||
| 4b2685f7e1 | |||
| 275b054746 | |||
| 90113aa08e | |||
| 96a283f505 | |||
| d5ac189e66 | |||
| 233f3341bf | |||
| 866bd86ea3 | |||
| 35e4745ec0 | |||
| f169c425ef | |||
| f01eb7d39c | |||
| 49f4498fa4 | |||
| 86516997ec | |||
| aeafa5bbe9 | |||
| b65bc1696b | |||
| 1ce125327d | |||
| 66cca6bc2f | |||
| 087a160601 | |||
| 7ba91ab1a4 | |||
| fceb70c5e5 | |||
| c344e97678 | |||
| 6fbb14e637 |
@@ -1,3 +1,3 @@
|
||||
#!/usr/bin/env sh
|
||||
|
||||
nixos-rebuild switch --fast --flake .#condoserver --target-host root@192.168.86.21 --build-host root@192.168.86.21
|
||||
nixos-rebuild switch --fast --flake .#condoserver --target-host root@condoserver.room409.wg.test --build-host root@condoserver.room409.wg.test
|
||||
|
||||
Generated
+25
-40
@@ -4,15 +4,14 @@
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"utils": "utils"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1676367705,
|
||||
"narHash": "sha256-un5UbRat9TwruyImtwUGcKF823rCEp4fQxnsaLFL7CM=",
|
||||
"lastModified": 1702735279,
|
||||
"narHash": "sha256-SztEzDOE/6bDNnWWvnRbSHPVrgewLwdSei1sxoZFejM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "da72e6fc6b7dc0c3f94edbd310aae7cd95c678b5",
|
||||
"rev": "e9b9ecef4295a835ab073814f100498716b05a96",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -21,13 +20,29 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1702453208,
|
||||
"narHash": "sha256-0wRi9SposfE2wHqjuKt8WO2izKB/ASDOV91URunIqgo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "7763c6fd1f299cb9361ff2abf755ed9619ef01d6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "master",
|
||||
"repo": "nixos-hardware",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1676569297,
|
||||
"narHash": "sha256-2n4C4H3/U+3YbDrQB6xIw7AaLdFISCCFwOkcETAigqU=",
|
||||
"lastModified": 1702312524,
|
||||
"narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ac1f5b72a9e95873d1de0233fddcb56f99884b37",
|
||||
"rev": "a9bf124c46ef298113270b1f84a164865987a91c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -39,38 +54,8 @@
|
||||
"root": {
|
||||
"inputs": {
|
||||
"home-manager": "home-manager",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"vps_nixpkgs": "vps_nixpkgs"
|
||||
}
|
||||
},
|
||||
"utils": {
|
||||
"locked": {
|
||||
"lastModified": 1667395993,
|
||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"vps_nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1673410828,
|
||||
"narHash": "sha256-xAggTjXt7iqOe4lNRtq+B31cjxchvJOr9zIJJ4JmfY8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9852294f15c380cd61fd441538982426f8ee8ccc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "master",
|
||||
"type": "indirect"
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
{
|
||||
"nodes": {
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1697662575,
|
||||
"narHash": "sha256-fVtd4Le9edB831xyGWu0aqSfg6YVbkCNMX/IE3SUIdk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "3433206e51766b4164dad368a81325efbf343fbe",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1697456312,
|
||||
"narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ca012a02bf8327be9e488546faecae5e05d7d749",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-unstable",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"home-manager": "home-manager",
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
"version": 7
|
||||
}
|
||||
@@ -3,14 +3,14 @@
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "nixpkgs/nixos-unstable";
|
||||
vps_nixpkgs.url = "nixpkgs/master";
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, vps_nixpkgs, home-manager }@attrs:
|
||||
outputs = { self, nixpkgs, home-manager, nixos-hardware }@attrs:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
homeManagerSharedModule = {
|
||||
@@ -26,7 +26,32 @@
|
||||
# changes in each release.
|
||||
home.stateVersion = "22.11";
|
||||
|
||||
home.packages = with pkgs; [ ];
|
||||
fonts.fontconfig.enable = true;
|
||||
home.packages = with pkgs; [ fira-code jetbrains-mono iosevka monoid recursive ];
|
||||
|
||||
systemd.user.services.mpris-proxy = {
|
||||
Unit.Description = "Mpris proxy";
|
||||
Unit.After = [ "network.target" "sound.target" ];
|
||||
Service.ExecStart = "${pkgs.bluez}/bin/mpris-proxy";
|
||||
Install.WantedBy = [ "default.target" ];
|
||||
};
|
||||
|
||||
programs.foot = {
|
||||
enable = true;
|
||||
settings = {
|
||||
main = {
|
||||
#font = "Fira Code:size=8";
|
||||
#font = "JetBrainsMono:size=8";
|
||||
#font = "Iosevka:size=18";
|
||||
#font = "Monoid:size=6";
|
||||
font = "Recursive:size=16";
|
||||
#dpi-aware = "yes";
|
||||
};
|
||||
mouse = {
|
||||
hide-when-typing = "yes";
|
||||
};
|
||||
};
|
||||
};
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
enableBashIntegration = true;
|
||||
@@ -58,6 +83,12 @@
|
||||
profileExtra = ''
|
||||
if [ -e /home/nathan/.nix-profile/etc/profile.d/nix.sh ]; then . /home/nathan/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer
|
||||
'';
|
||||
shellAliases = {
|
||||
ng ="nmcli c up NETGEAR97";
|
||||
ng24="nmcli c up NETGEAR97_24_2Ghz";
|
||||
ng58="nmcli c up NETGEAR97_28_5Ghz";
|
||||
ng5c="nmcli c up NETGEAR97_2C_5Ghz";
|
||||
};
|
||||
};
|
||||
programs.git = {
|
||||
enable = true;
|
||||
@@ -212,8 +243,8 @@
|
||||
shell = "/run/current-system/sw/bin/bash";
|
||||
};
|
||||
|
||||
# testing
|
||||
services.jellyfin.enable = false;
|
||||
#fonts.fonts = with pkgs; [ fira-code jetbrains-mono iosevka ];
|
||||
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
@@ -226,6 +257,8 @@
|
||||
extraPortals = [pkgs.xdg-desktop-portal-gtk ];
|
||||
gtkUsePortal = true;
|
||||
};
|
||||
|
||||
hardware.bluetooth.enable = true;
|
||||
services.blueman.enable = true;
|
||||
|
||||
services.printing.enable = true;
|
||||
@@ -254,14 +287,17 @@
|
||||
# For steam, and Vulkan in general
|
||||
hardware.opengl.driSupport = true;
|
||||
hardware.opengl.driSupport32Bit = true;
|
||||
hardware.steam-hardware.enable = true;
|
||||
programs.steam.enable = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
tmux vim wget curl git w3m iftop iotop killall file unzip zip ripgrep imv killall gomuks htop
|
||||
firefox-wayland chromium gnome.nautilus
|
||||
vlc steam calibre foliate transmission-gtk mupdf
|
||||
tmux vim wget curl git w3m iftop iotop killall file unzip zip ripgrep imv killall gomuks htop python3
|
||||
waypipe firefox-wayland chromium gnome.nautilus
|
||||
vlc mpv libreoffice calibre foliate transmission-gtk mupdf
|
||||
gimp
|
||||
foot pavucontrol pywal
|
||||
pavucontrol pywal
|
||||
sway wayland glib dracula-theme gnome.adwaita-icon-theme swaylock swayidle wl-clipboard
|
||||
monado openxr-loader xrgears
|
||||
(pkgs.writeTextFile {
|
||||
name = "dbus-sway-environment";
|
||||
destination = "/bin/dbus-sway-environment";
|
||||
@@ -315,25 +351,84 @@
|
||||
networking.firewall.enable = false;
|
||||
}));
|
||||
in {
|
||||
nixosConfigurations.nixos-framework = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = attrs;
|
||||
modules = [
|
||||
nixos-hardware.nixosModules.framework-13-7040-amd
|
||||
home-manager.nixosModules.home-manager
|
||||
homeManagerSharedModule
|
||||
({ config, lib, pkgs, modulesPath, ... }@innerArgs: (lib.recursiveUpdate (commonConfigFunc innerArgs [ pkgs.light pkgs.gpodder pkgs.evince pkgs.wezterm pkgs.gnome.gnome-tweaks pkgs.vulkan-tools ]) {
|
||||
# HARDWARE
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||
hardware.opengl.extraPackages = with pkgs; [ amdvlk ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/427e2f6d-d42d-4d49-be35-713bf9526dc9";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/2A78-5373";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/9b0357e8-f721-4a06-aae0-97b6efc19209"; }
|
||||
];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp195s0f3u1c2.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
# END HARDWARE
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
#boot.kernelPackages = pkgs.linuxPackages_testing;
|
||||
#boot.kernelParams = [ "amdgpu.sg_display=0" ];
|
||||
networking.hostName = "nixos-framework"; # Define your hostname.
|
||||
system.stateVersion = "22.11"; # Did you read the comment?
|
||||
programs.fuse.userAllowOther = true;
|
||||
services.jellyfin.enable = true;
|
||||
services.fwupd.enable = true;
|
||||
#services.xserver = {
|
||||
# enable = true;
|
||||
# displayManager.gdm.enable = true;
|
||||
# desktopManager.gnome.enable = true;
|
||||
#};
|
||||
}))
|
||||
];
|
||||
};
|
||||
nixosConfigurations.nixos4800H = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = attrs;
|
||||
modules = [
|
||||
home-manager.nixosModules.home-manager
|
||||
homeManagerSharedModule
|
||||
({ config, lib, pkgs, modulesPath, ... }@innerArgs: (lib.recursiveUpdate (commonConfigFunc innerArgs [ pkgs.light ]) {
|
||||
({ config, lib, pkgs, modulesPath, ... }@innerArgs: (lib.recursiveUpdate (commonConfigFunc innerArgs [ pkgs.light pkgs.gpodder pkgs.evince ]) {
|
||||
# HARDWARE
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||
hardware.opengl.extraPackages = with pkgs; [ amdvlk ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = { device = "/dev/disk/by-uuid/ae8e4a92-53dd-49b5-bf3a-aeb9a109c01e"; fsType = "ext4"; };
|
||||
fileSystems."/boot" = { device = "/dev/disk/by-uuid/28E9-0409"; fsType = "vfat"; };
|
||||
swapDevices = [ ];
|
||||
nix.maxJobs = lib.mkDefault 16;
|
||||
# END HARDWARE
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
@@ -348,23 +443,16 @@
|
||||
networking.useDHCP = false;
|
||||
networking.interfaces.eno1.useDHCP = true;
|
||||
networking.interfaces.wlp1s0.useDHCP = true;
|
||||
networking.wireguard.interfaces = {
|
||||
wg0 = {
|
||||
ips = [ "10.100.0.7/24" ];
|
||||
privateKeyFile = "/home/nathan/wireguard-keys/private";
|
||||
peers = [
|
||||
{
|
||||
publicKey = "WXx7XXJzerPJBPMTvZ454iQhx5Q5bFvBgF6NsPPX9nk=";
|
||||
allowedIPs = [ "10.100.0.0/24" ];
|
||||
#allowedIPs = [ "0.0.0.0/0" ];
|
||||
## Then sudo ip route add 104.238.179.164 via 10.0.0.1 dev enp30s0
|
||||
endpoint = "104.238.179.164:51820";
|
||||
persistentKeepalive = 25;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
system.stateVersion = "20.03";
|
||||
users.extraUsers.marcus = {
|
||||
name = "marcus";
|
||||
isNormalUser = true;
|
||||
group = "users";
|
||||
extraGroups = [ "wheel" "disk" "audio" "video" "networkmanager" "systemd-journal" "networkmanager" "sway" "plugdev" "adbusers"];
|
||||
createHome = true;
|
||||
home = "/home/marcus";
|
||||
shell = "/run/current-system/sw/bin/bash";
|
||||
};
|
||||
}))
|
||||
];
|
||||
};
|
||||
@@ -384,7 +472,9 @@
|
||||
boot.supportedFilesystems = [ "ntfs" ];
|
||||
fileSystems."/" = { device = "/dev/disk/by-uuid/163c1731-2f66-436b-a74f-20f84ec628dd"; fsType = "ext4"; };
|
||||
fileSystems."/boot" = { device = "/dev/disk/by-uuid/9C44-5411"; fsType = "vfat"; };
|
||||
fileSystems."/reborn" = { device = "/dev/disk/by-label/reborn"; fsType = "ext4"; };
|
||||
#fileSystems."/big_disk" = { device = "/dev/disk/by-uuid/B610D69310D65A47"; fsType = "ntfs3"; options = ["rw" "uid=1000"]; };
|
||||
#fileSystems."/big_disk" = { device = "/dev/sdb1"; fsType = "ntfs3"; options = ["rw" "uid=1000"]; };
|
||||
swapDevices = [ ];
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
@@ -395,6 +485,8 @@
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
networking.hostName = "nixos-desktop"; # Define your hostname.
|
||||
system.stateVersion = "22.11";
|
||||
|
||||
services.jellyfin.enable = true;
|
||||
}))
|
||||
];
|
||||
};
|
||||
@@ -415,21 +507,21 @@
|
||||
swapDevices = [ { device = "/dev/disk/by-uuid/20cc65f9-f35e-419a-b00f-252cd576b2ce"; } ];
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
# high-resolution display
|
||||
hardware.video.hidpi.enable = lib.mkDefault true;
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
# don't suspend on lid close
|
||||
services.logind.lidSwitch = "ignore";
|
||||
services.glusterfs.enable = true;
|
||||
networking.hostName = "condoserver"; # Define your hostname.
|
||||
|
||||
|
||||
system.stateVersion = "22.11"; # Did you read the comment?
|
||||
}))
|
||||
];
|
||||
};
|
||||
nixosConfigurations.vps = vps_nixpkgs.lib.nixosSystem {
|
||||
nixosConfigurations.vps = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = attrs;
|
||||
modules = [
|
||||
@@ -442,7 +534,6 @@
|
||||
{ device = "/dev/disk/by-uuid/b9470789-6d82-4ad4-9a4a-7e19b8fcc8dc";
|
||||
fsType = "ext4";
|
||||
};
|
||||
nix.maxJobs = lib.mkDefault 1;
|
||||
# END HARDWARE
|
||||
|
||||
nix.gc.automatic = true;
|
||||
@@ -463,11 +554,19 @@
|
||||
python-olm pycryptodome unpaddedbase64
|
||||
]);
|
||||
});
|
||||
|
||||
#lemmy-server = super.lemmy-server.overrideAttrs (old: {
|
||||
# patches = (old.patches or []) ++ [(super.fetchpatch {
|
||||
# name = "fix-db-migrations.patch";
|
||||
# url = "https://gist.githubusercontent.com/matejc/9be474fa581c1a29592877ede461f1f2/raw/83886917153fcba127b43d9a94a49b3d90e635b3/fix-db-migrations.patch";
|
||||
# hash = "sha256-BvoA4K9v84n60lG96j1+91e8/ERn9WlVTGk4Z6Fj4iA=";
|
||||
# })];
|
||||
#});
|
||||
|
||||
}) ];
|
||||
|
||||
# Use the GRUB 2 boot loader.
|
||||
boot.loader.grub.enable = true;
|
||||
boot.loader.grub.version = 2;
|
||||
boot.loader.grub.device = "/dev/vda"; # or "nodev" for efi only
|
||||
|
||||
swapDevices = [{
|
||||
@@ -484,8 +583,8 @@
|
||||
networking.firewall = {
|
||||
#allowedTCPPorts = [ 22 80 443 3478 3479 ];
|
||||
#allowedUDPPorts = [ 22 80 443 5349 5350 51820 ];
|
||||
allowedTCPPorts = [ 22 80 443 ];
|
||||
allowedUDPPorts = [ 22 80 443 51820 ];
|
||||
allowedTCPPorts = [ 22 80 443 30000 ]; #30000 is minetest
|
||||
allowedUDPPorts = [ 22 80 443 51820 30000 ];
|
||||
#extraCommands = ''
|
||||
# iptables -A FORWARD -i %i -j ACCEPT; iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE
|
||||
#'';
|
||||
@@ -525,17 +624,19 @@
|
||||
#};
|
||||
|
||||
services.openssh.enable = true;
|
||||
services.openssh.passwordAuthentication = false;
|
||||
services.openssh.kbdInteractiveAuthentication = false;
|
||||
services.openssh.permitRootLogin = "prohibit-password";
|
||||
|
||||
services.mastodon = {
|
||||
enable = true;
|
||||
localDomain = "mastodon.room409.xyz";
|
||||
configureNginx = true;
|
||||
smtp.fromAddress = "notifications@mastodon.room409.xyz";
|
||||
services.openssh.settings = {
|
||||
PasswordAuthentication = false;
|
||||
KbdInteractiveAuthentication = false;
|
||||
PermitRootLogin = "prohibit-password";
|
||||
};
|
||||
|
||||
#services.mastodon = {
|
||||
# enable = true;
|
||||
# localDomain = "mastodon.room409.xyz";
|
||||
# configureNginx = true;
|
||||
# smtp.fromAddress = "notifications@mastodon.room409.xyz";
|
||||
#};
|
||||
|
||||
services.mautrix-telegram = {
|
||||
enable = true;
|
||||
settings = {
|
||||
@@ -560,6 +661,15 @@
|
||||
# port = 8888;
|
||||
#};
|
||||
|
||||
services.matrix-synapse.sliding-sync = {
|
||||
enable = true;
|
||||
createDatabase = true;
|
||||
environmentFile = "/var/lib/private/matrix-sliding-sync/secrets";
|
||||
settings = {
|
||||
SYNCV3_SERVER="https://synapse.room409.xyz";
|
||||
};
|
||||
};
|
||||
|
||||
services.matrix-synapse = {
|
||||
enable = true;
|
||||
|
||||
@@ -568,6 +678,7 @@
|
||||
public_baseurl = "https://synapse.room409.xyz/";
|
||||
|
||||
enable_registration = false;
|
||||
#enable_registration_without_verification = true;
|
||||
#registration_shared_secret = null;
|
||||
database.name = "psycopg2";
|
||||
url_preview_enabled = true;
|
||||
@@ -595,13 +706,26 @@
|
||||
|
||||
services.gitea = {
|
||||
enable = true;
|
||||
disableRegistration = true;
|
||||
settings.service.DISABLE_REGISTRATION = true;
|
||||
appName = "Room409.xyz Forge";
|
||||
domain = "forge.room409.xyz";
|
||||
rootUrl = "https://forge.room409.xyz/";
|
||||
httpPort = 3001;
|
||||
settings.server = {
|
||||
DOMAIN = "forge.room409.xyz";
|
||||
ROOT_URL = "https://forge.room409.xyz/";
|
||||
HTTP_PORT = 3001;
|
||||
};
|
||||
};
|
||||
|
||||
#systemd.services.lemmy.environment.RUST_BACKTRACE = "full";
|
||||
#systemd.services.lemmy.environment.LEMMY_DATABASE_URL = pkgs.lib.mkForce "postgres:///lemmy?host=/run/postgresql&user=lemmy";
|
||||
#services.lemmy = {
|
||||
# enable = true;
|
||||
# database.createLocally = true;
|
||||
# settings = {
|
||||
# hostname = "lemmy.room409.xyz";
|
||||
# };
|
||||
# nginx.enable = true;
|
||||
#};
|
||||
|
||||
services.postgresql = {
|
||||
enable = true;
|
||||
# postgresql user and db name in the service.matrix-synapse.databse_args setting is default
|
||||
@@ -618,13 +742,23 @@
|
||||
enable = true;
|
||||
address = "0.0.0.0";
|
||||
port = 8789;
|
||||
serverUrl = "https://headscale.room409.xyz";
|
||||
dns.baseDomain = "wg.test";
|
||||
settings.serverUrl = "https://headscale.room409.xyz";
|
||||
settings.dns_config.baseDomain = "wg.test";
|
||||
settings.logtail.enabled = false;
|
||||
};
|
||||
|
||||
security.acme.email = "miloignis@gmail.com";
|
||||
security.acme.acceptTerms = true;
|
||||
services.ttyd = {
|
||||
enable = true;
|
||||
port = 9134;
|
||||
username = "miloignis";
|
||||
passwordFile = /var/lib/ttyd/secrets;
|
||||
clientOptions.fontFamily="Recursive";
|
||||
};
|
||||
|
||||
security.acme = {
|
||||
acceptTerms = true;
|
||||
defaults.email = "miloignis@gmail.com";
|
||||
};
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
recommendedGzipSettings = true;
|
||||
@@ -641,6 +775,12 @@
|
||||
};
|
||||
};
|
||||
|
||||
## the rest is defined by the lemmy service
|
||||
#virtualHosts."lemmy.room409.xyz" = {
|
||||
# forceSSL = true;
|
||||
# enableACME = true;
|
||||
#};
|
||||
|
||||
virtualHosts."forge.room409.xyz" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
@@ -657,7 +797,7 @@
|
||||
locations."/.well-known/matrix/client".extraConfig = ''
|
||||
add_header Content-Type application/json;
|
||||
add_header Access-Control-Allow-Origin *;
|
||||
return 200 '{ "m.homeserver": {"base_url": "https://synapse.room409.xyz"}, "m.identity_server": { "base_url": "https://vector.im"} }';
|
||||
return 200 '{ "m.homeserver": {"base_url": "https://synapse.room409.xyz"}, "org.matrix.msc3575.proxy": { "url": "https://syncv3.room409.xyz" }, "m.identity_server": { "base_url": "https://vector.im"} }';
|
||||
'';
|
||||
locations."/".proxyPass = "http://localhost:8008";
|
||||
locations."/".extraConfig = ''
|
||||
@@ -665,6 +805,11 @@
|
||||
proxy_set_header X-Forwarded-For $remote_addr;
|
||||
'';
|
||||
};
|
||||
virtualHosts."syncv3.room409.xyz" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/".proxyPass = "http://localhost:8009";
|
||||
};
|
||||
|
||||
virtualHosts."element-synapse.room409.xyz" = {
|
||||
forceSSL = true;
|
||||
@@ -690,6 +835,25 @@
|
||||
enableACME = true;
|
||||
root = "/var/www/faint.room409.xyz";
|
||||
};
|
||||
virtualHosts."shell.room409.xyz" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://localhost:9134";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
virtualHosts."drop.room409.xyz" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://localhost:9009";
|
||||
proxyWebsockets = true;
|
||||
extraConfig = ''
|
||||
client_max_body_size 500M;
|
||||
'';
|
||||
};
|
||||
};
|
||||
#virtualHosts."www.kraken-lang.org" = {
|
||||
# forceSSL = true;
|
||||
# enableACME = true;
|
||||
@@ -731,6 +895,150 @@
|
||||
#locations."/bookclub/".proxyPass = "http://localhost:8888/room/!xSMgeFJYbuYTOGAGga:synapse.room409.xyz/";
|
||||
};
|
||||
|
||||
virtualHosts."lotusronin.room409.xyz" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
root = pkgs.writeTextDir "index.html" ''<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>LotusRonin's Website</title>
|
||||
<style>
|
||||
h1, h2 ,h3 { line-height:1.2; }
|
||||
.bodyStuff {
|
||||
max-width: 45em;
|
||||
margin: 1em auto;
|
||||
padding: 0 .62em;
|
||||
font: 1.2em/1.62 sans-serif;
|
||||
}
|
||||
.floatLeft {
|
||||
float: left;
|
||||
max-width: 55em;
|
||||
margin: 1em auto;
|
||||
padding: 0 .62em;
|
||||
font: 1.2em/1.62 sans-serif;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="bodyStuff">
|
||||
<header><h1>Main Page</h1></header>
|
||||
<br> <br>
|
||||
Take control of your tools, break from the system. Less is more.
|
||||
</div>
|
||||
<div class="floatLeft">
|
||||
<ol>
|
||||
<li><a href="">📜 Blog</a></li>
|
||||
<li><a href="">👨💻 Code</a></li>
|
||||
<li><a href="">🕹️ Games</a></li>
|
||||
<li><a href="">(.)(.) MLKRs.shop signup</a></li>
|
||||
<li><a href="">📄 Resume/About Me</a></li>
|
||||
</ol>
|
||||
</div>
|
||||
<br> <br>
|
||||
<div class="bodyStuff">
|
||||
<img src="http://9front.org/img/9frontfell01.png">
|
||||
<img src="http://9front.org/img/9frontfell02.png">
|
||||
<img src="http://9front.org/img/9germanengineering01.png">
|
||||
<img src="http://9front.org/img/9realemu01.png">
|
||||
<img src="http://9front.org/img/9hold01.png">
|
||||
<img src="http://9front.org/img/9frontfell03.png">
|
||||
<img src="http://9front.org/img/9germanengineering02.png">
|
||||
<img src="http://9front.org/img/9frontsystem02.png">
|
||||
<img src="http://9front.org/img/9frontsystem03.png">
|
||||
<img src="http://9front.org/img/9frontsystem04.png">
|
||||
<img src="http://9front.org/img/9frontfell04.png">
|
||||
<img src="http://9front.org/img/9cwfs01.png">
|
||||
<img src="http://9front.org/img/9boot01.png">
|
||||
<img src="http://9front.org/img/9kbdfs01.png">
|
||||
<img src="http://9front.org/img/9frontsystem06.png">
|
||||
<img src="http://9front.org/img/9frontsystem07.png">
|
||||
<img src="http://9front.org/img/9couldfork01.png">
|
||||
<img src="http://9front.org/img/9whatdidtheydo01.png">
|
||||
<img src="http://9front.org/img/9fossil01.png">
|
||||
<img src="http://9front.org/img/9pkg01.png">
|
||||
<img src="http://9front.org/img/9boot02.png">
|
||||
<img src="http://9front.org/img/9inferno01.png">
|
||||
<img src="http://9front.org/img/9community01.png">
|
||||
<img src="http://9front.org/img/9timesync01.png">
|
||||
<img src="http://9front.org/img/9inferno02.png">
|
||||
<img src="http://9front.org/img/9inferno01.png">
|
||||
<img src="http://9front.org/img/9inferno01.png">
|
||||
<img src="http://9front.org/img/9troll01.png">
|
||||
<img src="http://9front.org/img/9pkg02.png">
|
||||
<img src="http://9front.org/img/9direction02.png">
|
||||
<img src="http://9front.org/img/9community03.png">
|
||||
<img src="http://9front.org/img/9inferno01.png">
|
||||
<img src="http://9front.org/img/9frontsystem09.png">
|
||||
<img src="http://9front.org/img/9mothra01.png">
|
||||
<img src="http://9front.org/img/9mothra02.png">
|
||||
<img src="http://9front.org/img/9mothra03.png">
|
||||
<img src="http://9front.org/img/9mothra04.png">
|
||||
<img src="http://9front.org/img/9scram01.png">
|
||||
<img src="http://9front.org/img/9frontsystem10.png">
|
||||
<img src="http://9front.org/img/9man01.png">
|
||||
<img src="http://9front.org/img/9community05.png">
|
||||
<img src="http://9front.org/img/9chording01.png">
|
||||
<img src="http://9front.org/img/9community06.png">
|
||||
<img src="http://9front.org/img/9direction05.png">
|
||||
<img src="http://9front.org/img/9paint01.png">
|
||||
<img src="http://9front.org/img/9direction07.png">
|
||||
<img src="http://9front.org/img/9ken01.png">
|
||||
<img src="http://9front.org/img/9catv01.png">
|
||||
<img src="http://9front.org/img/901.png">
|
||||
<img src="http://9front.org/img/9frontsystem11.png">
|
||||
<img src="http://9front.org/img/9troll03.png">
|
||||
<img src="http://9front.org/img/9frontfell20.png">
|
||||
<img src="http://9front.org/img/9tmove01.png">
|
||||
<img src="http://9front.org/img/9codereview01.png">
|
||||
<img src="http://9front.org/img/9inferno01.png">
|
||||
<img src="http://9front.org/img/9nofork01.png">
|
||||
<img src="http://9front.org/img/9iknowthis01.png">
|
||||
<img src="http://9front.org/img/9mothra10.png">
|
||||
<img src="http://9front.org/img/nixamerica.png">
|
||||
<img src="http://9front.org/img/cmonks.png">
|
||||
<img src="http://9front.org/img/9sysupdate01.png">
|
||||
<img src="http://9front.org/img/9point01.png">
|
||||
<img src="http://9front.org/img/drclenrek.png">
|
||||
<img src="http://9front.org/img/9times.png">
|
||||
<img src="http://9front.org/img/9paint03.png">
|
||||
<img src="http://9front.org/img/9wasntasking.png">
|
||||
<img src="http://9front.org/img/9aiju01.png">
|
||||
<img src="http://9front.org/img/9nintendo01.png">
|
||||
<img src="http://9front.org/img/9inferno01.png">
|
||||
<img src="http://9front.org/img/9direction15.png">
|
||||
<img src="http://9front.org/img/welcometothetask.png">
|
||||
<img src="http://9front.org/img/qr9medium.png">
|
||||
<img src="http://9front.org/img/9decisions.png">
|
||||
<img src="http://9front.org/img/9communitybowie.png">
|
||||
<img src="http://9front.org/img/9dalailamaandmao.png">
|
||||
<img src="http://9front.org/img/9computerasfuck.png">
|
||||
<img src="http://9front.org/img/9communitykissingerclinton.png">
|
||||
<img src="http://9front.org/img/9frontsystempoland1946.png">
|
||||
<img src="http://9front.org/img/9directiona3.png">
|
||||
<img src="http://9front.org/img/9tupac.png">
|
||||
<img src="http://9front.org/img/9frontsystemkids.png">
|
||||
<img src="http://9front.org/img/9frontsystemnixon.jpg">
|
||||
<img src="http://9front.org/img/9frontsystem.jfk.png">
|
||||
<img src="http://9front.org/img/9alps.png">
|
||||
<img src="http://9front.org/img/9-come-and-take-it.png">
|
||||
<img src="http://9front.org/img/9wreckastow.png">
|
||||
<img src="http://9front.org/img/9nabokov.png">
|
||||
<img src="http://9front.org/img/9crowd.png">
|
||||
<img src="http://9front.org/img/9dirtyhands.png">
|
||||
<img src="http://9front.org/img/9choice.png">
|
||||
<img src="http://9front.org/img/9fuck_computers.jpg">
|
||||
<img src="http://9front.org/img/9community-hackathon.png">
|
||||
<img src="http://9front.org/img/9reform.png">
|
||||
<img src="http://9front.org/img/9rune.png">
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
virtualHosts."miloignis.room409.xyz" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
@@ -815,6 +1123,7 @@
|
||||
iftop ripgrep
|
||||
config.services.headscale.package
|
||||
#wireguard
|
||||
droopy
|
||||
];
|
||||
users.extraUsers.nathan = {
|
||||
name = "nathan";
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ exec configure-gtk
|
||||
exec sleep 5; systemctl --user start kanshi.service
|
||||
|
||||
#When everything's wayland, maybe
|
||||
#output eDP-1 scale 2
|
||||
output eDP-1 scale 1
|
||||
|
||||
#Output HDMI-A-1 'Goldstar Company Ltd LG TV SSCR2 0x00000101'
|
||||
output HDMI-A-1 mode 1920x1080@60Hz
|
||||
|
||||
Reference in New Issue
Block a user