From 6eb61c01940354d25664d427b6115dd0135995d2 Mon Sep 17 00:00:00 2001 From: zack Date: Fri, 27 Sep 2024 12:09:26 -0400 Subject: [PATCH] update things --- flake.lock | 36 +++++++++---------- .../config/lua/plugins/editor/context.lua | 2 +- .../neovim/config/lua/plugins/tools/curl.lua | 35 ++++++++++++++++++ .../config/lua/plugins/ui/catppuccin.lua | 2 +- modules/home/apps/tools/neovim/default.nix | 3 ++ modules/home/services/mpd/default.nix | 6 ++++ modules/nixos/protocols/wayland/default.nix | 4 +-- modules/nixos/ui/fonts/default.nix | 5 ++- packages/zen-browser/default.nix | 4 +-- 9 files changed, 72 insertions(+), 25 deletions(-) create mode 100644 modules/home/apps/tools/neovim/config/lua/plugins/tools/curl.lua diff --git a/flake.lock b/flake.lock index c730ce7..4384fe7 100644 --- a/flake.lock +++ b/flake.lock @@ -991,11 +991,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1727385738, - "narHash": "sha256-V6x1KgrOFIR7lDUpMTJXm+SlFnZOIb9mFizZTf8d3xM=", + "lastModified": 1727415632, + "narHash": "sha256-PApi0lMoKu8Ragc1pyrcgFyye1Xhfh4qsL+tMyvnYjw=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "6b4bf7be2ed40b5e373e6d236fbee9ccefdf9015", + "rev": "6a21da1b53a9a5c6467694b9456b4447cbd69816", "type": "github" }, "original": { @@ -1007,11 +1007,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1727298068, - "narHash": "sha256-fiDn3BSRLqSRh1cPLCkFIYc0mRpAAxc4Lq89gZ+ioMg=", + "lastModified": 1727394046, + "narHash": "sha256-vhOhvCtNWeuqtjMnV87Xb2zgFDJJUrWcAofzQNYyiR8=", "owner": "neovim", "repo": "neovim", - "rev": "64847fbdc908bf0a301b8f1e1814ff71bd425bae", + "rev": "a9287dd882e082a17fc7dcf004d3f991ed29001b", "type": "github" }, "original": { @@ -1160,11 +1160,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1727296349, - "narHash": "sha256-C3SRU3GMDNII9l16o4+nkybuxaDX4x5TBypwmmUBCo0=", + "lastModified": 1727335715, + "narHash": "sha256-1uw3y94dA4l22LkqHRIsb7qr3rV5XdxQFqctINfx8Cc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fe866c653c24adf1520628236d4e70bbb2fdd949", + "rev": "28b5b8af91ffd2623e995e20aee56510db49001a", "type": "github" }, "original": { @@ -1182,11 +1182,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1727371977, - "narHash": "sha256-yn84DwpqHqgTwkogKzSOVUYCVdkensapSJYXrtCLBAs=", + "lastModified": 1727429410, + "narHash": "sha256-9CIAtDfRt/6wjh77jEESV4Z5ilzh2pdtJpnqCPRXtp8=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "dd54603157587b2229c7cdf5cf869632e380ffb2", + "rev": "9d50aeca9abe68dc20000119db9b8fc3cdc0e3ec", "type": "github" }, "original": { @@ -1309,11 +1309,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1727173215, - "narHash": "sha256-OtMlWYCqBDbnEsByoows785Gem9CSMiXYEBiKKtStk4=", + "lastModified": 1727296349, + "narHash": "sha256-C3SRU3GMDNII9l16o4+nkybuxaDX4x5TBypwmmUBCo0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "965289e5e07243f1cde3212d8bcaf726d36c5c46", + "rev": "fe866c653c24adf1520628236d4e70bbb2fdd949", "type": "github" }, "original": { @@ -1581,11 +1581,11 @@ ] }, "locked": { - "lastModified": 1727343412, - "narHash": "sha256-Uoxb8Qr1bQp05SQIcAYCOfzImOJXIbWk4chTfxsd/us=", + "lastModified": 1727410670, + "narHash": "sha256-DI22QeBUBIHQQi5XCLq9tmy4z1IPiDD8IpnHVfBL0EM=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "2f429398aef267d98858ca98d2f2a38a8ee90fb3", + "rev": "cc02909bbfaa51dfe5849cf6997cd2fd0492e972", "type": "github" }, "original": { diff --git a/modules/home/apps/tools/neovim/config/lua/plugins/editor/context.lua b/modules/home/apps/tools/neovim/config/lua/plugins/editor/context.lua index fb90174..9055dce 100644 --- a/modules/home/apps/tools/neovim/config/lua/plugins/editor/context.lua +++ b/modules/home/apps/tools/neovim/config/lua/plugins/editor/context.lua @@ -1,5 +1,5 @@ return { "nvim-treesitter/nvim-treesitter-context", event = "BufEnter", - opts = { enable = true }, + opts = { enable = true, max_lines = 3 }, } diff --git a/modules/home/apps/tools/neovim/config/lua/plugins/tools/curl.lua b/modules/home/apps/tools/neovim/config/lua/plugins/tools/curl.lua new file mode 100644 index 0000000..5c953c0 --- /dev/null +++ b/modules/home/apps/tools/neovim/config/lua/plugins/tools/curl.lua @@ -0,0 +1,35 @@ +return { + "oysandvik94/curl.nvim", + cmd = { "CurlOpen" }, + dependencies = { + "nvim-lua/plenary.nvim", + }, + keys = { + { "co", "CurlOpen", desc = "Open Curl" }, + }, + config = function() + local curl = require("curl") + curl.setup({}) + + vim.keymap.set("n", "co", function() + curl.open_global_tab() + end, { desc = "Open a curl tab with gloabl scope" }) + + -- These commands will prompt you for a name for your collection + vim.keymap.set("n", "csc", function() + curl.create_scoped_collection() + end, { desc = "Create or open a collection with a name from user input" }) + + vim.keymap.set("n", "cgc", function() + curl.create_global_collection() + end, { desc = "Create or open a global collection with a name from user input" }) + + vim.keymap.set("n", "fsc", function() + curl.pick_scoped_collection() + end, { desc = "Choose a scoped collection and open it" }) + + vim.keymap.set("n", "fgc", function() + curl.pick_global_collection() + end, { desc = "Choose a global collection and open it" }) + end, +} diff --git a/modules/home/apps/tools/neovim/config/lua/plugins/ui/catppuccin.lua b/modules/home/apps/tools/neovim/config/lua/plugins/ui/catppuccin.lua index adb19b9..283ba6f 100644 --- a/modules/home/apps/tools/neovim/config/lua/plugins/ui/catppuccin.lua +++ b/modules/home/apps/tools/neovim/config/lua/plugins/ui/catppuccin.lua @@ -5,7 +5,7 @@ return { vim.cmd.colorscheme("catppuccin-macchiato") end, opts = { - transparent_background = true, + transparent_background = false, custom_highlights = function(C) return { Pmenu = { bg = C.base }, diff --git a/modules/home/apps/tools/neovim/default.nix b/modules/home/apps/tools/neovim/default.nix index 3fef765..639cd16 100644 --- a/modules/home/apps/tools/neovim/default.nix +++ b/modules/home/apps/tools/neovim/default.nix @@ -56,6 +56,9 @@ in { clang pkgs-unstable.bash-language-server + curl + jq + # Tools git html-tidy diff --git a/modules/home/services/mpd/default.nix b/modules/home/services/mpd/default.nix index b9080f0..9f08725 100644 --- a/modules/home/services/mpd/default.nix +++ b/modules/home/services/mpd/default.nix @@ -16,6 +16,12 @@ in { services.mpd = { enable = true; musicDirectory = "/home/zoey/Music"; + extraConfig = '' + audio_output { + type "pipewire" + name "PipeWire Sound Server" + } + ''; }; }; } diff --git a/modules/nixos/protocols/wayland/default.nix b/modules/nixos/protocols/wayland/default.nix index cde3b68..2abbff6 100644 --- a/modules/nixos/protocols/wayland/default.nix +++ b/modules/nixos/protocols/wayland/default.nix @@ -72,8 +72,8 @@ in { extraPortals = [ pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-wlr - inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland - # pkgs.xdg-desktop-portal-hyprland + # inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland + pkgs.xdg-desktop-portal-hyprland pkgs.xwaylandvideobridge ]; }; diff --git a/modules/nixos/ui/fonts/default.nix b/modules/nixos/ui/fonts/default.nix index dd7ca0b..340de17 100644 --- a/modules/nixos/ui/fonts/default.nix +++ b/modules/nixos/ui/fonts/default.nix @@ -40,7 +40,10 @@ in { exportGlyphNames = true [buildPlans.IosevkaCustom.variants] - inherits = "ss10" + inherits = "ss20" + + [buildPlans.IosevkaCustom.variants.design] + one = "base-flat-top-serif" ''; }) noto-fonts diff --git a/packages/zen-browser/default.nix b/packages/zen-browser/default.nix index a9f7361..0281d8c 100644 --- a/packages/zen-browser/default.nix +++ b/packages/zen-browser/default.nix @@ -3,7 +3,7 @@ lib, }: let pname = "zen-browser"; - version = "1.0.1-a.4"; + version = "1.0.1-a.5"; runtimeLibs = with pkgs; [ @@ -60,7 +60,7 @@ in src = builtins.fetchTarball { url = "https://github.com/zen-browser/desktop/releases/download/${version}/zen.linux-specific.tar.bz2"; - sha256 = "sha256:0jjfr1201gfw0cy8q1jbr504994z33sbw8ip86c6xbww8qm60bqh"; + sha256 = "sha256:0rj8x0b7vnl6zj8mky9qip54l1cp8rpy0465gr28zsjnjhp7qyak"; }; desktopSrc = ./.;