about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--flake.lock91
-rw-r--r--flake.nix33
-rw-r--r--flake/default.nix6
-rw-r--r--hm/default.nix6
-rw-r--r--hm/soispha/conf/default.nix1
-rw-r--r--hm/soispha/conf/firefox/config/extensions/extensions.json8
-rw-r--r--hm/soispha/conf/firefox/config/extensions/native_messaging_hosts/default.nix39
-rw-r--r--hm/soispha/conf/firefox/config/extensions/native_messaging_hosts/video-pause.nix45
-rw-r--r--hm/soispha/conf/firefox/default.nix3
-rwxr-xr-xhm/soispha/conf/firefox/scripts/update_extensions.sh1
-rw-r--r--hm/soispha/conf/grades/config.yaml68
-rw-r--r--hm/soispha/conf/grades/default.nix3
-rw-r--r--hm/soispha/conf/lf/commands/default.nix9
-rw-r--r--hm/soispha/conf/lf/default.nix3
-rw-r--r--hm/soispha/conf/yambar/default.nix9
-rwxr-xr-xhm/soispha/conf/yambar/scripts/grades-average.sh15
-rw-r--r--hm/soispha/pkgs/default.nix9
-rw-r--r--hm/soispha/wms/river/res/keys.ron2
-rw-r--r--hm/soispha/wms/river/res/moonlander.ron2
19 files changed, 20 insertions, 333 deletions
diff --git a/flake.lock b/flake.lock
index 7c8c5d13..344edbfc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -339,35 +339,6 @@
         "type": "github"
       }
     },
-    "lf_rename": {
-      "inputs": {
-        "flake-compat": [
-          "flake-compat"
-        ],
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": [
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1692548268,
-        "narHash": "sha256-UnuTjb4RTnPoNJ4u4LBOpSObf7HkGMhR4M7e6xL9o/c=",
-        "ref": "refs/heads/prime",
-        "rev": "03dc34eac8a469a723298846081d5fea31157cb8",
-        "revCount": 9,
-        "type": "git",
-        "url": "https://codeberg.org/soispha/lf-rename.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://codeberg.org/soispha/lf-rename.git"
-      }
-    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -671,7 +642,6 @@
         "home-manager": "home-manager",
         "impermanence": "impermanence",
         "lanzaboote": "lanzaboote",
-        "lf_rename": "lf_rename",
         "nixVim": "nixVim",
         "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs",
@@ -683,12 +653,10 @@
         "rust-overlay": "rust-overlay",
         "serverphone": "serverphone",
         "shell_library": "shell_library",
-        "strip_js_comments": "strip_js_comments",
         "systems": "systems",
         "templates": "templates",
         "treefmt-nix": "treefmt-nix",
         "user_js": "user_js",
-        "video_pause": "video_pause",
         "yambar_cpu": "yambar_cpu",
         "yambar_memory": "yambar_memory"
       }
@@ -780,33 +748,6 @@
         "url": "https://codeberg.org/soispha/shell_library.git"
       }
     },
-    "strip_js_comments": {
-      "inputs": {
-        "crane": [
-          "crane"
-        ],
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "tree_sitter_js": "tree_sitter_js"
-      },
-      "locked": {
-        "lastModified": 1676149199,
-        "narHash": "sha256-Yitp7KDJfL1xPUeJwoBLNbUJlt03yvC3SsyA8FE1PMA=",
-        "ref": "refs/heads/prime",
-        "rev": "1be9cbf4b1a58dbc5164dfb4ddaa862488f7b42d",
-        "revCount": 9,
-        "type": "git",
-        "url": "https://codeberg.org/ene/strip_js_comments.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://codeberg.org/ene/strip_js_comments.git"
-      }
-    },
     "systems": {
       "locked": {
         "lastModified": 1680978846,
@@ -900,38 +841,6 @@
         "type": "github"
       }
     },
-    "video_pause": {
-      "inputs": {
-        "crane": [
-          "crane"
-        ],
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "rust-overlay": [
-          "rust-overlay"
-        ],
-        "systems": [
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1698335252,
-        "narHash": "sha256-cGsRm11WVjC7eYPvPNhJBfDF90ECdPQRE3DMhPOF/TM=",
-        "ref": "refs/heads/prime",
-        "rev": "8ba00cb9983014246ccfeba80591ac823f8de520",
-        "revCount": 9,
-        "type": "git",
-        "url": "https://codeberg.org/soispha/video-pause.git"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://codeberg.org/soispha/video-pause.git"
-      }
-    },
     "yambar_cpu": {
       "inputs": {
         "crane": [
diff --git a/flake.nix b/flake.nix
index 7f12fb15..2f3a7d1f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -162,33 +162,6 @@
     };
 
     # my bins
-    lf_rename = {
-      url = "git+https://codeberg.org/soispha/lf-rename.git";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
-        flake-compat.follows = "flake-compat";
-        systems.follows = "systems";
-      };
-    };
-    video_pause = {
-      url = "git+https://codeberg.org/soispha/video-pause.git";
-      inputs = {
-        systems.follows = "systems";
-        nixpkgs.follows = "nixpkgs";
-        crane.follows = "crane";
-        flake-utils.follows = "flake-utils";
-        rust-overlay.follows = "rust-overlay";
-      };
-    };
-    strip_js_comments = {
-      url = "git+https://codeberg.org/ene/strip_js_comments.git";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        crane.follows = "crane";
-        flake-utils.follows = "flake-utils";
-      };
-    };
     generate_firefox_extensions = {
       url = "git+https://codeberg.org/soispha/generate_firefox_extension.git";
       inputs = {
@@ -274,9 +247,6 @@
     treefmt-nix,
     templates,
     # my binaries
-    video_pause,
-    strip_js_comments,
-    lf_rename,
     generate_firefox_extensions,
     shell_library,
     river_init_lesser,
@@ -319,9 +289,6 @@
         templates
         # my binaries
         
-        video_pause
-        strip_js_comments
-        lf_rename
         generate_firefox_extensions
         shell_library
         river_init_lesser
diff --git a/flake/default.nix b/flake/default.nix
index bafb40f4..bbf9044e 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -20,9 +20,6 @@
   treefmt-nix,
   templates,
   # my binaries
-  video_pause,
-  strip_js_comments,
-  lf_rename,
   generate_firefox_extensions,
   shell_library,
   river_init_lesser,
@@ -38,11 +35,8 @@
       system
       # bins
       
-      video_pause
       yambar_cpu
       yambar_memory
-      lf_rename
-      strip_js_comments
       river_init_lesser
       shell_library
       # external deps
diff --git a/hm/default.nix b/hm/default.nix
index debff0f5..9ef5b92f 100644
--- a/hm/default.nix
+++ b/hm/default.nix
@@ -4,11 +4,8 @@
   # extra information
   system,
   # bins
-  video_pause,
   yambar_cpu,
   yambar_memory,
-  lf_rename,
-  strip_js_comments,
   river_init_lesser,
   shell_library,
   # external deps
@@ -30,11 +27,8 @@
         system
         # bins
         
-        video_pause
         yambar_cpu
         yambar_memory
-        lf_rename
-        strip_js_comments
         river_init_lesser
         shell_library
         # external deps
diff --git a/hm/soispha/conf/default.nix b/hm/soispha/conf/default.nix
index c7f000cb..80d375c2 100644
--- a/hm/soispha/conf/default.nix
+++ b/hm/soispha/conf/default.nix
@@ -8,7 +8,6 @@
     ./gammastep
     ./git
     ./gpg
-    ./grades
     ./gtk
     ./himalaya
     ./hyfetch
diff --git a/hm/soispha/conf/firefox/config/extensions/extensions.json b/hm/soispha/conf/firefox/config/extensions/extensions.json
index aa92c9e3..11cdb288 100644
--- a/hm/soispha/conf/firefox/config/extensions/extensions.json
+++ b/hm/soispha/conf/firefox/config/extensions/extensions.json
@@ -46,13 +46,5 @@
     "sha256": "sha256:7d40f924808202161a03863a6775f469674c344b4079ff77e3f8c149aa41323d",
     "url": "https://addons.mozilla.org/firefox/downloads/file/4186145/vhack_libredirect-2.8.3.xpi",
     "version": "2.8.3"
-  },
-  "video-pause": {
-    "addonId": "video-pauser@addons.vhack.eu",
-    "default_area": "menupanel",
-    "pname": "video-pause",
-    "sha256": "sha256:be003d3a248070327f12e72f198057f9a5d6fc06bb637e23948104a6dffe676f",
-    "url": "https://addons.mozilla.org/firefox/downloads/file/4186404/video_pause-1.0.3.xpi",
-    "version": "1.0.3"
   }
 }
diff --git a/hm/soispha/conf/firefox/config/extensions/native_messaging_hosts/default.nix b/hm/soispha/conf/firefox/config/extensions/native_messaging_hosts/default.nix
index e0ee1dfa..9aaa1682 100644
--- a/hm/soispha/conf/firefox/config/extensions/native_messaging_hosts/default.nix
+++ b/hm/soispha/conf/firefox/config/extensions/native_messaging_hosts/default.nix
@@ -1,24 +1,15 @@
-{
-  pkgs,
-  video_pause,
-  ...
-}: let
-  video_pause_ext = import ./video-pause.nix {inherit pkgs video_pause;};
-in
-  /*
-  ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass)
-  ++ lib.optional (cfg.enableBukubrow or false) bukubrow
-  ++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native
-  ++ lib.optional (cfg.enableGnomeExtensions or false) gnome-browser-connector
-  ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator
-  ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5Packages.plasma-browser-integration
-  ++ lib.optional (cfg.enableFXCastBridge or false) fx-cast-bridge
-  ++ lib.optional (cfg.enableKeePassXC or false) keepassxc
-
-
-  */
-  with pkgs; [
-    video_pause_ext
-    tridactyl-native
-    keepassxc
-  ]
+{pkgs, ...}:
+/*
+++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass)
+++ lib.optional (cfg.enableBukubrow or false) bukubrow
+++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native
+++ lib.optional (cfg.enableGnomeExtensions or false) gnome-browser-connector
+++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator
+++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma5Packages.plasma-browser-integration
+++ lib.optional (cfg.enableFXCastBridge or false) fx-cast-bridge
+++ lib.optional (cfg.enableKeePassXC or false) keepassxc
+*/
+with pkgs; [
+  tridactyl-native
+  keepassxc
+]
diff --git a/hm/soispha/conf/firefox/config/extensions/native_messaging_hosts/video-pause.nix b/hm/soispha/conf/firefox/config/extensions/native_messaging_hosts/video-pause.nix
deleted file mode 100644
index 300d296c..00000000
--- a/hm/soispha/conf/firefox/config/extensions/native_messaging_hosts/video-pause.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  pkgs,
-  video_pause,
-  ...
-}: let
-  extensions = builtins.fromJSON (builtins.readFile ../extensions.json);
-  inherit (extensions) video-pause;
-in
-  /*
-  mkdir -p $out/lib/mozilla/native-messaging-hosts
-  for ext in ${toString nativeMessagingHosts}; do
-      ln -sLt $out/lib/mozilla/native-messaging-hosts $ext/lib/mozilla/native-messaging-hosts/*
-  done
-  */
-  pkgs.stdenv.mkDerivation {
-    inherit (video-pause) pname version;
-
-    dontUnpack = true;
-    buildPhase = ''
-      mkdir -p $out/share/
-      cat << EOF > $out/share/"${video-pause.pname}".json
-      {
-        "name": "video.pause",
-        "description": "Stop a video with a native hotkey",
-        "path": "${video_pause}/bin/video-pause",
-        "type": "stdio",
-        "allowed_extensions": ["${video-pause.addonId}"]
-      }
-      EOF
-
-      nmp="$(mktemp)";
-      cat << EOF > "$nmp"
-        lib/mozilla/native-messaging-hosts
-        lib/librewolf/native-messaging-hosts
-        etc/opt/chrome/native-messaging-hosts
-        etc/chromium/native-messaging-hosts
-        etc/vivaldi/native-messaging-hosts
-      EOF
-
-      while read -r path; do
-        mkdir -p $out/$path;
-        cp $out/share/"${video-pause.pname}".json $out/$path/
-      done < "$nmp"
-    '';
-  }
diff --git a/hm/soispha/conf/firefox/default.nix b/hm/soispha/conf/firefox/default.nix
index 0c929633..c8e0e2d9 100644
--- a/hm/soispha/conf/firefox/default.nix
+++ b/hm/soispha/conf/firefox/default.nix
@@ -3,7 +3,6 @@
   pkgs,
   lib,
   user_js,
-  video_pause,
   ...
 }: let
   extensions =
@@ -19,7 +18,7 @@
   };
   engines = (import ./config/search/engines) {inherit pkgs;};
 
-  native_messaging_hosts = (import ./config/extensions/native_messaging_hosts/default.nix) {inherit pkgs video_pause;};
+  native_messaging_hosts = (import ./config/extensions/native_messaging_hosts/default.nix) {inherit pkgs;};
 
   policies = (import ./config/policies) {inherit config extensions;};
 
diff --git a/hm/soispha/conf/firefox/scripts/update_extensions.sh b/hm/soispha/conf/firefox/scripts/update_extensions.sh
index 83b0146d..49e9e407 100755
--- a/hm/soispha/conf/firefox/scripts/update_extensions.sh
+++ b/hm/soispha/conf/firefox/scripts/update_extensions.sh
@@ -8,7 +8,6 @@ cat <<EOF >"$tmp"
     torproject-snowflake:navbar
     tridactyl-vim:menupanel
     ublock-origin:menupanel
-    video-pause:menupanel
 EOF
 
 # The bin is provided in the devshell;
diff --git a/hm/soispha/conf/grades/config.yaml b/hm/soispha/conf/grades/config.yaml
deleted file mode 100644
index 36712971..00000000
--- a/hm/soispha/conf/grades/config.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# für oberstufe
----
-unit: Punkte
-grade_groups:
-  - name: Zeugnis
-    weight: '100'
-    double_weight_on_class_type: false
-  - name: Sonstige
-    weight: '1'
-    double_weight_on_class_type: true
-  - name: Klausur
-    weight: '1'
-    double_weight_on_class_type: false
-
-grade_types:
-  - name: Zeugnis
-    group: Zeugnis
-  - name: Klausur
-    group: Klausur
-  - name: Epo
-    group: Sonstige
-  - name: Test
-    group: Sonstige
-
-class_types:
-  - name: NebenFach
-    double_weight_on_marked_grade_groups: true
-  - name: LeistungsKurs
-    double_weight_on_marked_grade_groups: false
-
-classes:
-  - name: M
-    long_name: Mathe
-    class_type: LeistungsKurs
-  - name: E
-    long_name: Englisch
-    class_type: LeistungsKurs
-  - name: CH
-    long_name: Chemie
-    class_type: LeistungsKurs
-
-  - name: d
-    long_name: Deutsch
-    class_type: NebenFach
-  - name: g
-    long_name: Geschichte
-    class_type: NebenFach
-  - name: se
-    long_name: Sozialkunde/Erdkunde
-    class_type: NebenFach
-  - name: et
-    long_name: Ethik
-    class_type: NebenFach
-  - name: spj
-    long_name: Sport
-    class_type: NebenFach
-  - name: inf
-    long_name: Informatik
-    class_type: NebenFach
-  - name: ph
-    long_name: Phyisk
-    class_type: NebenFach
-  - name: phi
-    long_name: Philosophie
-    class_type: NebenFach
-  - name: bi
-    long_name: Biologie
-    class_type: NebenFach
diff --git a/hm/soispha/conf/grades/default.nix b/hm/soispha/conf/grades/default.nix
deleted file mode 100644
index d2678174..00000000
--- a/hm/soispha/conf/grades/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{...}: {
-  xdg.configFile."grades/config.yaml".source = ./config.yaml;
-}
diff --git a/hm/soispha/conf/lf/commands/default.nix b/hm/soispha/conf/lf/commands/default.nix
index f5372a38..47bf0a12 100644
--- a/hm/soispha/conf/lf/commands/default.nix
+++ b/hm/soispha/conf/lf/commands/default.nix
@@ -201,15 +201,6 @@ in {
     name = "set_wall_paper";
     dependencies = [];
   };
-  /*
-  FIXME:
-  The c code fails, when stdout/-in is piped.
-  rename = ''
-    %{{
-      ${lf_rename.packages."${system}".default}/bin/rename
-    }}
-  '';
-  */
   stripspace = pipe {
     name = "stripspace";
     dependencies = [];
diff --git a/hm/soispha/conf/lf/default.nix b/hm/soispha/conf/lf/default.nix
index 74de78b6..1bbcef86 100644
--- a/hm/soispha/conf/lf/default.nix
+++ b/hm/soispha/conf/lf/default.nix
@@ -3,11 +3,10 @@
   sysLib,
   nixosConfig,
   shell_library,
-  lf_rename,
   system,
   ...
 }: let
-  commands = import ./commands {inherit pkgs sysLib shell_library system lf_rename;};
+  commands = import ./commands {inherit pkgs sysLib shell_library system;};
   keybindings = import ./keybindings {inherit nixosConfig;};
 in {
   xdg.configFile."lf/icons".source = ./icons;
diff --git a/hm/soispha/conf/yambar/default.nix b/hm/soispha/conf/yambar/default.nix
index f732e1d8..021dfbdd 100644
--- a/hm/soispha/conf/yambar/default.nix
+++ b/hm/soispha/conf/yambar/default.nix
@@ -40,15 +40,6 @@ in {
       name = "sound-volume";
     };
 
-    # grade_average_script = makeScript {
-    #   dependencies =
-    #     [
-    #       grades.outputs.packages.${system}.default
-    #     ]
-    #     ++ (builtins.attrValues {inherit (pkgs) coreutils gawk;});
-    #   name = "grades-average";
-    # };
-
     cpu_script = yambar_cpu.app.${system}.default.program;
 
     memory_script = yambar_memory.app.${system}.default.program;
diff --git a/hm/soispha/conf/yambar/scripts/grades-average.sh b/hm/soispha/conf/yambar/scripts/grades-average.sh
deleted file mode 100755
index b93869c5..00000000
--- a/hm/soispha/conf/yambar/scripts/grades-average.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /usr/bin/env dash
-
-# shellcheck source=/dev/null
-SHELL_LIBRARY_VERSION="2.0.13" . %SHELL_LIBRARY_PATH
-
-while true; do
-    grade="$(grades list average | awk '{print $2}')"
-
-    echo "grade|string|$grade"
-    echo ""
-
-    sleep 1
-done
-
-# vim: ft=sh
diff --git a/hm/soispha/pkgs/default.nix b/hm/soispha/pkgs/default.nix
index e63244b0..4499fac6 100644
--- a/hm/soispha/pkgs/default.nix
+++ b/hm/soispha/pkgs/default.nix
@@ -4,9 +4,6 @@
   sysLib,
   system,
   config,
-  # my bins
-  grades,
-  video_pause,
   ...
 }:
 with pkgs; let
@@ -142,11 +139,7 @@ with pkgs; let
     else [x];
 in {
   home.packages =
-    [
-      # FIXME: This fails to compile: <2024-01-30>
-      # grades.outputs.packages.${system}.default
-      video_pause.outputs.packages.${system}.default
-    ]
+    []
     ++ shell-scripts
     ++ (with builtins;
       concatLists
diff --git a/hm/soispha/wms/river/res/keys.ron b/hm/soispha/wms/river/res/keys.ron
index c2b61d7a..a2bc0fa1 100644
--- a/hm/soispha/wms/river/res/keys.ron
+++ b/hm/soispha/wms/river/res/keys.ron
@@ -16,7 +16,7 @@ RiverctlCommandArray(
 
     // Audio
     RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "XF86AudioRaiseVolume",    mods: "None",           command: "spawn",               command_args: "pactl set-sink-volume 1 +5%",),
-    RiverctlCommand( map_mode: Map,         mode: ["normal", "locked"], key: "XF86AudioLowerVolume",    mods: "None",           command: "spawn",               command_args: "video-pause toggle",),
+    RiverctlCommand( map_mode: Map,         mode: ["normal", "locked"], key: "XF86AudioLowerVolume",    mods: "None",           command: "spawn",               command_args: "pactl set-sink-volume 1 -5%",),
     RiverctlCommand( map_mode: Map,         mode: ["normal", "locked"], key: "XF86AudioMute",           mods: "None",           command: "spawn",               command_args: "mpc toggle",),
 
     // Launcher
diff --git a/hm/soispha/wms/river/res/moonlander.ron b/hm/soispha/wms/river/res/moonlander.ron
index a59c6757..77ffa5c4 100644
--- a/hm/soispha/wms/river/res/moonlander.ron
+++ b/hm/soispha/wms/river/res/moonlander.ron
@@ -24,7 +24,7 @@ RiverctlCommandArray(
     RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "L", mods: "Alt+Control+Super+Shift", command: "spawn",                command_args: "screenshot_persistent",),
 
     // Audio
-    RiverctlCommand( map_mode: Map,         mode: ["normal", "locked"], key: "M", mods: "Alt+Control+Super+Shift", command: "spawn",                command_args: "video-pause toggle",),
+    // RiverctlCommand( map_mode: Map,         mode: ["normal", "locked"], key: "M", mods: "Alt+Control+Super+Shift", command: "spawn",                command_args: "video-pause toggle",),
     RiverctlCommand( map_mode: Map,         mode: ["normal", "locked"], key: "N", mods: "Alt+Control+Super+Shift", command: "spawn",                command_args: "mpc toggle",),
 
     // Launcher
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-28 22:39:07 +0000