diff --git a/common/tooling/default.nix b/common/tooling/default.nix index dd7a8ab..c8a3c26 100644 --- a/common/tooling/default.nix +++ b/common/tooling/default.nix @@ -46,6 +46,7 @@ in expect neovim-remote ] ++ lib.optionals cfg.graphical [ + wev qdirstat libva-utils glxinfo @@ -53,7 +54,6 @@ in vulkan-tools gparted - thunderbird ]; programs.git = { diff --git a/common/xdg/mime.nix b/common/xdg/mime.nix index a40000b..691ba3e 100644 --- a/common/xdg/mime.nix +++ b/common/xdg/mime.nix @@ -54,6 +54,7 @@ in openscad vlc blender + thunderbird ]; xdg.mime.enable = true; @@ -94,6 +95,11 @@ in "text/x-c" = [ "clion.desktop" ] ++ text_editors; "text/x-java-source" = [ "idea-community.desktop" ] ++ text_editors; "video/*" = video_viewers; + "inode/directory" = [ + "ranger.desktop" + "dolphin.desktop" + ]; + "x-scheme-handler/mailto"="thunderbird.desktop"; "application/vnd.oasis.opendocument.chart" = "calc.desktop"; "application/vnd.oasis.opendocument.chart-template" = "calc.desktop"; diff --git a/flake.lock b/flake.lock index 3999179..686aa59 100644 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1714227479, - "narHash": "sha256-TJsEB9sKK6hMhKGXEeqD6Hz1vvgfwuNNwwt4UmyxHvQ=", + "lastModified": 1714482312, + "narHash": "sha256-qs41DgEGR2d6Hh+FnfL/6NagoCtRXDXC7yaGD398EXE=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "11b4acecf7aa41e4b3fcb34a985fe0477da4347c", + "rev": "8cfa2aa1528faa6319e2e5ab664ff463ba57708c", "type": "github" }, "original": { @@ -382,11 +382,11 @@ ] }, "locked": { - "lastModified": 1714203603, - "narHash": "sha256-eT7DENhYy7EPLOqHI9zkIMD9RvMCXcqh6gGqOK5BWYQ=", + "lastModified": 1714430505, + "narHash": "sha256-SSJQ/KOy8uISnoZgqDoRha7g7PFLSFP/BtMWm0wUz8Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "c1609d584a6b5e9e6a02010f51bd368cb4782f8e", + "rev": "f8e6694edabe4aaa7a85aac47b43ea5d978b116d", "type": "github" }, "original": { @@ -404,11 +404,11 @@ ] }, "locked": { - "lastModified": 1714022840, - "narHash": "sha256-i6xZsf7Kvp1n/Sn3nqPY1MJQx0gf80OGQw32PA/aZd8=", + "lastModified": 1714464433, + "narHash": "sha256-ztvukQ2LvrRQBtiRiut8FgCOyKXgqLTIp3Deg/OguUY=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "94def3af1d45fe4b142beda3aa59a6a98e62ce9e", + "rev": "2a5194b960801b68cfc4c811eb1733cf3aa8ece6", "type": "github" }, "original": { @@ -430,11 +430,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1714146712, - "narHash": "sha256-8cdUq1XHTQ2CXSDGQMs0WOtB3eB469RK4iLpgUtQIZQ=", + "lastModified": 1714411325, + "narHash": "sha256-td58oD5JOlL8LPglrk+c7rP+nJSJmK7zu0kFGF16XPI=", "owner": "martinvonz", "repo": "jj", - "rev": "6752402113445d2cbad66b56ab06094a7fff84d4", + "rev": "e54e83b0f5c4a5b7d80894c713ae402a5bb280d0", "type": "github" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1714068652, - "narHash": "sha256-/5aMM42kNfiIMKKjipBlXVpR/2SGyziA1/lh40sYr9k=", + "lastModified": 1714468768, + "narHash": "sha256-lxbNfjtTOcY18E9ODj3ZwJiF8UWr58CH+/9V3eHdtoQ=", "owner": "YaLTeR", "repo": "niri", - "rev": "8d99e3c015fe210acf0e67fa62335688f5e3df15", + "rev": "68ff36f6834beecf74b30a724ae3ef31874a3518", "type": "github" }, "original": { @@ -612,11 +612,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1714272655, - "narHash": "sha256-3/ghIWCve93ngkx5eNPdHIKJP/pMzSr5Wc4rNKE1wOc=", + "lastModified": 1714409183, + "narHash": "sha256-Wacm/DrzLD7mjFGnSxxyGkJgg2unU/dNdNgdngBH+RU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12430e43bd9b81a6b4e79e64f87c624ade701eaf", + "rev": "576ecd43d3b864966b4423a853412d6177775e8b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a4959e5..298b51e 100644 --- a/flake.nix +++ b/flake.nix @@ -38,6 +38,10 @@ url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/305278.patch"; hash = "sha256-8RvPI8Id+Ttgv07IMBTAxkSc+K00WhiWgdgrCcULd7o="; } + { + url = "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/307541.patch"; + hash = "sha256-cyxiWCxBOKrET710C8o9Cwksy64HRez6mB1qF+anHMI="; + } ]; customNixosSystem = system: definitions: diff --git a/sway/default.nix b/sway/default.nix index 7a5410b..a3dbbe3 100644 --- a/sway/default.nix +++ b/sway/default.nix @@ -163,6 +163,12 @@ in done <<< $(pgrep spotify -u "$(whoami)") deskwhich spotify | xargs gio launch ''; in "exec ${getExe open}"; # for some reason tools = audio media on my keyboard?? + XF86Mail = let open = pkgs.writeShellScriptBin "open_or_switch_mail" '' + desk=$(xdg-settings get default-url-scheme-handler mailto | sed "s/\.desktop//") + swaymsg [app_id="$desk"] focus || deskwhich $desk | xargs gio launch + ''; + in "exec ${getExe open}"; + }; autolaunch = with pkgs; [ # fixme: absolute paths