diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..ec57d20 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "rhizome-vps"] + path = rhizome-vps + url = https://git.rhizome.tf/rhizome/server-config diff --git a/flake.lock b/flake.lock index 9a2c46c..9cadff5 100644 --- a/flake.lock +++ b/flake.lock @@ -236,11 +236,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -319,11 +319,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1688832748, - "narHash": "sha256-XZR1DNdDWcbd6/sissuRn1WbDiHz9WS7ttGa1u520qI=", + "lastModified": 1689978081, + "narHash": "sha256-CnnUYz6pRxjf4yB7sU+WYykTmb+V0ZH9YYfFyMLuKcE=", "owner": "helix-editor", "repo": "helix", - "rev": "507dd5086093f48e666c99fb509b31721f366df2", + "rev": "5c41f22c2a20a1b8a91ddd6397686bd752591ffc", "type": "github" }, "original": { @@ -339,11 +339,11 @@ ] }, "locked": { - "lastModified": 1688853517, - "narHash": "sha256-oatIWiJI13an13XOX43pnKMRmqzQOUgF/IVNG73r8nA=", + "lastModified": 1689891262, + "narHash": "sha256-Pc4wDczbdgd6QXKJIXprgxe7L9AVDsoAkMnvm5vmpUU=", "owner": "nix-community", "repo": "home-manager", - "rev": "e15010ee6e9bd356a6746ff9b9f9a9097ee8ddcf", + "rev": "ee5673246de0254186e469935909e821b8f4ec15", "type": "github" }, "original": { @@ -360,11 +360,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1688856272, - "narHash": "sha256-4DRSX1ELf9Me/RVt8nmxwTKrDweQHoZg5/wCUL0ER9E=", + "lastModified": 1689959100, + "narHash": "sha256-pTK3YtZN32oLm0Zkm6SySX/wv/GGM49/yd7bFKdDSCM=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "b33d82734fb3b88b87e1c89cbf2ec8883ea029ac", + "rev": "27dd07f1b8f89dcf6fe29fec75fdd5c8e9bc9ec4", "type": "github" }, "original": { @@ -461,11 +461,11 @@ ] }, "locked": { - "lastModified": 1688680913, - "narHash": "sha256-jo/RDXXL7Zx6M36m0f0F+tQPJRzs31Y7gaDiTqqh4Ns=", + "lastModified": 1689479461, + "narHash": "sha256-Ak+PTYdmfOQEmcOsOEnrwqdP0HP20PLraRwpjSAzSeE=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "44337c30729a3616c7a71d485af70d231b29675a", + "rev": "22fa44b7f14684d184733fb26a628f3878ff7aaf", "type": "github" }, "original": { @@ -560,11 +560,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1688764204, - "narHash": "sha256-FsvK+tIvelCI0tWwlMDKfiyb7P/KfxpGbXMrdCKiT8s=", + "lastModified": 1689885880, + "narHash": "sha256-2ikAcvHKkKh8J/eUrwMA+wy1poscC+oL1RkN1V3RmT8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d8bb6c681cf86265fdcf3cc3119f757bbb085835", + "rev": "fa793b06f56896b7d1909e4b69977c7bf842b2f0", "type": "github" }, "original": { @@ -607,11 +607,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1688679045, - "narHash": "sha256-t3xGEfYIwhaLTPU8FLtN/pLPytNeDwbLI6a7XFFBlGo=", + "lastModified": 1689940971, + "narHash": "sha256-397xShPnFqPC59Bmpo3lS+/Aw0yoDRMACGo1+h2VJMo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3c7487575d9445185249a159046cc02ff364bff8", + "rev": "9ca785644d067445a4aa749902b29ccef61f7476", "type": "github" }, "original": { @@ -623,11 +623,11 @@ }, "nur": { "locked": { - "lastModified": 1688863826, - "narHash": "sha256-6LJMOQdugKK0cR02bfyiL+ulzxx4sVRMI6hmCqd+z9U=", + "lastModified": 1689990870, + "narHash": "sha256-1vnciLjQPHqyDpLF7bT0/8QSzbJVSvJUKLEGggNC3iQ=", "owner": "nix-community", "repo": "NUR", - "rev": "7a85833f758ac5ad9f6e3620cf1445f7907073e3", + "rev": "37ed05c6953e388784580a9bd6405d5d845524db", "type": "github" }, "original": { @@ -732,11 +732,11 @@ ] }, "locked": { - "lastModified": 1688783586, - "narHash": "sha256-HHaM2hk2azslv1kH8zmQxXo2e7i5cKgzNIuK4yftzB0=", + "lastModified": 1689992383, + "narHash": "sha256-x/MSjx2aA9aJqQA3fUHxiH0l8uG+1vxnkRNkqAZHQ2U=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7a29283cc242c2486fc67f60b431ef708046d176", + "rev": "97fcdd4793778cf8e4f9007079cb9d2b836d7ea9", "type": "github" }, "original": { @@ -794,17 +794,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1686753331, - "narHash": "sha256-KovjVFwcuoUO0eu/UiWrnD3+m/K+SHSAVIz4xF9K1XA=", + "lastModified": 1689611045, + "narHash": "sha256-3RTOlQabkNetQ4O4UzSf57JPco9VGVHhSU1ls5uKBeE=", "owner": "wlroots", "repo": "wlroots", - "rev": "7e7633abf09b362d0bad9e3fc650fd692369291d", + "rev": "7791ffe0584c4ac13c170e1661ce33bdbd4a9b9e", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", + "rev": "7791ffe0584c4ac13c170e1661ce33bdbd4a9b9e", "type": "gitlab" } }, diff --git a/home/home.nix b/home/home.nix index f2e38aa..b33d0b7 100644 --- a/home/home.nix +++ b/home/home.nix @@ -55,7 +55,6 @@ in { culr swayosd fuzzel - emote kdeconnect # syncthing @@ -569,6 +568,9 @@ in { procMacro = { enable = true; }; + check = { + command = "clippy"; # as i walk through the valley of the sha + }; }; }]; @@ -634,7 +636,7 @@ in { enable = true; enableAutosuggestions = true; enableCompletion = true; - enableSyntaxHighlighting = true; + syntaxHighlighting.enable = true; enableVteIntegration = true; autocd = true; defaultKeymap = "viins"; diff --git a/server-conf.nix b/reflector.nix similarity index 99% rename from server-conf.nix rename to reflector.nix index 8204dee..9698995 100644 --- a/server-conf.nix +++ b/reflector.nix @@ -42,7 +42,7 @@ in { # ]; nix.settings.experimental-features = ["flakes" "nix-command"]; - systemd.services.NetworkManager-wait-online.enable = false; + # systemd.services.NetworkManager-wait-online.enable = false; # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; diff --git a/rhizome-vps b/rhizome-vps new file mode 160000 index 0000000..875c712 --- /dev/null +++ b/rhizome-vps @@ -0,0 +1 @@ +Subproject commit 875c712c612f02d090e9f502dc92ac0a9c8a730e diff --git a/rice.nix b/rice.nix index 952c42e..adbd02d 100644 --- a/rice.nix +++ b/rice.nix @@ -101,7 +101,7 @@ in rec { image = builtins.path { name = "wallpaper"; path = ./wallpaper.png; - sha256 = "e6fb6eb742b795bf2a356d923fe1c37f9067721e9b7048ccfaa58ca7925e5db3"; + sha256 = "8d944e1ca6c3769060b715467a0dbe0f83ee99ff8b59aac80c2cacb7e838b7f9"; }; # image = prev.fetchurl { # url = "https://github.com/Apeiros-46B/everforest-walls/blob/main/close_up/circuit_1.png?raw=true"; diff --git a/system/configuration.nix b/system/configuration.nix index 7e8e2c4..df76ea4 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -85,6 +85,7 @@ services.udisks2.enable = true; + programs.hyprland = { enable = true; xwayland = { @@ -123,8 +124,9 @@ enable = true; settings = { default_session = { - # command = "${lib.getExe pkgs.greetd.tuigreet} -r -g \"what's good\" --time --sessions ${config.services.xserver.displayManager.sessionData.desktops}/share/wayland-sessions"; - command = "${pkgs.dbus}/bin/dbus-run-session ${lib.getExe pkgs.hyprland} -c /etc/hyprland_login"; + command = "${lib.getExe pkgs.greetd.tuigreet} -r -g \"what's good\" --time --sessions ${config.services.xserver.displayManager.sessionData.desktops}/share/wayland-sessions"; + # command = "${lib.getExe pkgs.hyprland} -c /etc/hyprland_login"; + # command = "${pkgs.dbus}/bin/dbus-run-session ${lib.getExe pkgs.hyprland} -c /etc/hyprland_login"; user = "greeter"; }; };