diff --git a/pkgs/default.nix b/pkgs/default.nix index 83f4b1f..415e419 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -13,7 +13,6 @@ rec { emmet-cli = pkgs.callPackage ./emmet-cli.nix { }; material-wifi-icons = pkgs.callPackage ./material-wifi-icons.nix { }; gnome-pass-search-provider = pkgs.callPackage ./gnome-pass-search-provider.nix { }; - gitlab-artifact-cleanup = pkgs.callPackage ./gitlab-artifact-cleanup.nix { }; my-factorio-headless = pkgs.callPackage ./factorio-headless { inherit (pkgs.unstable) factorio-headless; }; diff --git a/pkgs/gitlab-artifact-cleanup.nix b/pkgs/gitlab-artifact-cleanup.nix deleted file mode 100644 index 3845625..0000000 --- a/pkgs/gitlab-artifact-cleanup.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - lib, - python3Packages, - fetchFromGitHub, -}: - -let - yacl = python3Packages.buildPythonPackage rec { - pname = "yacl"; - version = "0.6.1"; - pyproject = true; - - src = fetchFromGitHub { - owner = "IngoMeyer441"; - repo = "yacl"; - rev = "v${version}"; - hash = "sha256-W62amvrH8RdWpBhfmj+iVyekuDhr74ueIOzRw6GO2i8="; - }; - - build-system = with python3Packages; [ setuptools ]; - - optional-dependencies = { - colored_exceptions = with python3Packages; [ pygments ]; - }; - - pythonImportsCheck = [ "yacl" ]; - - meta = { - description = "Yet Another Color Logger for Python programs"; - homepage = "https://github.com/IngoMeyer441/yacl"; - license = lib.licenses.mit; - }; - }; -in -python3Packages.buildPythonApplication rec { - pname = "gitlab-artifact-cleanup"; - version = "0.1.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "sciapp"; - repo = "gitlab-artifact-cleanup"; - rev = "v${version}"; - hash = "sha256-xjJyP1z7bAGjTYxFYByeFbFXu/R8908K8upH5fRZnTs="; - }; - - build-system = with python3Packages; [ setuptools ]; - - dependencies = - with python3Packages; - [ - python-gitlab - yacl - ] - ++ yacl.optional-dependencies.colored_exceptions; - - pythonImportsCheck = [ "gitlab_artifact_cleanup" ]; - - meta = { - description = "Tool for cleaning up old GitLab CI/CD job artifacts"; - homepage = "https://github.com/sciapp/gitlab-artifact-cleanup"; - license = lib.licenses.mit; - mainProgram = "gitlab-artifact-cleanup"; - }; -} diff --git a/scripts/default.nix b/scripts/default.nix index b44b40a..39fe853 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -159,7 +159,6 @@ print-battery-icon = [ ]; controller-battery = [ print-battery-icon ]; mouse-battery = [ print-battery-icon ]; - vrr-fullscreen = [ ]; nix-prefetch-firefox-extension = [ nix ]; diff --git a/scripts/vrr-fullscreen b/scripts/vrr-fullscreen deleted file mode 100755 index faca977..0000000 --- a/scripts/vrr-fullscreen +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env bash - -# List of supported outputs for VRR -output_vrr_whitelist=( - "DP-1" - "DP-2" - "DP-3" -) - -# 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/system/greetd.nix b/system/greetd.nix index 230f654..606d518 100644 --- a/system/greetd.nix +++ b/system/greetd.nix @@ -39,13 +39,7 @@ in programs.wshowkeys.enable = true; xdg.portal = { enable = true; - wlr = { - enable = true; - settings.screencast = { - chooser_type = "dmenu"; - chooser_cmd = lib.getExe pkgs.bmenu; - }; - }; + wlr.enable = true; # gtk portal needed to make gtk apps happy extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; }; diff --git a/system/kde.nix b/system/kde.nix index bed6580..fa529d0 100644 --- a/system/kde.nix +++ b/system/kde.nix @@ -22,20 +22,5 @@ kdePackages.partitionmanager kdePackages.sddm-kcm ]; - - xdg.portal = { - enable = true; - extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ]; - config = { - common = { - default = [ "kde" ]; - }; - }; - }; - - environment.sessionVariables = { - GTK_USE_PORTAL = "1"; - GDK_DEBUG = "portals"; - }; }; } diff --git a/user/git.nix b/user/git.nix index fd50475..8d10eed 100644 --- a/user/git.nix +++ b/user/git.nix @@ -73,8 +73,6 @@ in gh glab - - gitlab-artifact-cleanup ]; }; } diff --git a/user/kde.nix b/user/kde.nix index cd80989..6a19816 100644 --- a/user/kde.nix +++ b/user/kde.nix @@ -9,9 +9,4 @@ } // lib.mkIf (config.my.desktop == "kde") { services.gpg-agent.pinentry.package = lib.mkForce pkgs.pinentry-qt; - - # Some programs like Firefox and vscode don't use xdg-open, and instead use org.freedesktop.FileManager1. - # This forces Dolphin to be the provider for that. - xdg.dataFile."dbus-1/services/org.freedesktop.FileManager1.service".source = - "${pkgs.kdePackages.dolphin}/share/dbus-1/services/org.kde.dolphin.FileManager1.service"; } diff --git a/user/sway/default.nix b/user/sway/default.nix index f2ab0bd..c7b81f5 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -138,21 +138,6 @@ in services.gpg-agent.pinentry.package = pkgs.pinentry-all; - 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" ]; - }; - }; - xdg.configFile."OpenTabletDriver/settings.json" = { force = true; source = ./open-tablet-driver.json;