diff options
| -rw-r--r-- | modules/git.home.nix | 3 | ||||
| -rw-r--r-- | modules/newsboat.home/public-feed.nix | 11 | ||||
| -rw-r--r-- | overlays-system.nix | 1 | ||||
| -rw-r--r-- | overlays/neovim.nix | 24 | ||||
| -rw-r--r-- | packages.nix | 10 |
5 files changed, 16 insertions, 33 deletions
diff --git a/modules/git.home.nix b/modules/git.home.nix index df13d2c..0622128 100644 --- a/modules/git.home.nix +++ b/modules/git.home.nix @@ -51,6 +51,7 @@ "tags.temp" "ayak.sh" ".direnv" + ".local.lua" ]; aliases = { ignore = "!gi() { curl -sL https://www.toptal.com/developers/gitignore/api/$@ ;}; gi"; @@ -94,7 +95,7 @@ whitespace = "red reverse"; }; pull = { - rebase = false; + rebase = true; }; # pager = { # diff = "${pkgs.delta}/bin/delta --color-only"; diff --git a/modules/newsboat.home/public-feed.nix b/modules/newsboat.home/public-feed.nix index 101d15e..551ec3b 100644 --- a/modules/newsboat.home/public-feed.nix +++ b/modules/newsboat.home/public-feed.nix @@ -34,17 +34,18 @@ in { # { url = "https://www.nature.com/nature.rss"; tags = ["sci"]; } # { url = "https://what-if.xkcd.com/feed.atom"; tags = ["sci"]; } - { url = "https://feeds.transistor.fm/tomorrow"; tags = ["podcast"]; } + { url = "https://feeds.buzzsprout.com/1817535.rss"; tags = ["podcast"]; title = "Haskell Interlude"; } + # { url = "https://feeds.transistor.fm/tomorrow"; tags = ["podcast"]; } { url = "https://feed.syntax.fm/"; tags = ["podcast"]; } { url = "https://changelog.com/podcast/feed"; tags = ["podcast"]; } - { url = "https://seradio.libsyn.com/rss"; tags = ["podcast"]; } - { url = "https://changelog.com/jsparty/feed"; tags = ["podcast"]; } + # { url = "https://seradio.libsyn.com/rss"; tags = ["podcast"]; } + # { url = "https://changelog.com/jsparty/feed"; tags = ["podcast"]; } { url = "https://feeds.buzzsprout.com/1952066.rss"; tags = ["podcast"]; } { url = "https://www.spreaker.com/show/6102064/episodes/feed"; tags = ["podcast"]; } { url = "https://feeds.soundcloud.com/users/soundcloud:users:206137365/sounds.rss"; tags = ["podcast"]; } - { url = "http://shoptalkshow.com/feed/podcast"; tags = ["podcast"]; } + # { url = "http://shoptalkshow.com/feed/podcast"; tags = ["podcast"]; } { url = "https://anchor.fm/s/dd6922b4/podcast/rss"; tags = ["podcast"]; title = "devtools.fm"; } - { url = "https://feeds.acast.com/public/shows/664fde3eda02bb0012bad909"; tags = ["podcast"]; } + # { url = "https://anchor.fm/s/fb57a4a8/podcast/rss"; tags = ["podcast"]; } { url = "https://lexi-lambda.github.io/feeds/all.rss.xml"; tags = ["dev-blog"]; } { url = "https://overreacted.io/rss.xml"; tags = ["dev-blog"]; } diff --git a/overlays-system.nix b/overlays-system.nix index 4ae9609..8de97c5 100644 --- a/overlays-system.nix +++ b/overlays-system.nix @@ -7,5 +7,6 @@ in pass-with-dmenu qutebrowser j4-dmenu-desktop + neovim-nightly ]; } diff --git a/overlays/neovim.nix b/overlays/neovim.nix index 1118d94..915c1e0 100644 --- a/overlays/neovim.nix +++ b/overlays/neovim.nix @@ -1,21 +1,3 @@ -self: super: { - tree-sitter-updated = super.tree-sitter.overrideAttrs ( - oldAttrs: { - postInstall = ''PREFIX=$out make install''; - } - ); - neovim-unwrapped = super.neovim-unwrapped.overrideAttrs ( - oldAttrs: rec { - name = "neovim-nightly"; - version = "0.5-nightly"; - src = self.fetchFromGitHub { - owner = "neovim"; - repo = "neovim"; - rev = "nightly"; - sha256 = "145mzl1pzqy0ic9gm0322z9ssvbyj0v9xiqs7k0wmi8b0590xg8s"; - }; - - nativeBuildInputs = with self.pkgs; [ unzip cmake pkg-config gettext tree-sitter-updated ]; - } - ); -} +import (builtins.fetchTarball { + url = "https://github.com/nix-community/neovim-nightly-overlay/archive/master.tar.gz"; +}) diff --git a/packages.nix b/packages.nix index 5cd605f..38ff9df 100644 --- a/packages.nix +++ b/packages.nix @@ -33,7 +33,7 @@ let gcc gnumake - nodejs_20 + nodejs_23 bun # bspwm @@ -51,12 +51,9 @@ let biome lua5_1 - # .withPackages(ps: with ps; [ - # luarocks - # lua-curl - # ]) lua51Packages.luarocks lua51Packages.lua-curl + luajitPackages.magick # lua51Packages.magick ]; apps = with pkgs; [ @@ -112,6 +109,7 @@ let dua (builtins.getFlake "github:phenax/chelleport/5262d942c4c2c36529fbe704e7de165044e6dc99").packages.x86_64-linux.default + (builtins.getFlake "github:phenax/draw-stuff-on-your-screen/6e0e1f6ee603045cac5bb5d9d75d80c9ddef6c6e").packages.x86_64-linux.default ]; utils = with pkgs; [ @@ -160,11 +158,11 @@ let wmctrl arandr xorg.xgamma - v4l-utils libva libdrm + pkg-config virt-manager virt-viewer |