diff --git a/dotfiles/montage/default.nix b/dotfiles/montage/default.nix deleted file mode 100644 index a5375b2..0000000 --- a/dotfiles/montage/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ pkgs, ... }: { - home.packages = [ pkgs.montage ]; - - programs.zsh.shellAliases = { - # server managment - mserver = "montage serve"; - mvex = "montage vex --script-dir ${./scripts}"; - - # alias to get around conflict with imagemagick's `montage` binary in - # projects where that's in the PATH - m = "${pkgs.montage}/bin/montage"; - - # tasks - mstart = "${pkgs.montage}/bin/montage start"; - mextend = "${pkgs.montage}/bin/montage extend"; - m5 = "${pkgs.montage}/bin/montage extend --by PT5M"; - m10 = "${pkgs.montage}/bin/montage extend --by PT10M"; - - # breaks - mbreak = "${pkgs.montage}/bin/montage start --break Break"; - mlunch = "${pkgs.montage}/bin/montage start Lunch --offline --duration 60"; - - # signing off for the day and weekend - msignoff = "${pkgs.montage}/bin/montage start Offline --offline --until $(${pkgs.coreutils}/bin/date --date 'tomorrow 9am' -Iseconds)"; - mmonday = "${pkgs.montage}/bin/montage start Offline --offline --until $(${pkgs.coreutils}/bin/date --date 'Monday 9am' -Iseconds)"; - mtuesday = "${pkgs.montage}/bin/montage start Offline --offline --until $(${pkgs.coreutils}/bin/date --date 'Tuesday 9am' -Iseconds)"; - mwednesday = "${pkgs.montage}/bin/montage start Offline --offline --until $(${pkgs.coreutils}/bin/date --date 'Wednesday 9am' -Iseconds)"; - mthursday = "${pkgs.montage}/bin/montage start Offline --offline --until $(${pkgs.coreutils}/bin/date --date 'Thursday 9am' -Iseconds)"; - mfriday = "${pkgs.montage}/bin/montage start Offline --offline --until $(${pkgs.coreutils}/bin/date --date 'Friday 9am' -Iseconds)"; - - # meetings - mstandup = "${pkgs.montage}/bin/montage start Standup --meeting --duration 30"; - mdonut = "${pkgs.montage}/bin/montage start Donut --meeting --duration 30"; - mmeeting = "${pkgs.montage}/bin/montage start --meeting"; - - # pairings - mpair = "mpair_f() { ${pkgs.montage}/bin/montage start \"pairing with \$1\" --meeting };mpair_f"; - m11 = "m11_f() { ${pkgs.montage}/bin/montage start \"1:1 with \$1\" --meeting };m11_f"; - }; -} diff --git a/dotfiles/montage/scripts/new_session b/dotfiles/montage/scripts/new_session deleted file mode 100755 index c6338c5..0000000 --- a/dotfiles/montage/scripts/new_session +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -SESSION_DESCRIPTION="${1:-NO SESSION}" -SESSION_KIND="${2:-UNKNOWN}" - -# say "starting $SESSION_KIND $SESSION_DESCRIPTION" - -if test "$SESSION_KIND" = "task"; then - osascript -e 'tell application "Slack" to quit' - osascript -e 'tell application "Mail" to quit' - osascript -e 'tell application "Zulip" to quit' - osascript -e 'tell application "Discord" to quit' - # say "I quit the apps. Have fun!" - # open "focus://focus" -fi - -if test "$SESSION_KIND" = "meeting"; then - osascript -e 'tell application "Obsidian" to activate' -fi diff --git a/dotfiles/montage/scripts/session_ended b/dotfiles/montage/scripts/session_ended deleted file mode 100755 index 577dd29..0000000 --- a/dotfiles/montage/scripts/session_ended +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -if test "${2:-}" != "break" && test "${3:-}" != "task"; then - # say "session ended. Restarting apps." - - osascript -e 'tell application "Slack" to activate' - osascript -e 'tell application "Mail" to activate' - # osascript -e 'tell application "Zulip" to activate' - # open "focus://unfocus" -fi diff --git a/flake.lock b/flake.lock index 157706d..e3b1abf 100644 --- a/flake.lock +++ b/flake.lock @@ -57,24 +57,6 @@ "inputs": { "systems": "systems" }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, "locked": { "lastModified": 1692799911, "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", @@ -89,9 +71,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1694529238, @@ -107,9 +89,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1694529238, @@ -161,31 +143,6 @@ "type": "github" } }, - "montage": { - "inputs": { - "flake-utils": "flake-utils", - "naersk": [ - "naersk" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1698202886, - "narHash": "sha256-GFy1smQkVIPXqireuloNrUN7Om0dd0yEtIkZZTusR2Y=", - "ref": "main", - "rev": "18a094ab0b156f75eaf797e4570a024f3e181296", - "revCount": 339, - "type": "git", - "url": "https://git.bytes.zone/brian/montage.git" - }, - "original": { - "ref": "main", - "type": "git", - "url": "https://git.bytes.zone/brian/montage.git" - } - }, "naersk": { "inputs": { "nixpkgs": [ @@ -317,7 +274,6 @@ "darwin": "darwin", "fzf-tab": "fzf-tab", "home-manager": "home-manager", - "montage": "montage", "naersk": "naersk", "niv": "niv", "nix-index": "nix-index", @@ -391,21 +347,6 @@ "type": "github" } }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "sysz": { "flake": false, "locked": { @@ -424,7 +365,7 @@ }, "tree-grepper": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "naersk": "naersk_2", "nixpkgs": "nixpkgs_2", "tree-sitter-c": "tree-sitter-c", @@ -701,7 +642,7 @@ }, "xbar-pr-status": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "naersk": [ "naersk" ], @@ -725,7 +666,7 @@ }, "xbar-review-request-status": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "naersk": [ "naersk" ], diff --git a/flake.nix b/flake.nix index 77ab89d..a4242e3 100644 --- a/flake.nix +++ b/flake.nix @@ -12,11 +12,6 @@ home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - montage.url = - "git+https://git.bytes.zone/brian/montage.git?ref=main"; - montage.inputs.nixpkgs.follows = "nixpkgs"; - montage.inputs.naersk.follows = "naersk"; - naersk.url = "github:nix-community/naersk"; naersk.inputs.nixpkgs.follows = "nixpkgs"; @@ -64,7 +59,6 @@ outputs = inputs: let mkOverlays = system: [ - inputs.montage.overlay."${system}" inputs.tree-grepper.overlay."${system}" inputs.xbar-pr-status.overlay."${system}" inputs.xbar-review-request-status.overlay."${system}" diff --git a/machines/VNDR-A535/default.nix b/machines/VNDR-A535/default.nix index 8789a62..96eb1e0 100644 --- a/machines/VNDR-A535/default.nix +++ b/machines/VNDR-A535/default.nix @@ -88,7 +88,6 @@ ../../dotfiles/jq ../../dotfiles/k9s ../../dotfiles/lf - ../../dotfiles/montage ../../dotfiles/ncdu ../../dotfiles/neovim ../../dotfiles/niv diff --git a/pkgs/meet/default.nix b/pkgs/meet/default.nix index 7de207d..a17fbaf 100644 --- a/pkgs/meet/default.nix +++ b/pkgs/meet/default.nix @@ -12,6 +12,6 @@ pkgs.stdenv.mkDerivation { cp ./meet.py $out/bin/meet wrapProgram $out/bin/meet \ --set MEET_CALENDARS "brian.hicks@vendr.com,brian@brianthicks.com" \ - --prefix PATH : ${pkgs.lib.makeBinPath [pkgs.python3 pkgs.montage]} + --prefix PATH : ${pkgs.lib.makeBinPath [pkgs.python3]} ''; } diff --git a/pkgs/meet/meet.py b/pkgs/meet/meet.py index b68f6cf..9d91d1e 100755 --- a/pkgs/meet/meet.py +++ b/pkgs/meet/meet.py @@ -186,21 +186,11 @@ def prepare_links_to_attendees(vault, event): return people -def start_montage(event): - subprocess.check_call([ - 'montage', - 'start', - '--duration', str(round(event.duration() / timedelta(minutes=1))), - '--meeting', - event.title, - ]) - - if __name__ == '__main__': parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter) parser.add_argument( 'command', - choices=['start', 'note', 'choose'], + choices=['note', 'choose'], help='What should I do? `start` a meeting or start a `note`?', ) parser.add_argument( @@ -227,7 +217,4 @@ def start_montage(event): json.dump(meeting.to_json(), sys.stdout) sys.exit(0) - if args.command == 'start': - start_montage(meeting) - create_note(args, meeting)