From 552ed08cbfc2bcac024549dde919543571557358 Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Fri, 26 May 2023 14:50:29 +0200 Subject: [PATCH] temp enabled docker on the vps --- flake.lock | 6 +++--- hosts/falkenstein-1/default.nix | 2 ++ .../modules/trucksimulatorbot/default.nix | 21 ++++++++++++++----- hosts/nuc/modules/backup/default.nix | 2 +- hosts/thinkpad/default.nix | 5 +++++ users/rouven/modules/default.nix | 1 + users/rouven/modules/mpv/default.nix | 9 ++++++++ users/rouven/modules/packages.nix | 1 - 8 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 users/rouven/modules/mpv/default.nix diff --git a/flake.lock b/flake.lock index f627f7f..01506e7 100644 --- a/flake.lock +++ b/flake.lock @@ -75,11 +75,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1684959562, - "narHash": "sha256-Lmdq2O1JtIu7JPce852a7oChjm/zmkLg/JUAT3Tmh6I=", + "lastModified": 1685105343, + "narHash": "sha256-ypXKGzTQWJqbHHrPnSHLo4b2vNtfOFyh6sDdNPi7/WQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "a2bb95fc60c717c873eff273f5ee035e622565d0", + "rev": "5f4659afef5856c509d53957e62b7f6c38d39f41", "type": "github" }, "original": { diff --git a/hosts/falkenstein-1/default.nix b/hosts/falkenstein-1/default.nix index d1fa36f..c5defa7 100644 --- a/hosts/falkenstein-1/default.nix +++ b/hosts/falkenstein-1/default.nix @@ -32,12 +32,14 @@ console = { keyMap = "dvorak"; }; + virtualisation.docker.enable = true; environment.systemPackages = with pkgs; [ vim wget htop-vim helix + docker-compose ]; programs.git = { enable = true; diff --git a/hosts/falkenstein-1/modules/trucksimulatorbot/default.nix b/hosts/falkenstein-1/modules/trucksimulatorbot/default.nix index 0479945..6a89abb 100644 --- a/hosts/falkenstein-1/modules/trucksimulatorbot/default.nix +++ b/hosts/falkenstein-1/modules/trucksimulatorbot/default.nix @@ -6,11 +6,22 @@ in services.trucksimulatorbot = { images.enable = true; }; - services.nginx.virtualHosts."images.${domain}" = { - enableACME = true; - forceSSL = true; - locations."/" = { - proxyPass = "http://127.0.0.1:${toString config.services.trucksimulatorbot.images.listenPort}"; + services.nginx.virtualHosts = { + "images.${domain}" = { + enableACME = true; + forceSSL = true; + locations."/" = { + proxyPass = "http://127.0.0.1:${toString config.services.trucksimulatorbot.images.listenPort}"; + }; + }; + "${domain}" = { + enableACME = true; + forceSSL = true; + locations."/invite".return = " 301 https://discord.com/api/oauth2/authorize?client_id=831052837353816066&permissions=262144&scope=bot%20applications.commands"; + locations."/" = { + proxyPass = "http://127.0.0.1:9000"; + }; }; }; } + diff --git a/hosts/nuc/modules/backup/default.nix b/hosts/nuc/modules/backup/default.nix index 9d1076c..741b51a 100644 --- a/hosts/nuc/modules/backup/default.nix +++ b/hosts/nuc/modules/backup/default.nix @@ -3,7 +3,7 @@ { device = "/dev/disk/by-uuid/f6905cdb-c130-465a-90a3-93997023b5d3 "; fsType = "btrfs"; - options = [ "compress=zstd" "noatime" ]; + options = [ "compress=zstd" "noatime" "nofail" ]; neededForBoot = false; }; diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix index 76bd46d..f649af1 100755 --- a/hosts/thinkpad/default.nix +++ b/hosts/thinkpad/default.nix @@ -155,6 +155,11 @@ }; }; + hardware.opengl.extraPackages = with pkgs; [ + intel-compute-runtime + intel-media-driver + ]; + environment.systemPackages = with pkgs; [ # hardware utilities btdu diff --git a/users/rouven/modules/default.nix b/users/rouven/modules/default.nix index aa0a8ec..6b9bbd9 100644 --- a/users/rouven/modules/default.nix +++ b/users/rouven/modules/default.nix @@ -7,6 +7,7 @@ ./gpg ./helix ./hyprland + ./mpv ./qutebrowser ./sops ./spotify diff --git a/users/rouven/modules/mpv/default.nix b/users/rouven/modules/mpv/default.nix new file mode 100644 index 0000000..639436f --- /dev/null +++ b/users/rouven/modules/mpv/default.nix @@ -0,0 +1,9 @@ +{ ... }: +{ + programs.mpv = { + enable = true; + config = { + hwdec = "auto"; + }; + }; +} diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix index 8524491..8ea478b 100644 --- a/users/rouven/modules/packages.nix +++ b/users/rouven/modules/packages.nix @@ -17,7 +17,6 @@ # graphics evince # pdf viewer gimp - mpv # best video player out there ffmpeg # sound