diff --git a/db/server/global_settings.json b/db/server/global_settings.json new file mode 100644 index 0000000..eb33133 --- /dev/null +++ b/db/server/global_settings.json @@ -0,0 +1,12 @@ +{ + "endpoint_address": "217.95.42.37", + "dns_servers": [ + "1.1.1.1" + ], + "mtu": "1450", + "persistent_keepalive": "15", + "firewall_mark": "0xca6c", + "table": "auto", + "config_file_path": "/etc/wireguard/wg0.conf", + "updated_at": "2024-10-29T09:41:37.684223Z" +} diff --git a/db/server/hashes.json b/db/server/hashes.json new file mode 100644 index 0000000..9e1791c --- /dev/null +++ b/db/server/hashes.json @@ -0,0 +1,4 @@ +{ + "client": "none", + "server": "none" +} diff --git a/db/server/interfaces.json b/db/server/interfaces.json new file mode 100644 index 0000000..e1d395e --- /dev/null +++ b/db/server/interfaces.json @@ -0,0 +1,10 @@ +{ + "addresses": [ + "10.252.1.0/24" + ], + "listen_port": "51820", + "updated_at": "2024-10-29T09:41:37.268599Z", + "post_up": "", + "pre_down": "", + "post_down": "" +} diff --git a/db/server/keypair.json b/db/server/keypair.json new file mode 100644 index 0000000..8851101 --- /dev/null +++ b/db/server/keypair.json @@ -0,0 +1,5 @@ +{ + "private_key": "oMDHhF9eVKKYwzSCJb+9yp721DQTeAH/X/3DX499pUc=", + "public_key": "CiW9BeCi5VoIMSkbqNEqAkHjLVvmMWF744PMPn3wIBU=", + "updated_at": "2024-10-29T09:41:37.268948Z" +} diff --git a/db/users/admin.json b/db/users/admin.json new file mode 100644 index 0000000..44d7378 --- /dev/null +++ b/db/users/admin.json @@ -0,0 +1,6 @@ +{ + "username": "admin", + "password": "", + "password_hash": "JDJhJDE0JFQzMnhkYVJya1VlMXR0a1JjYUJHbHVLb3VSNzdzZ2dDc0FoYzcyNG5QOGVqQlZmL0hkOEph", + "admin": true +} diff --git a/flake.lock b/flake.lock index e2be8d7..63a413b 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "onchg": "onchg" }, "locked": { - "lastModified": 1727101025, - "narHash": "sha256-2mYtBzvhJsCmp8mXzgy+4HIGlA1aEUGZMfRp5LcqqZg=", + "lastModified": 1728874779, + "narHash": "sha256-498cQTDaU7bU3CbWPCQgSGkV25T8sZQmMwhU58WkIXE=", "owner": "aksiksi", "repo": "compose2nix", - "rev": "6f63b6706580726f43f4d0788f837313922bf7d3", + "rev": "07cad037b8887ba94cd7236ffd1a8ee47002a9fe", "type": "github" }, "original": { @@ -68,11 +68,11 @@ ] }, "locked": { - "lastModified": 1722113426, - "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", + "lastModified": 1728330715, + "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", "owner": "numtide", "repo": "devshell", - "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", + "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", "type": "github" }, "original": { @@ -105,11 +105,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1727064198, - "narHash": "sha256-GAwO4R2vYDJse03dfg+8hCttoQSm8LxZCae3BXaXRPk=", + "lastModified": 1730088193, + "narHash": "sha256-bal4Z9FuMyOeDf9QKjq0BY/ftxas95yksZZjqz3erZo=", "owner": "rycee", "repo": "nur-expressions", - "rev": "851ae30f15d053b7542cc3abb52ec5be6f100fa3", + "rev": "2e14b0705c0c510258864a9832832b89ca6628e9", "type": "gitlab" }, "original": { @@ -189,11 +189,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -273,11 +273,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -336,11 +336,11 @@ ] }, "locked": { - "lastModified": 1726745158, - "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -378,11 +378,11 @@ ] }, "locked": { - "lastModified": 1726985855, - "narHash": "sha256-NJPGK030Y3qETpWBhj9oobDQRbXdXOPxtu+YgGvZ84o=", + "lastModified": 1730016908, + "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", "owner": "nix-community", "repo": "home-manager", - "rev": "04213d1ce4221f5d9b40bcee30706ce9a91d148d", + "rev": "e83414058edd339148dc142a8437edb9450574c8", "type": "github" }, "original": { @@ -400,11 +400,11 @@ ] }, "locked": { - "lastModified": 1726902823, - "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=", + "lastModified": 1730016908, + "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", "owner": "nix-community", "repo": "home-manager", - "rev": "14929f7089268481d86b83ed31ffd88713dcd415", + "rev": "e83414058edd339148dc142a8437edb9450574c8", "type": "github" }, "original": { @@ -413,6 +413,34 @@ "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729544999, + "narHash": "sha256-YcyJLvTmN6uLEBGCvYoMLwsinblXMkoYkNLEO4WnKus=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "65c207c92befec93e22086da9456d3906a4e999c", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.5", + "repo": "ixx", + "type": "github" + } + }, "lix": { "flake": false, "locked": { @@ -441,7 +469,7 @@ "narHash": "sha256-64lB/NO6AQ6z6EDCemPSYZWX/Qc6Rt04cPia5T5v01g=", "rev": "29ed1bb67751e5b107d08df35d18dda6d45324e9", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/29ed1bb67751e5b107d08df35d18dda6d45324e9.tar.gz?rev=29ed1bb67751e5b107d08df35d18dda6d45324e9" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/29ed1bb67751e5b107d08df35d18dda6d45324e9.tar.gz" }, "original": { "type": "tarball", @@ -453,11 +481,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1725746760, - "narHash": "sha256-p38Uini6lChBCF0mZndHXTAy7ZH/OQLY696BFCHg92g=", + "lastModified": 1728371783, + "narHash": "sha256-ufI7115ims2PPxggpWQhigAUrwlwu155wVgngZzzyZ0=", "owner": "viperML", "repo": "nh", - "rev": "7650b372e55a36d7765ee0a5e59b142731bc8b3d", + "rev": "afdff9ab4fdb9c329b5d97c5b742242b97f8754d", "type": "github" }, "original": { @@ -474,11 +502,11 @@ ] }, "locked": { - "lastModified": 1726742753, - "narHash": "sha256-QclpWrIFIg/yvWRiOUaMp1WR+TGUE9tb7RE31xHlxWc=", + "lastModified": 1729982130, + "narHash": "sha256-HmLLQbX07rYD0RXPxbf3kJtUo66XvEIX9Y+N5QHQ9aY=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c03f85fa42d68d1056ca1740f3113b04f3addff2", + "rev": "2eb472230a5400c81d9008014888b4bff23bcf44", "type": "github" }, "original": { @@ -530,11 +558,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1727040444, - "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=", + "lastModified": 1730068391, + "narHash": "sha256-jlAGtfMuI8pUUoUmNkm2P/38pOtHZdcAf3Az8XQLAf4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac", + "rev": "6906ac67a1078cf950b8527341e229eeecb5bc30", "type": "github" }, "original": { @@ -562,11 +590,11 @@ }, "nixpkgs-2405": { "locked": { - "lastModified": 1726969270, - "narHash": "sha256-8fnFlXBgM/uSvBlLWjZ0Z0sOdRBesyNdH0+esxqizGc=", + "lastModified": 1729973466, + "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23cbb250f3bf4f516a2d0bf03c51a30900848075", + "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", "type": "github" }, "original": { @@ -590,11 +618,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1727111026, - "narHash": "sha256-YTryIMpXFKrcCPR9tHaH9pRxu+BZOyBiLfJEEc0NOvk=", + "lastModified": 1730147637, + "narHash": "sha256-oQx0w89dKGJsUba1AZdcZ9ga8xbbnlS8z7nGlcft8Co=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "595d042883f4e0161286c99e4edefa9dbaf982d9", + "rev": "d7216383a52ea029800cd271fbb521038e94e93e", "type": "github" }, "original": { @@ -621,11 +649,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1725762081, - "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", + "lastModified": 1729973466, + "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05", + "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", "type": "github" }, "original": { @@ -668,11 +696,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1725001927, - "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", + "lastModified": 1727540905, + "narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", + "rev": "fbca5e745367ae7632731639de5c21f29c8744ed", "type": "github" }, "original": { @@ -700,11 +728,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1726937504, - "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9357f4f23713673f310988025d9dc261c20e70c6", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "type": "github" }, "original": { @@ -761,11 +789,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1727050833, - "narHash": "sha256-uq8pP+WsJsZ3QA+GoSftUsAvhx3btBOCWAqKQSFcL1M=", + "lastModified": 1730142611, + "narHash": "sha256-5FeMJgj7DRLVKLsBQiaZusvf/4sxhMEpmNC3Qm/rvnk=", "owner": "nix-community", "repo": "nixvim", - "rev": "a9345dcfc31519734361fecd246d32164feafbca", + "rev": "e7356f6be06a68e36987df6cfde3541a6817b708", "type": "github" }, "original": { @@ -777,17 +805,18 @@ "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils_5", + "ixx": "ixx", "nixpkgs": [ "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1726816132, - "narHash": "sha256-AbB0lgc0IbzLIxj1O3cosiMNAVQak4KJtvq9q8MjHhs=", + "lastModified": 1730044642, + "narHash": "sha256-DbyV9l3hkrSWcN34S6d9M4kAFss0gEHGtjqqMdG9eAs=", "owner": "NuschtOS", "repo": "search", - "rev": "7733a39a1321057172d87e6251ded7cdeb67171e", + "rev": "e373332c1f8237fc1263901745b0fe747228c8ba", "type": "github" }, "original": { @@ -827,11 +856,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1727026900, - "narHash": "sha256-0b+Mo27UE1WTd00k0hHibdeGA5tBTxepg3clAWZZOdo=", + "lastModified": 1729856880, + "narHash": "sha256-UIArlQ7eQ/x6vs13tG9SR48NGPxmue+e/4D1vevZ0Tc=", "owner": "SaumonNet", "repo": "proxmox-nixos", - "rev": "53f9cd6ad81f1bf36b257470d82e77e0629578c8", + "rev": "93880e244b528deca89828bc1edf08e23ccc18c4", "type": "github" }, "original": { @@ -886,11 +915,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1726524647, - "narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=", + "lastModified": 1729999681, + "narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e2d404a7ea599a013189aa42947f66cede0645c8", + "rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56", "type": "github" }, "original": { @@ -1001,11 +1030,11 @@ ] }, "locked": { - "lastModified": 1726734507, - "narHash": "sha256-VUH5O5AcOSxb0uL/m34dDkxFKP6WLQ6y4I1B4+N3L2w=", + "lastModified": 1730025913, + "narHash": "sha256-Y9NtFmP8ciLyRsopcCx1tyoaaStKeq+EndwtGCgww7I=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "ee41a466c2255a3abe6bc50fc6be927cdee57a9f", + "rev": "bae131e525cc8718da22fbeb8d8c7c43c4ea502a", "type": "github" }, "original": { diff --git a/home/modules/firefox.nix b/home/modules/firefox.nix index b876bc7..41c705f 100644 --- a/home/modules/firefox.nix +++ b/home/modules/firefox.nix @@ -74,31 +74,31 @@ with inputs; { } ]; } - { - name = "piracy"; - bookmarks = [ - { - name = "slskd"; - url = "http://seraphim.fritz.box:5030"; - } - { - name = "Sonarr"; - url = "http://seraphim.fritz.box:8989"; - } - { - name = "Radarr"; - url = "http://seraphim.fritz.box:7878"; - } - { - name = "Prowlarr"; - url = "http://seraphim.fritz.box:9696"; - } - { - name = "qBittorrent"; - url = "http://seraphim.fritz.box:8085"; - } - ]; - } + { + name = "piracy"; + bookmarks = [ + { + name = "slskd"; + url = "http://seraphim.fritz.box:5030"; + } + { + name = "Sonarr"; + url = "http://seraphim.fritz.box:8989"; + } + { + name = "Radarr"; + url = "http://seraphim.fritz.box:7878"; + } + { + name = "Prowlarr"; + url = "http://seraphim.fritz.box:9696"; + } + { + name = "qBittorrent"; + url = "http://seraphim.fritz.box:8085"; + } + ]; + } ]; } ]; diff --git a/home/modules/home-pkgs.nix b/home/modules/home-pkgs.nix index 883f3d1..4a4ab6b 100644 --- a/home/modules/home-pkgs.nix +++ b/home/modules/home-pkgs.nix @@ -11,6 +11,7 @@ in { home.packages = (lib.optionals (config.os == "linux") (with pkgs; [ + element-desktop cargo yubioath-flutter steam @@ -104,7 +105,6 @@ in { vesktop discord - element-desktop qbittorrent nicotine-plus @@ -121,6 +121,9 @@ in { sayonara feishin + wireguard-tools + wireguard-ui + nix-tree nixos-icons diff --git a/home/modules/nixvim.nix b/home/modules/nixvim.nix index 6f17349..0f01c4d 100644 --- a/home/modules/nixvim.nix +++ b/home/modules/nixvim.nix @@ -32,7 +32,7 @@ enable = true; colorscheme = "apathy"; settings = { - telescope_borders = true; + telescope_borders = true; }; }; plugins = { @@ -135,13 +135,13 @@ }; lsp-format = {enable = true;}; copilot-lua = { - enable = false; + enable = true; suggestion = { enabled = false; }; panel.enabled = false; }; - copilot-cmp.enable = false; + copilot-cmp.enable = true; copilot-chat = { enable = true; settings.context = "buffers"; @@ -180,6 +180,10 @@ servers = { # disabled due to compile error # typst-lsp.enable = true; + protols = { + enable = true; + package = pkgs.protols; + }; typos-lsp.enable = false; docker-compose-language-service.enable = true; pylsp.enable = true; @@ -187,7 +191,10 @@ lua-ls.enable = true; gopls.enable = true; nushell.enable = true; - clangd.enable = true; + clangd = { + enable = true; + filetypes = ["c" "cpp" "objc" "objcpp" "cpp"]; + }; svelte.enable = true; ts-ls.enable = true; java-language-server.enable = true; @@ -248,7 +255,7 @@ {name = "path";} {name = "buffer";} {name = "luasnip";} - # {name = "copilot";} + {name = "copilot";} ]; #mapping = { # __raw = '' diff --git a/hosts/x86_64-linux/beleth/caddy.nix b/hosts/x86_64-linux/beleth/caddy.nix index 6d11fec..989d873 100644 --- a/hosts/x86_64-linux/beleth/caddy.nix +++ b/hosts/x86_64-linux/beleth/caddy.nix @@ -1,4 +1,9 @@ -{config, lib, pkgs, ...}: { +{ + config, + lib, + pkgs, + ... +}: { services.caddy = { enable = true; email = "xqtc@tutanota.com"; diff --git a/hosts/x86_64-linux/beleth/external-users.nix b/hosts/x86_64-linux/beleth/external-users.nix index 903ddcc..dd9f80c 100644 --- a/hosts/x86_64-linux/beleth/external-users.nix +++ b/hosts/x86_64-linux/beleth/external-users.nix @@ -1,5 +1,9 @@ -{config, pkgs, lib, ...}: { + config, + pkgs, + lib, + ... +}: { users.users.marie = { isNormalUser = true; packages = with pkgs; [ @@ -32,7 +36,7 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKA4+3PkFptATzrWncxdj63SqZ747cDb8TqmdQFugvW7 ellie@card" ]; }; - + users.users.brodo = { isNormalUser = true; packages = with pkgs; [