From 453c01980902bd7740ef200d343516a20518a806 Mon Sep 17 00:00:00 2001 From: OCbwoy3 Date: Mon, 3 Mar 2025 20:19:40 +0200 Subject: [PATCH] upd --- flake.lock | 161 ++++++++++++++++----------- hosts/default/configuration.nix | 6 +- hosts/default/packages.nix | 7 +- hosts/server/configuration.nix | 28 +++++ hosts/server/modules/atproto-pds.nix | 27 +++++ modules/nixos/nixpkgs.nix | 2 + 6 files changed, 160 insertions(+), 71 deletions(-) create mode 100644 hosts/server/configuration.nix create mode 100644 hosts/server/modules/atproto-pds.nix diff --git a/flake.lock b/flake.lock index afcf0af..f50f211 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1737636397, - "narHash": "sha256-F5MbBj3QVorycVSFE9qjuOTLtIQBqt2VWbXa0uwzm98=", + "lastModified": 1739298463, + "narHash": "sha256-oAFv9jKwwA7d7384d2LeywDSgwhvb3ZnrwbfoWPhXsI=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "7fe006981fae53e931f513026fc754e322f13145", + "rev": "f239e5aadd6d23c48e085c2de3397e2058e54d16", "type": "github" }, "original": { @@ -82,11 +82,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1737579274, - "narHash": "sha256-8kBIYfn8TI9jbffhDNS12SdbQHb9ITXflwcgIJBeGqw=", + "lastModified": 1739934729, + "narHash": "sha256-PcrLk10meIJICzUJqtCMOJxoITzbH52fZg2XAB7SSsM=", "owner": "catppuccin", "repo": "nix", - "rev": "06f0ea19334bcc8112e6d671fd53e61f9e3ad63a", + "rev": "b1ff2a638afa827f1473498190a2c1cae1cf41cf", "type": "github" }, "original": { @@ -98,11 +98,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -132,11 +132,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -148,16 +148,18 @@ "ghostty": { "inputs": { "flake-compat": "flake-compat", + "flake-utils": "flake-utils", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", - "zig": "zig" + "zig": "zig", + "zig2nix": "zig2nix" }, "locked": { - "lastModified": 1737779447, - "narHash": "sha256-+iVqQXAUJshUYgxOHfke54Ux4f/aggl1yub86KNx2tE=", + "lastModified": 1740698717, + "narHash": "sha256-QwHcm3jeeHB0Jnv26EKYrk2pHy9z/7hFPyqG9xOeZok=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "71e62f96fa4d286eda835048428d5be96e9f87c1", + "rev": "ef88d1cba9f3c6f00cc2bd4908df866a23e4faf8", "type": "github" }, "original": { @@ -195,11 +197,11 @@ ] }, "locked": { - "lastModified": 1737968762, - "narHash": "sha256-xiPARGKwocaMtv+U/rgi+h2g56CZZEmrcl7ldRaslq8=", + "lastModified": 1740699498, + "narHash": "sha256-r9hkKzX99CGiP1ZqH0e+SWKK4CMsRNRLyotuwrUjhTI=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1ae908bcc30af792b0bb0a52e53b03d2577255e", + "rev": "b71edac7a3167026aabea82a54d08b1794088c21", "type": "github" }, "original": { @@ -224,11 +226,11 @@ ] }, "locked": { - "lastModified": 1737634937, - "narHash": "sha256-Ffw4ujFpi++6pPHe+gCBOfDgAoNlzVPZN6MReC1beu8=", + "lastModified": 1738664950, + "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "9c5dd1f7c825ee47f72727ad0a4e16ca46a2688e", + "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3", "type": "github" }, "original": { @@ -253,11 +255,11 @@ ] }, "locked": { - "lastModified": 1737985436, - "narHash": "sha256-zx8FdI4zr2GhNyD1YGAqa2ymodAObTSAdwuWwVucewo=", + "lastModified": 1739049071, + "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "23783b96036f5506fdaf8b2250a1ef849d57f0d3", + "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", "type": "github" }, "original": { @@ -282,11 +284,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1738059592, - "narHash": "sha256-xyGGTu6JazGtrI30RSNJrs+tNn2Xc5a2Oh3eQKtBodQ=", + "lastModified": 1740707551, + "narHash": "sha256-khQu5pduq+KTid2lHYQpVkFPR3WigOdtE5/95PijxU4=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "1d3904c3e7a8b74ea83669f73ee408bd38390b11", + "rev": "445337d03dce7c9aef10ff4d57fc516ac8c1b24d", "type": "github" }, "original": { @@ -307,11 +309,11 @@ ] }, "locked": { - "lastModified": 1737556638, - "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=", + "lastModified": 1738422629, + "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5", + "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", "type": "github" }, "original": { @@ -401,11 +403,11 @@ ] }, "locked": { - "lastModified": 1737981711, - "narHash": "sha256-lh6cL5D8nPplB3WovCQjLUZ7k7MViiBrMlpkfm4R7/c=", + "lastModified": 1739048983, + "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "96bf0677fa9cd13508294e3d4559dfbbc8beff73", + "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", "type": "github" }, "original": { @@ -430,11 +432,11 @@ ] }, "locked": { - "lastModified": 1737634606, - "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", + "lastModified": 1739048914, + "narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f41271d35cc0f370d300413d756c2677f386af9d", + "rev": "a7334904d591f38757c46fbe2ab68651877d9099", "type": "github" }, "original": { @@ -479,11 +481,11 @@ ] }, "locked": { - "lastModified": 1737793455, - "narHash": "sha256-sVy0QU4fpZsUWj5B8t6jUNZHzVLC22+HYqcFG9pKPik=", + "lastModified": 1740707241, + "narHash": "sha256-1lR/TFBGozLTTtOocp+zneLhZ7NLq7F0vG0g641ney8=", "owner": "jas-singhfsu", "repo": "hyprpanel", - "rev": "74065af3d2aa576e8b183d720033c3eece3deb70", + "rev": "5075c94af274ca7e658680a7af69d32ddb79716e", "type": "github" }, "original": { @@ -500,11 +502,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1737636055, - "narHash": "sha256-T8evdMS+R/udMLf2CZ1/2qS+XG1H8eplTjWiKejfOF4=", + "lastModified": 1739049114, + "narHash": "sha256-jD9W4OHcn1sJ+xbwNFbGN9heSE6v2v3U+FtGf8Cul6k=", "owner": "hyprwm", "repo": "hyprsysteminfo", - "rev": "ca1a0434c454e22b700a052bae6edbd6737fe096", + "rev": "6769e50fcfcfd56548e9b17b9a02641ab4826e38", "type": "github" }, "original": { @@ -525,11 +527,11 @@ ] }, "locked": { - "lastModified": 1737978343, - "narHash": "sha256-TfFS0HCEJh63Kahrkp1h9hVDMdLU8a37Zz+IFucxyfA=", + "lastModified": 1739891528, + "narHash": "sha256-h8HOCZ/rw2Buzku+GKF77VXxrGjCSOQkLhptiEKMYg0=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "6a8bc9d2a4451df12f5179dc0b1d2d46518a90ab", + "rev": "61a5382f4b1ab578064d470b1b3d3f0df396b8ba", "type": "github" }, "original": { @@ -604,11 +606,11 @@ ] }, "locked": { - "lastModified": 1735493474, - "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", + "lastModified": 1739049028, + "narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", + "rev": "04146df74a8d5ec0b579657307be01f1e241125f", "type": "github" }, "original": { @@ -651,11 +653,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1733423277, - "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=", + "lastModified": 1738255539, + "narHash": "sha256-hP2eOqhIO/OILW+3moNWO4GtdJFYCqAe9yJZgvlCoDQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e36963a147267afc055f7cf65225958633e536bf", + "rev": "c3511a3b53b482aa7547c9d1626fd7310c1de1c5", "type": "github" }, "original": { @@ -667,11 +669,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733229606, - "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=", + "lastModified": 1738136902, + "narHash": "sha256-pUvLijVGARw4u793APze3j6mU1Zwdtz7hGkGGkD87qw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550", + "rev": "9a5db3142ce450045840cc8d832b13b8a2018e0c", "type": "github" }, "original": { @@ -683,11 +685,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1737885589, - "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { @@ -715,11 +717,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1737885589, - "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "lastModified": 1740560979, + "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", "owner": "nixos", "repo": "nixpkgs", - "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", + "rev": "5135c59491985879812717f4c9fea69604e7f26f", "type": "github" }, "original": { @@ -855,18 +857,21 @@ "flake-compat": [ "ghostty" ], - "flake-utils": "flake-utils", + "flake-utils": [ + "ghostty", + "flake-utils" + ], "nixpkgs": [ "ghostty", "nixpkgs-stable" ] }, "locked": { - "lastModified": 1717848532, - "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=", + "lastModified": 1738239110, + "narHash": "sha256-Y5i9mQ++dyIQr+zEPNy+KIbc5wjPmfllBrag3cHZgcE=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43", + "rev": "1a8fb6f3a04724519436355564b95fce5e272504", "type": "github" }, "original": { @@ -874,6 +879,32 @@ "repo": "zig-overlay", "type": "github" } + }, + "zig2nix": { + "inputs": { + "flake-utils": [ + "ghostty", + "flake-utils" + ], + "nixpkgs": [ + "ghostty", + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1738263917, + "narHash": "sha256-j/3fwe2pEOquHabP/puljOKwAZFjIE9gXZqA91sC48M=", + "owner": "jcollie", + "repo": "zig2nix", + "rev": "c311d8e77a6ee0d995f40a6e10a89a3a4ab04f9a", + "type": "github" + }, + "original": { + "owner": "jcollie", + "ref": "c311d8e77a6ee0d995f40a6e10a89a3a4ab04f9a", + "repo": "zig2nix", + "type": "github" + } } }, "root": "root", diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index bad2590..d16d374 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -106,8 +106,8 @@ theme = "robbyrussell"; }; shellAliases = { - nixos_rebuild = "sudo nixos-rebuild switch --flake .#default --impure --cores 4"; - neofetch = "hyfetch"; + nixos_rebuild = "sudo nixos-rebuild switch --flake .#default --impure --cores 4 -L --upgrade"; + neofetch = "fastfetch"; }; }; @@ -119,7 +119,7 @@ # vesktop # legcord equibop - kdenlive + libsForQt5.kdenlive libsForQt5.qt5ct libsForQt5.lightly kdePackages.qt6ct diff --git a/hosts/default/packages.nix b/hosts/default/packages.nix index 2b93472..5c782e5 100644 --- a/hosts/default/packages.nix +++ b/hosts/default/packages.nix @@ -26,8 +26,9 @@ -bios ${OVMF.fd}/FV/OVMF.fd \ "$@" '') - (writeShellScriptBin "regretevator" ''xdg-open roblox://placeId=4972273297'') + (writeShellScriptBin "regretevator" ''xdg-open https://www.roblox.com/games/4972273297/Regretevator-ELEVATOR-SIMULATOR'') libxkbcommon + ffmpeg gnupg nix-direnv htop @@ -59,7 +60,7 @@ pypresence pygobject3 ])) - wrangler + # wrangler thefuck fontforge xclip @@ -79,7 +80,7 @@ pywal pavucontrol polkit - polkit-kde-agent + libsForQt5.polkit-kde-agent wlogout libnotify killall diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix new file mode 100644 index 0000000..f5d98d5 --- /dev/null +++ b/hosts/server/configuration.nix @@ -0,0 +1,28 @@ +{ config, pkgs, ... }: + +{ + imports = [ + ./modules/atproto-pds.nix + ]; + + services.openssh.enable = true; + + users.users.ocbwoy3 = { + initialPassword = "thisisapassword42069!"; # not the type passwords i use + isNormalUser = true; + extraGroups = [ "wheel" "networkmanager" ]; + }; + + virtualisation.docker.enable = true; + + networking.firewall.allowedTCPPorts = [ 22 ]; + + catppuccin = { + enable = true; + flavor = "mocha"; + accent = "blue"; + }; + + system.stateVersion = "23.05"; # DO NOT TOUCH + +} diff --git a/hosts/server/modules/atproto-pds.nix b/hosts/server/modules/atproto-pds.nix new file mode 100644 index 0000000..e821637 --- /dev/null +++ b/hosts/server/modules/atproto-pds.nix @@ -0,0 +1,27 @@ +{ config, inputs, pkgs, ... }: + +{ + + # TODO: + # Upload PDS backup to /var/lib/pds + # and specify secrets in /private/atproto-pds.env + + services.pds = { + enable = true; + pdsadmin.enable = true; + environmentFiles = [ "/private/atproto-pds.env" ]; + settings = { + PDS_CRAWLERS = "https://bsky.network"; + LOG_ENABLED = true; + PDS_HOSTNAME = "pds.darktru.win"; + PDS_VERSION = "I'm an ATProto PDS!"; + PDS_DID_PLC_URL = "https://plc.directory"; + PDS_CONTACT_EMAIL_ADDRESS = "ocbwoy3@ocbwoy3.dev"; + PDS_PRIVACY_POLICY_URL = "https://ocbwoy3.dev"; + PDS_TERMS_OF_SERVICE_URL = "https://discord.gg/cQDvPtv3Dt"; + PDS_ACCEPTING_REPO_IMPORTS = true; + }; + + }; + +} diff --git a/modules/nixos/nixpkgs.nix b/modules/nixos/nixpkgs.nix index fd114e6..a532ebe 100644 --- a/modules/nixos/nixpkgs.nix +++ b/modules/nixos/nixpkgs.nix @@ -14,11 +14,13 @@ "https://hyprland.cachix.org" "https://ghostty.cachix.org" "https://hyprpanel.cachix.org" + "https://wrangler.cachix.org" ]; trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "ghostty.cachix.org-1:QB389yTa6gTyneehvqG58y0WnHjQOqgnA+wBnpWWxns=" "hyprpanel.cachix.org-1:tYDZEqAUAqgIz+zYwJ5+v5J62AnYqA/WEXv4VHA/XRs=" + "wrangler.cachix.org-1:N/FIcG2qBQcolSpklb2IMDbsfjZKWg+ctxx0mSMXdSs=" ]; };