diff --git a/flake.lock b/flake.lock index a8868fa..e10548a 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1723293904, - "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "lastModified": 1722339003, + "narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=", "owner": "ryantm", "repo": "agenix", - "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7", "type": "github" }, "original": { @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1723685519, - "narHash": "sha256-GkXQIoZmW2zCPp1YFtAYGg/xHNyFH/Mgm79lcs81rq0=", + "lastModified": 1723080788, + "narHash": "sha256-C5LbM5VMdcolt9zHeLQ0bYMRjUL+N+AL5pK7/tVTdes=", "owner": "nix-community", "repo": "disko", - "rev": "276a0d055a720691912c6a34abb724e395c8e38a", + "rev": "ffc1f95f6c28e1c6d1e587b51a2147027a3e45ed", "type": "github" }, "original": { @@ -414,11 +414,11 @@ ] }, "locked": { - "lastModified": 1723352546, - "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=", + "lastModified": 1722740924, + "narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06", + "rev": "97ca0a0fca0391de835f57e44f369a283e37890f", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723556749, - "narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=", + "lastModified": 1722869614, + "narHash": "sha256-7ojM1KSk3mzutD7SkrdSflHXEujPvW1u7QuqWoTLXQU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4a92571f9207810b559c9eac203d1f4d79830073", + "rev": "883180e6550c1723395a3a342f830bfc5c371f6b", "type": "github" }, "original": { diff --git a/scripts/default.nix b/scripts/default.nix index 799403e..01ce2b8 100644 --- a/scripts/default.nix +++ b/scripts/default.nix @@ -128,12 +128,7 @@ auto_connect_gamepad = [ bluez coreutils - final.gnugrep - ]; - powerplay-led-idle = [ - final.bash - libinput - libratbag + gnugrep ]; } // lib.mapAttrs import_script { diff --git a/scripts/powerplay-led-idle b/scripts/powerplay-led-idle deleted file mode 100755 index a99905e..0000000 --- a/scripts/powerplay-led-idle +++ /dev/null @@ -1,79 +0,0 @@ -#!/usr/bin/env bash - -set -e - -# Constants -SECONDS_UNTIL_FADE=$(( 1 * 60)) -SECONDS_UNTIL_OFF=$(( 5 * 60)) - -COLOR_ON=ff0000 -COLOR_FADE=880000 -COLOR_OFF=000000 - -# Logging - -if [[ "$1" = "debug" ]]; then - echo "Running with debugging" >&2 - DEBUG="true" - - SECONDS_UNTIL_FADE=$(( 3 )) - SECONDS_UNTIL_OFF=$(( 5 )) -fi - -log() { - if [[ "$DEBUG" = "true" ]]; then - echo "$@" >&2 - fi -} - -# Implementation - -main() { - CURRENT_STATE="UNKNOWN" - LAST_POINTER_MOTION="$(date +%s)" - - if [ "$(ratbagctl list | wc -l)" -ne 1 ]; then - echo "Not exactly one device found, exiting..." - exit 1 - fi - - DEVICE="$(ratbagctl list | cut -d: -f1)" - - while true; do - while read line; do - LAST_POINTER_MOTION="$(date +%s)" - break - done < <( - timeout 5s \ - libinput debug-events \ - | grep POINTER_MOTION - ) - TIME_SINCE_LAST=$(( "$(date +%s)" - "$LAST_POINTER_MOTION" )) - log "Last pointer motion was $TIME_SINCE_LAST seconds ago" - if [ "$TIME_SINCE_LAST" -gt "$SECONDS_UNTIL_OFF" ]; then - setState OFF "$COLOR_OFF" - elif [ "$TIME_SINCE_LAST" -gt "$SECONDS_UNTIL_FADE" ]; then - setState FADE "$COLOR_FADE" - else - setState ON "$COLOR_ON" - fi - done -} - -setState() { - STATE="$1" - COLOR="$2" - MODE="$3" - - if [[ "$STATE" = "$CURRENT_STATE" ]]; then - log "Already in $STATE state" - return - fi - log "Changing state to $STATE" - CURRENT_STATE="$STATE" - - ratbagctl "$DEVICE" led 0 set mode on - ratbagctl "$DEVICE" led 0 set color "$COLOR" -} - -main diff --git a/user/firefox.nix b/user/firefox.nix index b23616a..7ea410b 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -49,6 +49,11 @@ in url = "https://github.com/OhMyGuus/I-Still-Dont-Care-About-Cookies/releases/download/v1.1.4/istilldontcareaboutcookies-1.1.4.xpi"; hash = "sha256-yt6yRiLTuaK4K/QwgkL9gCVGsSa7ndFOHqZvKqIGZ5U="; }) + (pkgs.fetchFirefoxAddon { + name = "github_no_more"; + url = "https://addons.mozilla.org/firefox/downloads/file/4293306/github_no_more-0.0.1.xpi"; + hash = "sha256-1vzgo7z4K6aZAVAo5VqihYQi77mZ0rE68xbt7Oqz29s="; + }) (pkgs.fetchFirefoxAddon { name = "vimium_ff"; diff --git a/user/sway/default.nix b/user/sway/default.nix index af61969..a8ed460 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -23,7 +23,6 @@ in ./swayidle.nix ./swaylock.nix ./theme.nix - ./powerplay-led-idle.nix ]; config = lib.mkIf (config.my.desktop == "sway") { services.mako.enable = true; diff --git a/user/sway/powerplay-led-idle.nix b/user/sway/powerplay-led-idle.nix deleted file mode 100644 index a6aa3e0..0000000 --- a/user/sway/powerplay-led-idle.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs, lib, ... }: -{ - systemd.user.services.powerplay-led-idle = { - Unit = { - Description = "Autosuspend Powerplay mousepad led"; - PartOf = [ "graphical-session.target" ]; - After = [ "graphical-session.target" ]; - }; - Service = { - ExecStart = lib.getExe pkgs.powerplay-led-idle; - Restart = "on-failure"; - }; - Install = { - WantedBy = [ "sway-session.target" ]; - }; - }; -} diff --git a/user/vscode/default.nix b/user/vscode/default.nix index 35d972b..a477666 100644 --- a/user/vscode/default.nix +++ b/user/vscode/default.nix @@ -3,7 +3,7 @@ programs.vscode = { enable = true; - package = pkgs.vscodium; + package = pkgs.vscodium-fhs; extensions = with pkgs.vscode-extensions; [ jnoortheen.nix-ide github.github-vscode-theme