From 37214ffb4ca66b75bc3e2ee16f540f7f54c7d067 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Thu, 18 Jul 2024 20:43:45 -0400 Subject: [PATCH] cleanup sway --- .github/workflows/nix-drybuild.yml | 59 --------------------- .gitlab-ci.yml | 1 - homeManagerModules/desktop/sway/default.nix | 14 ----- 3 files changed, 74 deletions(-) delete mode 100644 .github/workflows/nix-drybuild.yml diff --git a/.github/workflows/nix-drybuild.yml b/.github/workflows/nix-drybuild.yml deleted file mode 100644 index c9bee92c..00000000 --- a/.github/workflows/nix-drybuild.yml +++ /dev/null @@ -1,59 +0,0 @@ -name: "nix-drybuild" -on: - push: - paths-ignore: - - '*.md' - - '.github/**' - - '_img/**' - workflow_dispatch: -jobs: - fallarbor-drybuild: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@main - with: - fetch-depth: 1 - - uses: DeterminateSystems/nix-installer-action@main - - uses: DeterminateSystems/magic-nix-cache-action@main - - name: Drybuild fallarbor - run: nix build --dry-run .#nixosConfigurations.fallarbor.config.system.build.toplevel - lavaridge-drybuild: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@main - with: - fetch-depth: 1 - - uses: DeterminateSystems/nix-installer-action@main - - uses: DeterminateSystems/magic-nix-cache-action@main - - name: Drybuild lavaridge - run: nix build --dry-run .#nixosConfigurations.lavaridge.config.system.build.toplevel - mauville-drybuild: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@main - with: - fetch-depth: 1 - - uses: DeterminateSystems/nix-installer-action@main - - uses: DeterminateSystems/magic-nix-cache-action@main - - name: Drybuild mauville - run: nix build --dry-run .#nixosConfigurations.mauville.config.system.build.toplevel - petalburg-drybuild: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@main - with: - fetch-depth: 1 - - uses: DeterminateSystems/nix-installer-action@main - - uses: DeterminateSystems/magic-nix-cache-action@main - - name: Drybuild petalburg - run: nix build --dry-run .#nixosConfigurations.petalburg.config.system.build.toplevel - rustboro-drybuild: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@main - with: - fetch-depth: 1 - - uses: DeterminateSystems/nix-installer-action@main - - uses: DeterminateSystems/magic-nix-cache-action@main - - name: Drybuild rustboro - run: nix build --dry-run .#nixosConfigurations.rustboro.config.system.build.toplevel diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 237dd418..86e3ce77 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,6 @@ variables: GIT_STRATEGY: clone GIT_DEPTH: 1 - stages: - "Update" - "Checks" diff --git a/homeManagerModules/desktop/sway/default.nix b/homeManagerModules/desktop/sway/default.nix index 3e201463..f7372b82 100644 --- a/homeManagerModules/desktop/sway/default.nix +++ b/homeManagerModules/desktop/sway/default.nix @@ -26,18 +26,7 @@ editor = lib.getExe config.ar.home.defaultApps.editor; terminal = lib.getExe config.ar.home.defaultApps.terminal; - brightness = lib.getExe' pkgs.swayosd "swayosd-client"; - brightness_up = "${brightness} --brightness=raise"; - brightness_down = "${brightness} --brightness=lower"; - volume = brightness; - volume_up = "${volume} --output-volume=raise"; - volume_down = "${volume} --output-volume=lower"; - volume_mute = "${volume} --output-volume=mute-toggle"; - mic_mute = "${volume} --input-volume=mute-toggle"; media = lib.getExe pkgs.playerctl; - media_play = "${media} play-pause"; - media_next = "${media} next"; - media_prev = "${media} previous"; # Sway desktop utilities bar = lib.getExe pkgs.waybar; @@ -66,9 +55,6 @@ screenshot_screen = "${screenshot} --capture output"; screenshot_region = "${screenshot} --capture region"; - qt_platform_theme = "qt6ct"; - gdk_scale = "1.5"; - cycleSwayDisplayModes = pkgs.writeShellScriptBin "cycleSwayDisplayModes" '' # TODO: remove petalburg hardcodes current_mode=$(${lib.getExe' config.wayland.windowManager.sway.package "swaymsg"} -t get_outputs -p | grep "Current mode" | grep -Eo '[0-9]+x[0-9]+ @ [0-9.]+ Hz' | tr -d " " | grep 2880)