diff --git a/flake.lock b/flake.lock index a76aa8d..689e9af 100644 --- a/flake.lock +++ b/flake.lock @@ -469,21 +469,6 @@ "type": "indirect" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1726937504, - "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9357f4f23713673f310988025d9dc261c20e70c6", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, "plymouth-themes": { "flake": false, "locked": { @@ -527,7 +512,6 @@ "nix-index-database": "nix-index-database", "nixos-mailserver": "nixos-mailserver", "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable", "plymouth-themes": "plymouth-themes", "ranger-icons": "ranger-icons", "tlauncher": "tlauncher", diff --git a/flake.nix b/flake.nix index ec2011f..23ece59 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,6 @@ description = "My system config"; inputs = { nixpkgs.url = "nixpkgs/nixos-24.05"; - nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; - home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; @@ -159,10 +157,7 @@ }; phantom = lib.nixosSystem { inherit system specialArgs; - modules = [ - { nixpkgs.pkgs = pkgs; } - ./hosts/phantom - ]; + modules = [ ./hosts/phantom ]; }; }; diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index 3350e0d..b45a935 100644 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -36,8 +36,6 @@ in hardware.opentabletdriver.enable = true; - boot.kernelPackages = pkgs.linuxPackages_latest; - boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ]; boot.initrd.kernelModules = [ "amdgpu" ]; boot.kernelModules = [ diff --git a/hosts/phantom/invidious.nix b/hosts/phantom/invidious.nix index 60c1dca..8c1e0f6 100644 --- a/hosts/phantom/invidious.nix +++ b/hosts/phantom/invidious.nix @@ -1,40 +1,12 @@ { - inputs, - pkgs, - config, - ... -}: -{ - # Replace with unstable, since 24.05 does not have sig-helper - disabledModules = [ "services/web-apps/invidious.nix" ]; - imports = [ (inputs.nixpkgs-unstable + "/nixos/modules/services/web-apps/invidious.nix") ]; - services.invidious = { enable = true; domain = "invidious.lelgenio.com"; nginx.enable = true; port = 10601; - http3-ytproxy.enable = true; - sig-helper = { - enable = true; - package = pkgs.unstable.inv-sig-helper; + settings.db = { + user = "invidious"; + dbname = "invidious"; }; - # { - # "visitor_data": "...", - # "po_token": "..." - # } - extraSettingsFile = config.age.secrets.phantom-invidious-settings.path; - settings = { - force_resolve = "ipv6"; - db = { - user = "invidious"; - dbname = "invidious"; - }; - }; - }; - - age.secrets.phantom-invidious-settings = { - file = ../../secrets/phantom-invidious-settings.age; - mode = "666"; }; } diff --git a/overlays/default.nix b/overlays/default.nix index 8886897..2ac2ae1 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -2,7 +2,6 @@ rec { all = [ scripts - unstable themes new-packages patches @@ -12,10 +11,6 @@ rec { scripts = (import ../scripts); - unstable = final: prev: { - unstable = import inputs.nixpkgs-unstable { inherit (final) system config; }; - }; - themes = ( final: prev: { papirus_red = (final.papirus-icon-theme.override { color = "red"; }); diff --git a/scripts/default.nix b/scripts/default.nix index 1e3290e..0e88436 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -129,7 +129,6 @@ libinput libratbag ]; - vrr-fullscreen = [ ]; } // lib.mapAttrs importScript { wdmenu = ./wdmenu.nix; diff --git a/scripts/vrr-fullscreen b/scripts/vrr-fullscreen deleted file mode 100755 index 8413923..0000000 --- a/scripts/vrr-fullscreen +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -# List of supported outputs for VRR -output_vrr_whitelist=( - "DP-1" - "DP-2" -) - -# Toggle VRR for fullscreened apps in prespecified displays to avoid stutters while in desktop -swaymsg -t subscribe -m '[ "window" ]' | while read window_json; do - window_event=$(echo ${window_json} | jq -r '.change') - - # Process only focus change and fullscreen toggle - if [[ $window_event = "focus" || $window_event = "fullscreen_mode" ]]; then - output_json=$(swaymsg -t get_outputs | jq -r '.[] | select(.focused == true)') - output_name=$(echo ${output_json} | jq -r '.name') - - # Use only VRR in whitelisted outputs - if [[ ${output_vrr_whitelist[*]} =~ ${output_name} ]]; then - output_vrr_status=$(echo ${output_json} | jq -r '.adaptive_sync_status') - window_fullscreen_status=$(echo ${window_json} | jq -r '.container.fullscreen_mode') - - # Only update output if nesseccary to avoid flickering - [[ $output_vrr_status = "disabled" && $window_fullscreen_status = "1" ]] && swaymsg output "${output_name}" adaptive_sync 1 - [[ $output_vrr_status = "enabled" && $window_fullscreen_status = "0" ]] && swaymsg output "${output_name}" adaptive_sync 0 - fi - fi -done diff --git a/secrets/phantom-invidious-settings.age b/secrets/phantom-invidious-settings.age deleted file mode 100644 index 6ca9077..0000000 --- a/secrets/phantom-invidious-settings.age +++ /dev/null @@ -1,16 +0,0 @@ -age-encryption.org/v1 --> ssh-rsa BwwxHg -iTcgtxF1IxopbtF+aw7V8IQfH7tWiMk9lE/eWlVHVjeaRvER5W6Y3xZNOFCjtbqY -VwEyV6ibfZ4GJt1jRu2icEH/AnLUJFFGQnxu/K/rtoZ3tqSIk9WCBv3aPo4oZRiU -uaaxi2gD8qo1RLyl/Ij7Djw4i/isUOO1EON5sgx1d39k6qUD4Mak0DSU4EtGdTsr -OaxDAc0kAxhxZQOUH/QlKa0HLonaFcy1LHqvttOcw3UZuZnaYfZiPlcqe3USS9cm -96aIC5cS9pHr4JFrqRYvfpla2TY5jlCB/xBGw3KjGEIQoBPXSsJZA6BCMZyp00++ -tdfS2aomt9HFmb1wZDS0jWAxkVF6nXXBbolFVih+58h0nYLljtHIQ3SizRoXY459 -x3JE9NReHp2OO3SlIeO03Kv8YMBvj7nSSd1C1PMpu+hJ/eCXi1WQxD6QY+40muk6 -KhqE3PZ8BCY2b+VpywUF5gVH28mo3jscqAzhf2dZ3SQlzldI+hFyKPxTdAqkfUOH - ---- cinb+wzjVfTkpfm1CtFIFaepwoQVCj1MquB5rAC45Ew - -6 -ZCHS0 7 EX* qb=OwuP ǖѳ/mv2Vī -xv[̂A~evd0ni1қQ"@ٹ{Kp:ϵusB(Xr[QVgT@*B .hE鲟뒭zlz|k`l88McchZ` ?yeo+M-:/**cZD2&Ǣ e*Hn"~+|ua(6J \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 7b5fdd8..368b837 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -17,5 +17,4 @@ in "phantom-renawiki.age".publicKeys = [ main_ssh_public_key ]; "phantom-forgejo-mailer-password.age".publicKeys = [ main_ssh_public_key ]; "phantom-mastodon-mailer-password.age".publicKeys = [ main_ssh_public_key ]; - "phantom-invidious-settings.age".publicKeys = [ main_ssh_public_key ]; } diff --git a/user/sway/default.nix b/user/sway/default.nix index 2a6dc70..42e26af 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -69,9 +69,9 @@ in }; output = { "*" = { - adaptive_sync = "off"; bg = "${theme.background} fill"; mode = "1920x1080@144.000Hz"; + adaptive_sync = "on"; }; }; fonts = { @@ -122,21 +122,6 @@ in indicator = true; }; - systemd.user.services.vrr-fullscreen = { - Unit = { - Description = "Enable VRR for fullscreen windows"; - PartOf = [ "graphical-session.target" ]; - After = [ "graphical-session.target" ]; - }; - Service = { - ExecStart = "${lib.getExe pkgs.vrr-fullscreen}"; - Restart = "on-failure"; - }; - Install = { - WantedBy = [ "sway-session.target" ]; - }; - }; - services.gpg-agent.pinentryPackage = pkgs.pinentry-all; xdg.configFile."OpenTabletDriver/settings.json".source = ./open-tablet-driver.json;