diff --git a/flake.lock b/flake.lock index bc4fa24..2c64eac 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1641121012, - "narHash": "sha256-svaOMxNMQgFHjcxdmLojOxTxfqSENtnO+S3kb+npIwY=", + "lastModified": 1641700429, + "narHash": "sha256-+Pd33S+4+VX6RYGJQ5Q4n46+iRLr9y9ilq9oC/bcnoc=", "owner": "nix-community", "repo": "home-manager", - "rev": "8e7a10602d1eb1d242c9d3f9b822203d5751a8c6", + "rev": "a90ddcd62748e445bbbe01834595eda29dc28db9", "type": "github" }, "original": { @@ -72,11 +72,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1641194805, - "narHash": "sha256-LyPsFnE/yjzeQbqFVampztn6mKkWTD5Q2TRyrReqcZE=", + "lastModified": 1641671388, + "narHash": "sha256-aHoO6CpPLJK8hLkPJrpMnCRnj3YbfQZ7HNcXcnI83E0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c38ca58c0b4b5d9423609c58636988a9f81325d6", + "rev": "32356ce11b8cc5cc421b68138ae8c730cc8ad4a2", "type": "github" }, "original": { @@ -86,11 +86,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1640959792, - "narHash": "sha256-zYSR//06FU2TDOpKKj0Hkff6unsxk3NwwNFuB1loU6E=", + "lastModified": 1641528457, + "narHash": "sha256-FyU9E63n1W7Ql4pMnhW2/rO9OftWZ37pLppn/c1aisY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "59bfda72480496f32787cec8c557182738b1bd3f", + "rev": "ff377a78794d412a35245e05428c8f95fef3951f", "type": "github" }, "original": { diff --git a/home/apps/chromium.nix b/home/apps/chromium.nix new file mode 100644 index 0000000..583392c --- /dev/null +++ b/home/apps/chromium.nix @@ -0,0 +1,38 @@ +{ pkgs, lib, ... }: +let + getExtension = { id, url, sha256, version, updateUrl }: { + inherit id; + crxPath = builtins.fetchurl { + url = "${url}"; + name = "${id}.crx"; + inherit sha256; + }; + inherit version; + inherit updateUrl; + }; + createChromiumExtensionFor = browserVersion: + { id, sha256, version }: { + inherit id; + crxPath = builtins.fetchurl { + url = + "https://clients2.google.com/service/update2/crx?response=redirect&acceptformat=crx2,crx3&prodversion=${browserVersion}&x=id%3D${id}%26installsource%3Dondemand%26uc"; + name = "${id}.crx"; + inherit sha256; + }; + #updateUrl = "http://clients2.google.com/service/update2/crx?response=updatecheck&x=id%3D${id}%26uc"; + updateUrl = "https://clients2.google.com/service/update2/crx"; + inherit version; + }; + createChromiumExtension = createChromiumExtensionFor + (lib.versions.major pkgs.vivaldi.version); +in { + programs.chromium = { + enable = true; + package = pkgs.vivaldi; + extensions = [ + { id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; } + { id = "clngdbkpkpeebahjckkjfobafhncgmne"; } + { id = "adicoenigffoolephelklheejpcpoolk"; } + ]; + }; +} diff --git a/home/gaming/gaming.nix b/home/gaming/gaming.nix index c12df6e..7328866 100644 --- a/home/gaming/gaming.nix +++ b/home/gaming/gaming.nix @@ -2,10 +2,10 @@ home.packages = with pkgs; [ steam lutris - mgba - nestopia - snes9x-gtk - melonDS + #mgba + #nestopia + #snes9x-gtk + #melonDS sixpair xboxdrv ]; diff --git a/home/sway/sway.nix b/home/sway/sway.nix index d50dfc2..10abd93 100644 --- a/home/sway/sway.nix +++ b/home/sway/sway.nix @@ -7,6 +7,10 @@ QT_QPA_PLATFORM = "wayland"; QT_WAYLAND_DISABLE_WINDOWDECORATION = 1; _JAVA_AWT_WM_NONREPARENTING = 1; + GDK_SCALE = 2; + GDK_DPI_SCALE = 0.5; + XCURSOR_SIZE = 64; + QT_AUTO_SCREEN_SCALE_FACTOR = 1; }; home.packages = with pkgs; [ diff --git a/hosts/hetzner-vm/services/invidious.nix b/hosts/hetzner-vm/services/invidious.nix index 2ecd747..14d1752 100644 --- a/hosts/hetzner-vm/services/invidious.nix +++ b/hosts/hetzner-vm/services/invidious.nix @@ -32,6 +32,11 @@ }; }; + systemd.services.invidious.serviceConfig = { + Restart = "always"; + RuntimeMaxSec = "1200"; + }; + services.nginx.virtualHosts."invidious-unproxied.owo.monster" = { forceSSL = true; enableACME = true; diff --git a/hosts/lappy/lappy.nix b/hosts/lappy/lappy.nix index 885a2c3..82ba66c 100644 --- a/hosts/lappy/lappy.nix +++ b/hosts/lappy/lappy.nix @@ -14,7 +14,7 @@ profiles.network_manager profiles.sway profiles.dnscrypt - #profiles.gaming + profiles.gaming # for sci-hub and whenever websites break #profiles.tor @@ -27,7 +27,7 @@ home.base #home.bluetooth home.gui - #home.gaming + home.gaming home.dev.all home.network_manager home.sway @@ -35,6 +35,7 @@ home.apps.vivaldi home.apps.telegram home.apps.quassel + home.apps.chromium #home.apps.osu-lazer home.programming #home.programming.languages.go diff --git a/hosts/raspberry/raspberry.nix b/hosts/raspberry/raspberry.nix index ca8a899..0b37de0 100644 --- a/hosts/raspberry/raspberry.nix +++ b/hosts/raspberry/raspberry.nix @@ -8,7 +8,7 @@ profiles.tailscale profiles.sshd - hosts.raspberry.services.router + #hosts.raspberry.services.router (modulesPath + "/installer/sd-card/sd-image-aarch64.nix") ]; diff --git a/scripts/deploy-all.sh b/scripts/deploy-all.sh index 80f57c1..c4c289e 100755 --- a/scripts/deploy-all.sh +++ b/scripts/deploy-all.sh @@ -6,6 +6,6 @@ cd $REPO_ROOT git add . -deploy ".#lappy" -deploy ".#hetzner-vm" -deploy ".#raspberry" \ No newline at end of file +deploy -s ".#lappy" +deploy -s ".#hetzner-vm" +deploy -s ".#raspberry" -- --no-sandbox