diff --git a/hosts/default/apps/wl-shimeji.nix b/hosts/default/apps/wl-shimeji.nix index bb7c94e..916a4ae 100644 --- a/hosts/default/apps/wl-shimeji.nix +++ b/hosts/default/apps/wl-shimeji.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, wayland, waylandProtocols, wlrProtocols, libspng }: +{ lib, stdenv, fetchgit, pkg-config, wayland, wayland-protocols, wlr-protocols, wayland-scanner, libspng }: stdenv.mkDerivation rec { pname = "wl_shimeji"; version = "1.0.0"; # Change to the appropriate version - src = fetchFromGitHub { - owner = "CluelessCatBurger"; - repo = "wl_shimeji"; + src = fetchgit { + url = "https://github.com/CluelessCatBurger/wl_shimeji.git"; rev = "392a83d5658f283ace77b0c839d5a201cebc8784"; # Change to the appropriate commit - sha256 = "sha256-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX="; # Put the correct sha256 hash + sha256 = "sha256-T7sWuKOsc0vEfkcGbRXLHit24db97crEhYadOMq4MDM="; # Put the correct sha256 hash + fetchSubmodules = true; }; - nativeBuildInputs = [ pkg-config wayland waylandProtocols wlrProtocols libspng ]; + nativeBuildInputs = [ pkg-config wayland wayland-protocols wlr-protocols libspng wayland-scanner ]; buildInputs = [ ]; @@ -25,4 +25,4 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ ]; }; -} \ No newline at end of file +} diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index d41656f..448f9e8 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -31,6 +31,12 @@ location = "https://dl.flathub.org/repo/flathub.flatpakrepo"; } ]; + services.flatpak.packages = [ + { + appId = "com.modrinth.ModrinthApp"; + origin = "flathub"; + } + ]; services.printing = { enable = true; @@ -59,10 +65,10 @@ }; # Sadly, I don't know how to install flatpaks like this. - services.flatpak.packages = [ + # services.flatpak.packages = [ # "com.usebottles.bottles" # { flatpakref = "https://sober.vinegarhq.org/sober.flatpakref"; sha256 = "0"; } - ]; + # ]; programs.hyprland = { enable = true; diff --git a/hosts/default/other/activate.nix b/hosts/default/other/activate.nix index fc2df5e..61e877f 100644 --- a/hosts/default/other/activate.nix +++ b/hosts/default/other/activate.nix @@ -2,15 +2,15 @@ { - system.nixos = { - distroName = "OCbwoy3"; - extraOSReleaseArgs = { - HOME_URL="https://ocbwoy3.dev/"; - VERSION_CODENAME=""; - NAME="OCbwoy3"; - PRETTY_NAME="OCbwoy3"; - }; - }; + # system.nixos = { + # distroName = "OCbwoy3"; + # extraOSReleaseArgs = { + # HOME_URL="https://ocbwoy3.dev/"; + # VERSION_CODENAME=""; + # NAME="OCbwoy3"; + # PRETTY_NAME="OCbwoy3"; + # }; + # }; system.activationScripts.installRoblox = { text = ''