diff options
| -rw-r--r-- | flake.lock | 81 | ||||
| -rw-r--r-- | flake.nix | 6 | ||||
| -rw-r--r-- | hm/soispha/wms/river/default.nix | 2 | ||||
| -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 | 1 |
7 files changed, 56 insertions, 50 deletions
diff --git a/flake.lock b/flake.lock index 0f2a465b..cb5f604e 100644 --- a/flake.lock +++ b/flake.lock @@ -8,14 +8,17 @@ ], "nixpkgs": [ "nixpkgs" + ], + "systems": [ + "systems" ] }, "locked": { - "lastModified": 1701216516, - "narHash": "sha256-jKSeJn+7hZ1dZdiH1L+NWUGT2i/BGomKAJ54B9kT06Q=", + "lastModified": 1703433843, + "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=", "owner": "ryantm", "repo": "agenix", - "rev": "13ac9ac6d68b9a0896e3d43a082947233189e247", + "rev": "417caa847f9383e111d1397039c9d4337d024bf0", "type": "github" }, "original": { @@ -57,11 +60,11 @@ ] }, "locked": { - "lastModified": 1702956644, - "narHash": "sha256-6XxZSkhb/OkxIx705RHTTLYZ2qemmEC7tODD8f21gKw=", + "lastModified": 1703439018, + "narHash": "sha256-VT+06ft/x3eMZ1MJxWzQP3zXFGcrxGo5VR2rB7t88hs=", "owner": "ipetkov", "repo": "crane", - "rev": "537ebb11db883f9076e37d83e3c7ee69a4abb48c", + "rev": "afdcd41180e3dfe4dac46b5ee396e3b12ccc967a", "type": "github" }, "original": { @@ -78,11 +81,11 @@ ] }, "locked": { - "lastModified": 1673295039, - "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", "type": "github" }, "original": { @@ -99,11 +102,11 @@ ] }, "locked": { - "lastModified": 1702862583, - "narHash": "sha256-WXsUhQxFBkivItTteAeQ7j7kRdL7zFU4NOmdZ8KLHuc=", + "lastModified": 1703726296, + "narHash": "sha256-l/fQEjR3wAEEu1jcZWLq60BSo0r6cXspGLar+pkKZ2M=", "owner": "nix-community", "repo": "disko", - "rev": "e74526b33421a52ce06b2ccadbe670d25012eb01", + "rev": "0ce1b15b99ac7c280384f136eae00b968f5b3f72", "type": "github" }, "original": { @@ -300,11 +303,11 @@ ] }, "locked": { - "lastModified": 1702937117, - "narHash": "sha256-4GjkL2D01bDg00UZN/SeGrnBZrDVOFeZTbQx6U702Vc=", + "lastModified": 1703752128, + "narHash": "sha256-m3BQFpZRem8h5dk7SYV29wGH7cD3H7vRXcuNFfdmO+c=", "owner": "nix-community", "repo": "home-manager", - "rev": "e8aaced73ebaf6bfa8e3c6ab0a19cb184bc4d798", + "rev": "0f11c140657cc1d78febec4d6aca3836422600d2", "type": "github" }, "original": { @@ -316,11 +319,11 @@ }, "impermanence": { "locked": { - "lastModified": 1702984171, - "narHash": "sha256-reIUBrUXibohXmvXRsgpvtlCE0QQSvWSA+qQCKohgR0=", + "lastModified": 1703656108, + "narHash": "sha256-hCSUqdFJKHHbER8Cenf5JRzjMlBjIdwdftGQsO0xoJs=", "owner": "nix-community", "repo": "impermanence", - "rev": "123e94200f63952639492796b8878e588a4a2851", + "rev": "033643a45a4a920660ef91caa391fbffb14da466", "type": "github" }, "original": { @@ -429,11 +432,11 @@ ] }, "locked": { - "lastModified": 1702895385, - "narHash": "sha256-xCfbHlBEPbjpecbhd9zJ79xyI9pURW9/BsY75DNIfs4=", + "lastModified": 1703709181, + "narHash": "sha256-tHId+/SbBtzF3OGu1a4YhhNifdgQ/+RiDPe7Yw+CIzE=", "owner": "nix-community", "repo": "nixvim", - "rev": "309e5644fc72ce82b31da5290638019f60a0a84b", + "rev": "b140981d65335abd07ce313e058380243b827823", "type": "github" }, "original": { @@ -480,27 +483,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702830618, - "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", - "owner": "NixOS", + "lastModified": 1703753682, + "narHash": "sha256-yk6q82+enJO8DU5v26An57bC3Jz7Iej/hsnOCwvz1X4=", + "owner": "soispha", "repo": "nixpkgs", - "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", + "rev": "c3cf02646c2a89fcba63db8aee00af9f10b9aa6f", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "soispha", + "ref": "termfilechooser", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1702759837, - "narHash": "sha256-u3XeJVRe/Q975nwFE+6ALEwypMKJEELMJKDAhSKyq3M=", + "lastModified": 1703351344, + "narHash": "sha256-9FEelzftkE9UaJ5nqxidaJJPEhe9TPhbypLHmc2Mysc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b2566f4f897ac6224e094b167d9488d03e157f28", + "rev": "7790e078f8979a9fcd543f9a47427eeaba38f268", "type": "github" }, "original": { @@ -525,11 +528,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1702591455, - "narHash": "sha256-vK54IZysaxuUOe+abJO0wD40bxqwfZ2aBOhUWS/O/oA=", + "lastModified": 1703546497, + "narHash": "sha256-CN/7HaEmHz+akXKejkRVhsxAm6HPGOmYBWMtgMkuROA=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "9d9d434528404a22fb0c8283fea1ea3a7410ff80", + "rev": "528d500ea826383cc126a9be1e633fc92b19ce5d", "type": "github" }, "original": { @@ -557,11 +560,11 @@ ] }, "locked": { - "lastModified": 1702456155, - "narHash": "sha256-I2XhXGAecdGlqi6hPWYT83AQtMgL+aa3ulA85RAEgOk=", + "lastModified": 1703426812, + "narHash": "sha256-aODSOH8Og8ne4JylPJn+hZ6lyv6K7vE5jFo4KAGIebM=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "007a45d064c1c32d04e1b8a0de5ef00984c419bc", + "rev": "7f35ec30d16b38fe0eed8005933f418d1a4693ee", "type": "github" }, "original": { @@ -681,11 +684,11 @@ ] }, "locked": { - "lastModified": 1702952173, - "narHash": "sha256-24kUnTZgXP5B/fs1/f61tJuHyFrJ8824rn1B/0hL1og=", + "lastModified": 1703729606, + "narHash": "sha256-5QlUMNPKv++mWlS2r3F8bffoSBHXq1qHg+V5mnfSixg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "20fd62b0891707a1db8117d09fc3e65a1cd0f6d7", + "rev": "347789ef125df15b685e8295364ad8ed331fef94", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5ac413cc..13374b8c 100644 --- a/flake.nix +++ b/flake.nix @@ -1,9 +1,10 @@ { - description = "Nixos system config"; + description = "NixOS system config"; inputs = { # base - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:soispha/nixpkgs/termfilechooser"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.05"; # inputs for following @@ -98,6 +99,7 @@ inputs = { nixpkgs.follows = "nixpkgs"; home-manager.follows = "home-manager"; + systems.follows = "systems"; }; }; ragenix = { diff --git a/hm/soispha/wms/river/default.nix b/hm/soispha/wms/river/default.nix index 9965f5a8..fc29daa1 100644 --- a/hm/soispha/wms/river/default.nix +++ b/hm/soispha/wms/river/default.nix @@ -35,7 +35,7 @@ err_fail gammastep & '' else builtins.throw "Host not covered in river screen setup"; - env_vars = "XDG_CURRENT_DESKTOP=river DESKTOP_SESSION=river"; + env_vars = "XDG_CURRENT_DESKTOP=river DESKTOP_SESSION=river"; init_scr = pkgs.substituteAll { src = ./init; inherit mappings screen_setup env_vars; diff --git a/sys/nixpkgs/pkgs/plgs-pkgs/plugins/.plugins.json b/sys/nixpkgs/pkgs/plgs-pkgs/plugins/.plugins.json index 5f54cfdb..6224b1a0 100644 --- a/sys/nixpkgs/pkgs/plgs-pkgs/plugins/.plugins.json +++ b/sys/nixpkgs/pkgs/plgs-pkgs/plugins/.plugins.json @@ -1,5 +1,5 @@ { - "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\": \"1gp6hxy047wp6n6prpapr2ihmvm3br3klijb901zl2smg3f2xlm0\", \"url\": \"https://github.com/ThePrimeagen/harpoon/archive/867e212ac153e793f95b316d1731f3ca1894625e.tar.gz\"}, \"source_line\": \"ThePrimeagen/harpoon:master\", \"version\": {\"__reduce__\": [{\"py/type\": \"datetime.date\"}, [\"B+cMAQ==\"]], \"py/object\": \"datetime.date\"}}", + "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\"}}", "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\"}}", diff --git a/sys/nixpkgs/pkgs/plgs-pkgs/plugins/default.nix b/sys/nixpkgs/pkgs/plgs-pkgs/plugins/default.nix index c637b848..b42d13e0 100644 --- a/sys/nixpkgs/pkgs/plgs-pkgs/plugins/default.nix +++ b/sys/nixpkgs/pkgs/plgs-pkgs/plugins/default.nix @@ -25,10 +25,10 @@ */ harpoon = buildVimPlugin { pname = "harpoon"; - version = "2023-12-01"; + version = "2023-12-26"; src = fetchurl { - url = "https://github.com/ThePrimeagen/harpoon/archive/867e212ac153e793f95b316d1731f3ca1894625e.tar.gz"; - sha256 = "1gp6hxy047wp6n6prpapr2ihmvm3br3klijb901zl2smg3f2xlm0"; + url = "https://github.com/ThePrimeagen/harpoon/archive/ccae1b9bec717ae284906b0bf83d720e59d12b91.tar.gz"; + sha256 = "1w4hi9hbdjwdhb4vwa0x08a25vbcxqg1d5cskm2qvjy5fdlqils0"; }; meta = with lib; { description = ""; diff --git a/sys/nixpkgs/pkgs/plgs-pkgs/plugins/plugins.md b/sys/nixpkgs/pkgs/plgs-pkgs/plugins/plugins.md index efac6d6d..068f9944 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-19 | -| [ThePrimeagen/harpoon:master](https://github.com/ThePrimeagen/harpoon) | 2023-12-01 | `harpoon` | 2023-12-19 | -| [lmburns/lf.nvim](https://github.com/lmburns/lf.nvim) | 2023-10-03 | `lf-nvim` | 2023-12-19 | -| [nvim-telescope/telescope-bibtex.nvim](https://github.com/nvim-telescope/telescope-bibtex.nvim) | 2023-11-20 | `telescope-bibtex-nvim` | 2023-12-19 | +| [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 | diff --git a/sys/svcs/xdg/default.nix b/sys/svcs/xdg/default.nix index 4f6db4a1..2de640dd 100644 --- a/sys/svcs/xdg/default.nix +++ b/sys/svcs/xdg/default.nix @@ -17,6 +17,7 @@ extraPortals = with pkgs; [ xdg-desktop-portal-gtk xdg-desktop-portal-wlr + # xdg-desktop-portal-termfilechooser ]; }; }; |