diff options
| -rwxr-xr-x | flake.nix | 32 | ||||
| -rwxr-xr-x | host/Rory-nginx/configuration.nix | 5 | ||||
| -rwxr-xr-x | modules/packages/gitfs.nix | 14 |
3 files changed, 35 insertions, 16 deletions
diff --git a/flake.nix b/flake.nix index 53c4f24..1121bcd 100755 --- a/flake.nix +++ b/flake.nix @@ -11,9 +11,9 @@ botcore-v4 = { url = "gitlab:BotCore-Devs/BotCore-v4/staging"; }; - discord-client-proxy = { - url = "github:Fosscord/discord-client-proxy"; - }; +# discord-client-proxy = { +# url = "github:Fosscord/discord-client-proxy"; +# }; home-manager = { url = "github:nix-community/home-manager/master"; }; @@ -36,18 +36,18 @@ inherit home-manager; }; }; - Rory-fosscord = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - ./host/Rory-fosscord/configuration.nix - ./hardware-configuration.nix - home-manager.nixosModules.home-manager - ]; - specialArgs = { - inherit discord-client-proxy; - inherit home-manager; - }; - }; + # Rory-fosscord = nixpkgs.lib.nixosSystem { + # system = "x86_64-linux"; + # modules = [ + # ./host/Rory-fosscord/configuration.nix + # ./hardware-configuration.nix + # home-manager.nixosModules.home-manager + # ]; + # specialArgs = { + # inherit discord-client-proxy; + # inherit home-manager; + # }; + # }; Rory-postgres = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ @@ -83,4 +83,4 @@ }; }; }; -} \ No newline at end of file +} diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix index 9d1a2c4..ea1e373 100755 --- a/host/Rory-nginx/configuration.nix +++ b/host/Rory-nginx/configuration.nix @@ -4,6 +4,7 @@ imports = [ ../../modules/base-server.nix + ../../modules/packages/gitfs.nix ]; networking = { @@ -73,5 +74,9 @@ security.acme.acceptTerms = true; security.acme.defaults.email = "root@thearcanebrony.net"; + environment.systemPackages = with pkgs; [ + #gitfs + ]; + system.stateVersion = "22.11"; # DO NOT EDIT! } diff --git a/modules/packages/gitfs.nix b/modules/packages/gitfs.nix new file mode 100755 index 0000000..89bb2e2 --- /dev/null +++ b/modules/packages/gitfs.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: +{ + environment.systemPackages = with pkgs; [ + (gitfs.overrideAttrs (old: { + patches = (old.patches or []) ++ [ + (fetchpatch { + name = "fix-MutableMapping.patch"; + url = "https://patch-diff.githubusercontent.com/raw/presslabs/gitfs/pull/382.diff"; + hash = "sha256-ZaIEhv37sorSq3P+6GeH346u/5xh3qE+49D9FRNujMQ="; + }) + ]; + }) + )]; +} |