From 1b3b5e4b1203f23c46e82bff6056c1931145cfd5 Mon Sep 17 00:00:00 2001 From: Emmet Date: Tue, 18 Feb 2025 20:37:23 -0600 Subject: [PATCH] home manager uses global packages --- flake.nix | 5 ++-- modules/system/overlays/brave.nix | 22 +++++++++++++++++ modules/system/overlays/ranger.nix | 35 ++++++++++++++++++++++++++++ modules/user/browser/brave.nix | 17 -------------- modules/user/browser/qutebrowser.nix | 2 +- modules/user/home.nix | 3 +-- modules/user/media/default.nix | 4 ++-- modules/user/nix/default.nix | 18 -------------- modules/user/ranger/ranger.nix | 30 ------------------------ 9 files changed, 64 insertions(+), 72 deletions(-) create mode 100644 modules/system/overlays/brave.nix create mode 100644 modules/system/overlays/ranger.nix diff --git a/flake.nix b/flake.nix index d1ae5af3..b7245710 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,7 @@ allowUnfree = true; allowUnfreePredicate = (_: true); }; - overlays = [ inputs.rust-overlay.overlays.default inputs.emacs-overlay.overlays.default ]; + overlays = [ inputs.rust-overlay.overlays.default inputs.emacs-overlay.overlays.default inputs.chaotic.overlays.default ]; }; pkgs-stable = import inputs.nixpkgs-stable { @@ -58,7 +58,8 @@ # home manager inputs.home-manager.nixosModules.home-manager - { home-manager.extraSpecialArgs = { + { + home-manager.extraSpecialArgs = { inherit pkgs; inherit pkgs-stable; inherit inputs; diff --git a/modules/system/overlays/brave.nix b/modules/system/overlays/brave.nix new file mode 100644 index 00000000..94b9b7df --- /dev/null +++ b/modules/system/overlays/brave.nix @@ -0,0 +1,22 @@ +{ config, lib, pkgs, ... }: + +{ + config = { + nixpkgs.config.overlays = [ + (self: super: { + brave = super.brave.override { + commandLineArgs = [ + "--password-store=gnome-libsecret" + "--ignore-gpu-blocklist" + "--enable-gpu-rasterization" + "--enable-accelerated-video-decode" + "--enable-quic" + "--enable-zero-copy" + "--enable-native-gpu-memory-buffers" + "--num-raster-threads=4" + ]; + }; + }) + ]; + }; +} diff --git a/modules/system/overlays/ranger.nix b/modules/system/overlays/ranger.nix new file mode 100644 index 00000000..57a8f848 --- /dev/null +++ b/modules/system/overlays/ranger.nix @@ -0,0 +1,35 @@ +{ config, lib, pkgs, ... }: + +{ + config = { + nixpkgs.overlays = [ + (self: super: + { + ranger = super.ranger.overrideAttrs (oldAttrs: rec { + preConfigure = '' + substituteInPlace ranger/__init__.py \ + --replace "DEFAULT_PAGER = 'less'" "DEFAULT_PAGER = '${lib.getBin pkgs.bat}/bin/bat'" + + # give image previews out of the box when building with w3m + substituteInPlace ranger/config/rc.conf \ + --replace "set preview_images false" "set preview_images true" + + # adds this patch: https://github.com/ranger/ranger/pull/1758 + # fixes a bug for kitty users that use image previews + substituteInPlace ranger/ext/img_display.py \ + --replace "self.image_id -= 1" "self.image_id = max(0, self.image_id - 1)" + + # fixes the .desktop file + substituteInPlace doc/ranger.desktop \ + --replace "Icon=utilities-terminal" "Icon=user-desktop" + substituteInPlace doc/ranger.desktop \ + --replace "Terminal=true" "Terminal=false" + substituteInPlace doc/ranger.desktop \ + --replace "Exec=ranger" "Exec=kitty -e ranger %U" + ''; + }); + } + ) + ]; + }; +} diff --git a/modules/user/browser/brave.nix b/modules/user/browser/brave.nix index 3e40b6bf..9e8cd85a 100644 --- a/modules/user/browser/brave.nix +++ b/modules/user/browser/brave.nix @@ -12,23 +12,6 @@ in { config = lib.mkIf cfg.enable { home.packages = [ pkgs.brave ]; - nixpkgs.config.overlays = [ - (self: super: { - brave = super.brave.override { - commandLineArgs = [ - "--password-store=gnome-libsecret" - "--ignore-gpu-blocklist" - "--enable-gpu-rasterization" - "--enable-accelerated-video-decode" - "--enable-quic" - "--enable-zero-copy" - "--enable-native-gpu-memory-buffers" - "--num-raster-threads=4" - ]; - }; - }) - ]; - xdg.mimeApps.defaultApplications = lib.mkIf (config.userSettings.browser == "brave" ) { "text/html" = "brave-browser.desktop"; "x-scheme-handler/http" = "brave-browser.desktop"; diff --git a/modules/user/browser/qutebrowser.nix b/modules/user/browser/qutebrowser.nix index acdd1648..60bc18f0 100644 --- a/modules/user/browser/qutebrowser.nix +++ b/modules/user/browser/qutebrowser.nix @@ -150,7 +150,7 @@ in { config = lib.mkIf cfg.enable { home.packages = [ pkgs.qutebrowser - (pkgs.callPackage qute-containers {}) # TODO disabled for debugging + (pkgs.callPackage qute-containers {}) ]; home.file.".config/qutebrowser/userscripts/container-open".source = "${(pkgs.callPackage qute-containers {})}/bin/container-open"; diff --git a/modules/user/home.nix b/modules/user/home.nix index b8aa3cc7..80b2500d 100644 --- a/modules/user/home.nix +++ b/modules/user/home.nix @@ -1,6 +1,5 @@ { config, lib, pkgs, inputs, ... }: { - imports = [ inputs.chaotic.homeManagerModules.default ]; - + } diff --git a/modules/user/media/default.nix b/modules/user/media/default.nix index 634a6e10..884a1405 100644 --- a/modules/user/media/default.nix +++ b/modules/user/media/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, inputs, ... }: let cfg = config.userSettings.media; @@ -12,8 +12,8 @@ in { config = lib.mkIf cfg.enable { home.packages = with pkgs; [ vlc - #yt-dlp_git # TODO disabled for debugging mpv mpc + yt-dlp_git ffmpeg ]; diff --git a/modules/user/nix/default.nix b/modules/user/nix/default.nix index 5f957b05..a2c00e04 100644 --- a/modules/user/nix/default.nix +++ b/modules/user/nix/default.nix @@ -2,24 +2,6 @@ { config = { - nix = { - package = lib.mkForce pkgs.nix; - settings = { - substituters = [ - "https://cache.nixos.org" - "https://hyprland.cachix.org" - "https://nix-community.cachix.org" - ]; - trusted-public-keys = [ - "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - ]; - trusted-users = [ "@wheel" ]; - auto-optimise-store = true; - download-buffer-size = 500000000; - }; - }; home.stateVersion = "22.11"; }; } diff --git a/modules/user/ranger/ranger.nix b/modules/user/ranger/ranger.nix index cbf5df61..73f612f2 100644 --- a/modules/user/ranger/ranger.nix +++ b/modules/user/ranger/ranger.nix @@ -10,36 +10,6 @@ in { }; config = lib.mkIf cfg.enable { - nixpkgs.overlays = [ - (self: super: - { - ranger = super.ranger.overrideAttrs (oldAttrs: rec { - preConfigure = '' - substituteInPlace ranger/__init__.py \ - --replace "DEFAULT_PAGER = 'less'" "DEFAULT_PAGER = '${lib.getBin pkgs.bat}/bin/bat'" - - # give image previews out of the box when building with w3m - substituteInPlace ranger/config/rc.conf \ - --replace "set preview_images false" "set preview_images true" - - # adds this patch: https://github.com/ranger/ranger/pull/1758 - # fixes a bug for kitty users that use image previews - substituteInPlace ranger/ext/img_display.py \ - --replace "self.image_id -= 1" "self.image_id = max(0, self.image_id - 1)" - - # fixes the .desktop file - substituteInPlace doc/ranger.desktop \ - --replace "Icon=utilities-terminal" "Icon=user-desktop" - substituteInPlace doc/ranger.desktop \ - --replace "Terminal=true" "Terminal=false" - substituteInPlace doc/ranger.desktop \ - --replace "Exec=ranger" "Exec=kitty -e ranger %U" - ''; - }); - } - ) - ]; - home.packages = with pkgs; [ ranger ripdrag