diff --git a/flake.lock b/flake.lock index cd032e2..c62ce9d 100644 --- a/flake.lock +++ b/flake.lock @@ -15,11 +15,11 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1720784813, - "narHash": "sha256-8/6yU/wbf6lsUFOLisLVADD6QHHmMDUM85c7hPnPBZA=", + "lastModified": 1722879849, + "narHash": "sha256-Hg1I6vmrxWz6RrVROXn1RDCPniOJx93QQg99x/wSkjY=", "owner": "nix-community", "repo": "authentik-nix", - "rev": "89cfaf2eb197a39d12422e773f867d1a7c99b048", + "rev": "80fc87361809f78b8a8cd7e57a14b66a726379ef", "type": "github" }, "original": { @@ -31,16 +31,16 @@ "authentik-src": { "flake": false, "locked": { - "lastModified": 1720727154, - "narHash": "sha256-SMupiJGJbkBn33JP4WLF3IsBdt3SN3JvZg/EYlz443g=", + "lastModified": 1722875733, + "narHash": "sha256-LPNcvKiVrwPwc3G/j0a7KoMKAMScbzui0C3IgWXP+g4=", "owner": "goauthentik", "repo": "authentik", - "rev": "9075270b01e784d25f2ec08b82e73f1ce3086184", + "rev": "8f207c75046d722c17dee2bcf65fa386b06f5b9a", "type": "github" }, "original": { "owner": "goauthentik", - "ref": "version/2024.6.1", + "ref": "version/2024.6.3", "repo": "authentik", "type": "github" } @@ -97,11 +97,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -155,11 +155,11 @@ ] }, "locked": { - "lastModified": 1722067813, - "narHash": "sha256-nxpzoKXwn+8RsxpxwD86mtEscOMw64ZD/vGSNWzGMlA=", + "lastModified": 1723399884, + "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", "owner": "nix-community", "repo": "home-manager", - "rev": "975b83ca560d17db51a66cb2b0dc0e44213eab27", + "rev": "086f619dd991a4d355c07837448244029fc2d9ab", "type": "github" }, "original": { @@ -181,11 +181,11 @@ "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { - "lastModified": 1721121314, - "narHash": "sha256-zwc7YXga/1ppaZMWFreZykXtFwBgXodxUZiUx969r+g=", + "lastModified": 1722877200, + "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "059b50b2e729729ea00c6831124d3837c494f3d5", + "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2", "type": "gitlab" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1721924956, - "narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=", + "lastModified": 1723175592, + "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ad6a14c6bf098e98800b091668718c336effc95", + "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", "type": "github" }, "original": { @@ -290,23 +290,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1719876945, - "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "lastModified": 1722555339, + "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1721949857, - "narHash": "sha256-DID446r8KsmJhbCzx4el8d9SnPiE8qa6+eEQOJ40vR0=", + "lastModified": 1723282977, + "narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1cc729dcbc31d9b0d11d86dc7436163548a9665", + "rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc", "type": "github" }, "original": { @@ -369,11 +369,11 @@ ] }, "locked": { - "lastModified": 1721688883, - "narHash": "sha256-9jsjsRKtJRqNSTXKj9zuDFRf2PGix30nMx9VKyPgD2U=", + "lastModified": 1722897572, + "narHash": "sha256-3m/iyyjCdRBF8xyehf59QlckIcmShyTesymSb+N4Ap4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "aff2f88277dabe695de4773682842c34a0b7fd54", + "rev": "8ae477955dfd9cbf5fa4eb82a8db8ddbb94e79d9", "type": "github" }, "original": { diff --git a/hosts/laptop/akkoma/akkoma.nix b/hosts/laptop/akkoma/akkoma.nix index ff17a81..64f41f0 100644 --- a/hosts/laptop/akkoma/akkoma.nix +++ b/hosts/laptop/akkoma/akkoma.nix @@ -12,7 +12,7 @@ in # name = "mastodon-fe"; # ref = "stable"; # }; - extraPackages = with pkgs; [ zip unzip exiftool ffmpeg_5-headless graphicsmagick-imagemagick-compat ]; + extraPackages = with pkgs; [ zip unzip exiftool ffmpeg-headless graphicsmagick-imagemagick-compat ]; config = { ":pleroma".":instance" = { name = "My Akkoma instance"; diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index a87c340..4d085b2 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -192,7 +192,7 @@ in networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. # Set your time zone. - time.timeZone = "Europe/Volgograd"; + time.timeZone = "Asia/Tbilisi"; # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; @@ -271,6 +271,22 @@ in # dedicatedServer.openFirewall = true; }; + services.xrdp = { + enable = true; + defaultWindowManager = "startplasma-x11"; + # openFirewall = true; + }; + + services.postgresql = { + enable = true; + ensureDatabases = [ "testdb" ]; + ensureUsers = [ { name = "lgm"; } ]; + authentication = pkgs.lib.mkOverride 10 '' + #type database DBuser auth-method + local all all trust + ''; + }; + # Configure keymap in X11 # services.xserver.layout = "us"; # services.xserver.xkbOptions = "eurosign:e,caps:escape"; @@ -406,7 +422,7 @@ in }; # Open ports in the firewall. - networking.firewall.trustedInterfaces = [ "p2p-wl+" ]; + networking.firewall.trustedInterfaces = [ "p2p-wl+" "tailscale0" ]; networking.firewall.allowedTCPPorts = [ 5900 5905 7236 7250 ]; networking.firewall.allowedUDPPorts = [ 5900 5905 7236 5353 26000 ]; diff --git a/hosts/vps1/akkoma/akkoma.nix b/hosts/vps1/akkoma/akkoma.nix index ebbc4ec..e89a050 100644 --- a/hosts/vps1/akkoma/akkoma.nix +++ b/hosts/vps1/akkoma/akkoma.nix @@ -12,7 +12,7 @@ in # name = "mastodon-fe"; # ref = "stable"; # }; - extraPackages = with pkgs; [ zip unzip exiftool ffmpeg_5-headless graphicsmagick-imagemagick-compat ]; + extraPackages = with pkgs; [ zip unzip exiftool ffmpeg-headless graphicsmagick-imagemagick-compat ]; config = { ":pleroma".":instance" = { name = "My Akkoma instance";