diff --git a/flake.lock b/flake.lock index ebfcd30..d0a06c5 100644 --- a/flake.lock +++ b/flake.lock @@ -35,6 +35,26 @@ "type": "github" } }, + "greg-clients": { + "inputs": { + "nixpkgs": [ + "unstable" + ] + }, + "locked": { + "lastModified": 1716115695, + "narHash": "sha256-aI65l4x+U5v3i/nfn6N3eW5IZodmf4pyAByE7vTJh8I=", + "ref": "refs/heads/master", + "rev": "b9444658fbb39cd1bf1c61ee5a1d5f0641c49abe", + "revCount": 73, + "type": "git", + "url": "https://git.pvv.ntnu.no/Projects/grzegorz-clients" + }, + "original": { + "type": "git", + "url": "https://git.pvv.ntnu.no/Projects/grzegorz-clients" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -111,6 +131,7 @@ "root": { "inputs": { "dan": "dan", + "greg-clients": "greg-clients", "home-manager": "home-manager", "nixgl": "nixgl", "nixpkgs": "nixpkgs", diff --git a/flake.nix b/flake.nix index 0694117..4a9606f 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,9 @@ dan.url = "git+https://git.dodsorf.as/Dandellion/NUR.git"; #"git+https://git.dodsorf.as/Dandellion/NUR"; dan.inputs.nixpkgs.follows = "unstable"; + + greg-clients.url = "git+https://git.pvv.ntnu.no/Projects/grzegorz-clients"; + greg-clients.inputs.nixpkgs.follows = "unstable"; # helix.url = "github:helix-editor/helix"; # helix.inputs.nixpkgs.follows = "unstable"; @@ -70,6 +73,8 @@ inherit (prev) system config; }; dan = dan.packages.${prev.system}; + grzegorz-clients = inputs.greg-clients.packages.${prev.system}.grzegorz-clients; + gregctl = inputs.greg-clients.packages.${prev.system}.grzegorzctl; # helix = inputs.helix.packages.${prev.system}.helix; }) nur.overlay diff --git a/profiles/base/default.nix b/profiles/base/default.nix index 4cb9ec6..0084baf 100644 --- a/profiles/base/default.nix +++ b/profiles/base/default.nix @@ -79,6 +79,8 @@ in bat eza ripgrep + + gregctl ] ++ lib.optionals cfg.plus [ ffmpeg-full ] ++ lib.optionals config.profiles.gui.enable [ @@ -126,11 +128,11 @@ in }; bookmarks = { "NixOS Options" = { - keyword = "no"; + keyword = "nxo"; url = "https://search.nixos.org/options?query=%s"; }; "NixOS Packages" = { - keyword = "np"; + keyword = "nxp"; url = "https://search.nixos.org/packages?query=%s"; }; "Home-Manager Options" = { @@ -138,7 +140,7 @@ in url = "https://rycee.gitlab.io/home-manager/options.html#opt-%s"; }; }; - extensions = with pkgs.nur.repos.rycee.firefox-addons; [ bitwarden cookies-txt metamask no-pdf-download sponsorblock ublock-origin ]; + extensions = with pkgs.nur.repos.rycee.firefox-addons; [ cookies-txt no-pdf-download sponsorblock ublock-origin ]; }; }; }; @@ -305,6 +307,7 @@ in home.sessionVariables = { EDITOR = "hx"; + GRZEGORZ_DEFAULT_API_BASE = "https://georg.pvv.ntnu.no/api"; }; xdg.mimeApps = { diff --git a/profiles/xsession/default.nix b/profiles/xsession/default.nix index 67a1bf1..788e923 100644 --- a/profiles/xsession/default.nix +++ b/profiles/xsession/default.nix @@ -69,6 +69,11 @@ in "XF86AudioMute" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-mute 0 toggle"; "XF86AudioMicMute" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-source-mute 1 toggle"; + # Georg volume controls + "Shift+XF86AudioRaiseVolume" = "exec --no-startup-id ${lib.getExe pkgs.gregctl} set-volume -- +5%"; + "Shift+XF86AudioLowerVolume" = "exec --no-startup-id ${lib.getExe pkgs.gregctl} set-volume -- -5%"; + "Shift+XF86AudioMute" = "exec --no-startup-id ${lib.getExe pkgs.gregctl} toggle"; + "XF86MonBrightnessUp" = "exec --no-startup-id brightnessctl set +5%"; "XF86MonBrightnessDown" = "exec --no-startup-id brightnessctl set 5%-";