diff --git a/flake.lock b/flake.lock index 26dbaf8..f965d82 100644 --- a/flake.lock +++ b/flake.lock @@ -88,6 +88,26 @@ "type": "github" } }, + "beeengine": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1744117239, + "narHash": "sha256-kMqmtfpZ8yXTi2Qm8hQ9SpvOZ7BdEKl2flWoFvLJufM=", + "ref": "refs/heads/master", + "rev": "45ec8b21db7879b29a37d7c3f5aa770a29c9b470", + "revCount": 499, + "submodules": true, + "type": "git", + "url": "https://github.com/KyleKrein/BeeEngine" + }, + "original": { + "submodules": true, + "type": "git", + "url": "https://github.com/KyleKrein/BeeEngine" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -112,7 +132,7 @@ "inputs": { "emacs-overlay": "emacs-overlay", "nix-org-babel": "nix-org-babel", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1743350531, @@ -556,7 +576,7 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1743644846, @@ -632,7 +652,7 @@ "nixos-wsl": { "inputs": { "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1743125458, @@ -773,6 +793,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1738843498, + "narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1742288794, "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", @@ -788,7 +824,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1735523292, "narHash": "sha256-opBsbR/nrGxiiF6XzlVluiHYb6yN/hEwv+lBWTy9xoM=", @@ -804,7 +840,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1743076231, "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", @@ -820,7 +856,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1740865531, "narHash": "sha256-h00vGIh/jxcGl8aWdfnVRD74KuLpyY3mZgMFMy7iKIc=", @@ -836,7 +872,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1743703532, "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", @@ -852,7 +888,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1743441817, "narHash": "sha256-+OE03P3u0FRwhS+Ah6EYiwxdS1rcIYlXheuXGM3wP3Q=", @@ -868,7 +904,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1741600792, "narHash": "sha256-yfDy6chHcM7pXpMF4wycuuV+ILSTG486Z/vLx/Bdi6Y=", @@ -944,7 +980,7 @@ "flake-utils": "flake-utils", "mnw": "mnw", "nil": "nil", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nmd": "nmd", "plugin-aerial-nvim": "plugin-aerial-nvim", "plugin-alpha-nvim": "plugin-alpha-nvim", @@ -3041,6 +3077,7 @@ "root": { "inputs": { "apple-silicon-support": "apple-silicon-support", + "beeengine": "beeengine", "disko": "disko", "emacs-kylekrein": "emacs-kylekrein", "home-manager": "home-manager", @@ -3052,7 +3089,7 @@ "nix-on-droid": "nix-on-droid", "nixos-facter-modules": "nixos-facter-modules", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nixpkgs-master": "nixpkgs-master", "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix", @@ -3116,7 +3153,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1743756170, @@ -3144,7 +3181,7 @@ "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "systems": "systems_3", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", diff --git a/flake.nix b/flake.nix index 9645a1b..c0fce03 100644 --- a/flake.nix +++ b/flake.nix @@ -62,6 +62,9 @@ emacs-kylekrein = { url = "github:kylekrein/emacs-config"; }; + beeengine = { + url = "git+https://github.com/KyleKrein/BeeEngine?submodules=1"; + }; }; outputs = { @@ -95,6 +98,7 @@ kylekrein-homepc-pkgs = nixpkgs: import nixpkgs { system = x86; overlays = [ + inputs.beeengine.overlays.${x86} #nativePackagesOverlay #ladybirdMaster ]; @@ -118,6 +122,7 @@ kylekrein-mac-pkgs = nixpkgs: import nixpkgs { system = arm; overlays = [ + inputs.beeengine.overlays.${arm} #(import ./nixos/macos/widevine.nix) ]; config = { @@ -139,6 +144,7 @@ andrej-pc-pkgs = nixpkgs: import nixpkgs { system = x86; overlays = [ + inputs.beeengine.overlays.${x86} #nativePackagesOverlay ]; config = { diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 36cb2cc..61b440f 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -151,7 +151,6 @@ in fzf lazygit fastfetch - firefox telegram-desktop vlc wl-clipboard @@ -174,6 +173,9 @@ in gdb csharp-ls element-desktop + + beeengineeditor + beelocalization ]; programs.kdeconnect.enable = true; diff --git a/nixos/hosts/kylekrein-homepc/default.nix b/nixos/hosts/kylekrein-homepc/default.nix index 30e8c0a..9b1e736 100644 --- a/nixos/hosts/kylekrein-homepc/default.nix +++ b/nixos/hosts/kylekrein-homepc/default.nix @@ -74,51 +74,9 @@ config = { #Chat host networking.firewall.allowedTCPPorts = [ 80 443 22 8448 9993 ] ++ [ config.services.zerotierone.port ]; networking.firewall.allowedUDPPorts = [config.services.zerotierone.port]; - security.acme = { - acceptTerms = true; - defaults.email = "alex.lebedev2003@icloud.com"; - certs = { - "kylekrein.com" = { - webroot = "/var/lib/acme/challenges-kylekrein"; - email = "alex.lebedev2003@icloud.com"; - group = "nginx"; - extraDomainNames = [ - "matrix.kylekrein.com" - "chat.kylekrein.com" - ]; - }; - }; - }; # users.users.nginx.extraGroups = [ "acme" ]; services.hypridle.enable = lib.mkForce false; programs.hyprlock.enable = lib.mkForce false; - sops.secrets."services/conduwuit" = {neededForUsers = true;}; - - services.conduwuit = { - enable = false; - settings = { - global = { - server_name = "kylekrein.com"; - port = [ 6167 ]; - trusted_servers = [ "matrix.org" ]; - allow_registration = true; - allow_federation = true; - allow_encryption = true; - }; - }; - extraEnvironment = { - CONDUWUIT_REGISTRATION_TOKEN = ""; - #CONDUWUIT_REGISTRATION_TOKEN_FILE = ''"${config.sops.secrets."services/conduwuit".path}"''; - CONDUWUIT_NEW_USER_DISPLAYNAME_SUFFIX = "🐝"; - CONDUWUIT_REQUIRE_AUTH_FOR_PROFILE_REQUESTS = "true"; - CONDUWUIT_ALLOW_LOCAL_PRESENCE = "true"; - }; - }; - systemd.services.conduwuit.serviceConfig = { - DynamicUser = lib.mkForce false; - StateDirectory = lib.mkForce "/persist/conduwuit"; - RuntimeDirectory = lib.mkForce "/persist/conduwuit/runtime"; - }; #services.nginx.enable = true; services.nginx = { @@ -132,30 +90,16 @@ config = { services.nginx.virtualHosts = let SSL = { #enableACME = true; - forceSSL = true; - useACMEHost = "kylekrein.com"; - acmeRoot = "/var/lib/acme/challenges-kylekrein"; + #forceSSL = true; + #useACMEHost = "kylekrein.com"; + #acmeRoot = "/var/lib/acme/challenges-kylekrein"; }; in { - "kylekrein.com" = (SSL // { - listen = [{port = 443; addr="0.0.0.0"; ssl=true;} {port = 8448; addr="0.0.0.0"; ssl=true;}]; - locations."/" = { - proxyPass = "http://localhost:6167"; - proxyWebsockets = true; - }; - }); "chat.kylekrein.com" = (SSL // { locations."/" = { proxyPass = "http://localhost:8080/"; proxyWebsockets = true; }; }); - "matrix.kylekrein.com" = (SSL // { - listen = [{port = 443; addr="0.0.0.0"; ssl=true;} {port = 8448; addr="0.0.0.0"; ssl=true;}]; - locations."/" = { - proxyPass = "http://localhost:6167"; - proxyWebsockets = true; - }; - }); }; systemd.network.wait-online.enable = lib.mkForce false;