diff options
| -rw-r--r-- | flake.lock | 24 | ||||
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | sys/nixpkgs/pkgs/plgs-pkgs/plugins/.plugins.json | 2 | ||||
| -rw-r--r-- | sys/nixpkgs/pkgs/plgs-pkgs/plugins/default.nix | 6 | ||||
| -rw-r--r-- | sys/nixpkgs/pkgs/plgs-pkgs/plugins/plugins.md | 8 | ||||
| -rw-r--r-- | sys/svcs/xdg/default.nix | 36 |
6 files changed, 41 insertions, 39 deletions
diff --git a/flake.lock b/flake.lock index 074b189a..ab2e0b19 100644 --- a/flake.lock +++ b/flake.lock @@ -303,11 +303,11 @@ ] }, "locked": { - "lastModified": 1703768629, - "narHash": "sha256-15X1KXQD4pJd8AZSH97tKsLJi/Q9fV1AwPNrNtymFco=", + "lastModified": 1703838268, + "narHash": "sha256-SRg5nXcdPnrsQR2MTAp7en0NyJnQ2wB1ivmsgEbvN+o=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e2afa5c3b8bb17bdc7c1a5be896aed177449f59", + "rev": "2aff324cf65f5f98f89d878c056b779466b17db8", "type": "github" }, "original": { @@ -483,16 +483,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703438236, - "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", - "owner": "NixOS", + "lastModified": 1703839731, + "narHash": "sha256-j0Bds9v+6NILaaoqUViQKSwn7WOglaC005FHeMcYA3Y=", + "owner": "soispha", "repo": "nixpkgs", - "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", + "rev": "f5b582a96f5b18a02fd352897a2129728aa2ff60", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "soispha", + "ref": "termfilechooser-unstable", "repo": "nixpkgs", "type": "github" } @@ -684,11 +684,11 @@ ] }, "locked": { - "lastModified": 1703729606, - "narHash": "sha256-5QlUMNPKv++mWlS2r3F8bffoSBHXq1qHg+V5mnfSixg=", + "lastModified": 1703815866, + "narHash": "sha256-CFIGDfX1GpNpfKwe/eezKLhgT/oc2VcgjqDTlCLBkJE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "347789ef125df15b685e8295364ad8ed331fef94", + "rev": "2b24e1f369f00f5ae9876e15e12f77e12c9c2374", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5181f78e..0b3a7bf1 100644 --- a/flake.nix +++ b/flake.nix @@ -3,8 +3,8 @@ inputs = { # base - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - # nixpkgs.url = "github:soispha/nixpkgs/termfilechooser"; + # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:soispha/nixpkgs/termfilechooser-unstable"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.05"; # inputs for following diff --git a/sys/nixpkgs/pkgs/plgs-pkgs/plugins/.plugins.json b/sys/nixpkgs/pkgs/plgs-pkgs/plugins/.plugins.json index 6224b1a0..a533c9bb 100644 --- a/sys/nixpkgs/pkgs/plgs-pkgs/plugins/.plugins.json +++ b/sys/nixpkgs/pkgs/plgs-pkgs/plugins/.plugins.json @@ -1,7 +1,7 @@ { "ThePrimeagen/harpoon:master": "{\"description\": \"\", \"homepage\": \"https://github.com/ThePrimeagen/harpoon\", \"license\": {\"py/reduce\": [{\"py/type\": \"update_vim_plugins.nix.License\"}, {\"py/tuple\": [\"mit\"]}]}, \"name\": \"harpoon\", \"owner\": \"ThePrimeagen\", \"py/object\": \"update_vim_plugins.plugin.GitHubPlugin\", \"source\": {\"py/object\": \"update_vim_plugins.nix.UrlSource\", \"sha256\": \"1w4hi9hbdjwdhb4vwa0x08a25vbcxqg1d5cskm2qvjy5fdlqils0\", \"url\": \"https://github.com/ThePrimeagen/harpoon/archive/ccae1b9bec717ae284906b0bf83d720e59d12b91.tar.gz\"}, \"source_line\": \"ThePrimeagen/harpoon:master\", \"version\": {\"__reduce__\": [{\"py/type\": \"datetime.date\"}, [\"B+cMGg==\"]], \"py/object\": \"datetime.date\"}}", "akinsho/toggleterm.nvim": "{\"description\": \"A neovim lua plugin to help easily manage multiple terminal windows\", \"homepage\": \"https://github.com/akinsho/toggleterm.nvim\", \"license\": {\"py/reduce\": [{\"py/type\": \"update_vim_plugins.nix.License\"}, {\"py/tuple\": [\"gpl3Only\"]}]}, \"name\": \"toggleterm-nvim\", \"owner\": \"akinsho\", \"py/object\": \"update_vim_plugins.plugin.GitHubPlugin\", \"source\": {\"py/object\": \"update_vim_plugins.nix.UrlSource\", \"sha256\": \"0nx69q9597vy7lzvvh58fnjyin23ns6apmyp532sgf547bw7mld6\", \"url\": \"https://github.com/akinsho/toggleterm.nvim/archive/cbd041d91b90cd3c02df03fe6133208888f8e008.tar.gz\"}, \"source_line\": \"akinsho/toggleterm.nvim\", \"version\": {\"__reduce__\": [{\"py/type\": \"datetime.date\"}, [\"B+cMBg==\"]], \"py/object\": \"datetime.date\"}}", - "andrewferrier/debugprint.nvim": "{\"description\": \"Debugging in NeoVim the print() way!\", \"homepage\": \"https://github.com/andrewferrier/debugprint.nvim\", \"license\": {\"py/reduce\": [{\"py/type\": \"update_vim_plugins.nix.License\"}, {\"py/tuple\": [\"\"]}]}, \"name\": \"debugprint-nvim\", \"owner\": \"andrewferrier\", \"py/object\": \"update_vim_plugins.plugin.GitHubPlugin\", \"source\": {\"py/object\": \"update_vim_plugins.nix.UrlSource\", \"sha256\": \"1wr4355b6k5b4m03wnix6w5lqg1f1r5fx1jdcb72jspmbwd7fb96\", \"url\": \"https://github.com/andrewferrier/debugprint.nvim/archive/7eec2b7ddf98b462de02f8ad521327a7736aaf28.tar.gz\"}, \"source_line\": \"andrewferrier/debugprint.nvim\", \"version\": {\"__reduce__\": [{\"py/type\": \"datetime.date\"}, [\"B+cMDA==\"]], \"py/object\": \"datetime.date\"}}", + "andrewferrier/debugprint.nvim": "{\"description\": \"Debugging in NeoVim the print() way!\", \"homepage\": \"https://github.com/andrewferrier/debugprint.nvim\", \"license\": {\"py/reduce\": [{\"py/type\": \"update_vim_plugins.nix.License\"}, {\"py/tuple\": [\"\"]}]}, \"name\": \"debugprint-nvim\", \"owner\": \"andrewferrier\", \"py/object\": \"update_vim_plugins.plugin.GitHubPlugin\", \"source\": {\"py/object\": \"update_vim_plugins.nix.UrlSource\", \"sha256\": \"136jra2k2w6yf0bry1s4lx4h9b1ff0cjkmm65rplq2knrc5bjfmz\", \"url\": \"https://github.com/andrewferrier/debugprint.nvim/archive/13378f67edc112bf0d043bc0c018f8923dc2198d.tar.gz\"}, \"source_line\": \"andrewferrier/debugprint.nvim\", \"version\": {\"__reduce__\": [{\"py/type\": \"datetime.date\"}, [\"B+cMHA==\"]], \"py/object\": \"datetime.date\"}}", "lmburns/lf.nvim": "{\"description\": \"Lf file manager for Neovim (in Lua)\", \"homepage\": \"https://github.com/lmburns/lf.nvim\", \"license\": {\"py/reduce\": [{\"py/type\": \"update_vim_plugins.nix.License\"}, {\"py/tuple\": [\"mit\"]}]}, \"name\": \"lf-nvim\", \"owner\": \"lmburns\", \"py/object\": \"update_vim_plugins.plugin.GitHubPlugin\", \"source\": {\"py/object\": \"update_vim_plugins.nix.UrlSource\", \"sha256\": \"1nwf90bnzqhlgs007gg6xpx0vf4r1d19586nld78ipi1ch7nz4px\", \"url\": \"https://github.com/lmburns/lf.nvim/archive/69ab1efcffee6928bf68ac9bd0c016464d9b2c8b.tar.gz\"}, \"source_line\": \"lmburns/lf.nvim\", \"version\": {\"__reduce__\": [{\"py/type\": \"datetime.date\"}, [\"B+cKAw==\"]], \"py/object\": \"datetime.date\"}}", "nvim-telescope/telescope-bibtex.nvim": "{\"description\": \"A telescope.nvim extension to search and paste bibtex entries into your TeX files.\", \"homepage\": \"https://github.com/nvim-telescope/telescope-bibtex.nvim\", \"license\": {\"py/reduce\": [{\"py/type\": \"update_vim_plugins.nix.License\"}, {\"py/tuple\": [\"mit\"]}]}, \"name\": \"telescope-bibtex-nvim\", \"owner\": \"nvim-telescope\", \"py/object\": \"update_vim_plugins.plugin.GitHubPlugin\", \"source\": {\"py/object\": \"update_vim_plugins.nix.UrlSource\", \"sha256\": \"1vllzdh9ammsfr76mg3brl540b3i6197v8bbgi0lj7s95qy9mj5y\", \"url\": \"https://github.com/nvim-telescope/telescope-bibtex.nvim/archive/b10ec78df938a1e06217f965b32fb1b960681cff.tar.gz\"}, \"source_line\": \"nvim-telescope/telescope-bibtex.nvim\", \"version\": {\"__reduce__\": [{\"py/type\": \"datetime.date\"}, [\"B+cLFA==\"]], \"py/object\": \"datetime.date\"}}" } \ No newline at end of file diff --git a/sys/nixpkgs/pkgs/plgs-pkgs/plugins/default.nix b/sys/nixpkgs/pkgs/plgs-pkgs/plugins/default.nix index b42d13e0..a038cb79 100644 --- a/sys/nixpkgs/pkgs/plgs-pkgs/plugins/default.nix +++ b/sys/nixpkgs/pkgs/plgs-pkgs/plugins/default.nix @@ -9,10 +9,10 @@ */ debugprint-nvim = buildVimPlugin { pname = "debugprint-nvim"; - version = "2023-12-12"; + version = "2023-12-28"; src = fetchurl { - url = "https://github.com/andrewferrier/debugprint.nvim/archive/7eec2b7ddf98b462de02f8ad521327a7736aaf28.tar.gz"; - sha256 = "1wr4355b6k5b4m03wnix6w5lqg1f1r5fx1jdcb72jspmbwd7fb96"; + url = "https://github.com/andrewferrier/debugprint.nvim/archive/13378f67edc112bf0d043bc0c018f8923dc2198d.tar.gz"; + sha256 = "136jra2k2w6yf0bry1s4lx4h9b1ff0cjkmm65rplq2knrc5bjfmz"; }; meta = with lib; { description = "Debugging in NeoVim the print() way!"; diff --git a/sys/nixpkgs/pkgs/plgs-pkgs/plugins/plugins.md b/sys/nixpkgs/pkgs/plgs-pkgs/plugins/plugins.md index 068f9944..df7f36aa 100644 --- a/sys/nixpkgs/pkgs/plgs-pkgs/plugins/plugins.md +++ b/sys/nixpkgs/pkgs/plgs-pkgs/plugins/plugins.md @@ -2,7 +2,7 @@ | Repo | Last Update | Nix package name | Last checked | |:---|:---|:---|:---| -| [andrewferrier/debugprint.nvim](https://github.com/andrewferrier/debugprint.nvim) | 2023-12-12 | `debugprint-nvim` | 2023-12-28 | -| [ThePrimeagen/harpoon:master](https://github.com/ThePrimeagen/harpoon) | 2023-12-26 | `harpoon` | 2023-12-28 | -| [lmburns/lf.nvim](https://github.com/lmburns/lf.nvim) | 2023-10-03 | `lf-nvim` | 2023-12-28 | -| [nvim-telescope/telescope-bibtex.nvim](https://github.com/nvim-telescope/telescope-bibtex.nvim) | 2023-11-20 | `telescope-bibtex-nvim` | 2023-12-28 | +| [andrewferrier/debugprint.nvim](https://github.com/andrewferrier/debugprint.nvim) | 2023-12-28 | `debugprint-nvim` | 2023-12-29 | +| [ThePrimeagen/harpoon:master](https://github.com/ThePrimeagen/harpoon) | 2023-12-26 | `harpoon` | 2023-12-29 | +| [lmburns/lf.nvim](https://github.com/lmburns/lf.nvim) | 2023-10-03 | `lf-nvim` | 2023-12-29 | +| [nvim-telescope/telescope-bibtex.nvim](https://github.com/nvim-telescope/telescope-bibtex.nvim) | 2023-11-20 | `telescope-bibtex-nvim` | 2023-12-29 | diff --git a/sys/svcs/xdg/default.nix b/sys/svcs/xdg/default.nix index 57d915b3..e2392213 100644 --- a/sys/svcs/xdg/default.nix +++ b/sys/svcs/xdg/default.nix @@ -7,35 +7,37 @@ xdg = { portal = { enable = true; - # termfilechooser = { - # enable = false; - # settings = { - # filechooser = { - # cmd = "${sysLib.writeShellScriptWithLibraryAndKeepPath { - # name = "lf_wrapper"; - # src = ./scripts/lf_wrapper; - # dependencies = with pkgs; [ - # lf - # ]; - # }}"; - # }; - # }; - # }; + termfilechooser = { + enable = false; + settings = { + filechooser = { + cmd = "${sysLib.writeShellScriptWithLibraryAndKeepPath { + name = "lf_wrapper"; + src = ./scripts/lf_wrapper; + dependencies = with pkgs; [ + lf + ]; + }}"; + }; + }; + }; config = { common = { # NOTE: The next entry is supposedly needed for gtk based apps <2023-08-31> - default = ["gtk"]; + default = ["wlr" "gtk"]; + "org.freedesktop.impl.portal.FileChooser" = ["termfilechooser"]; }; # TODO: Also activate, when on another wlr-based compositor <2023-11-25> river = { - default = ["wlr"]; + default = ["wlr" "gtk"]; + "org.freedesktop.impl.portal.FileChooser" = ["termfilechooser"]; }; }; extraPortals = with pkgs; [ xdg-desktop-portal-gtk xdg-desktop-portal-wlr - # xdg-desktop-portal-termfilechooser + xdg-desktop-portal-termfilechooser ]; }; }; |