diff --git a/flake.lock b/flake.lock index 88a4c2b..c835796 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1689633990, - "narHash": "sha256-iwvQg2Vx0IIDWZaKo8Xmzxlv1YPHg+Kp/QSv8dRv0RY=", + "lastModified": 1705180696, + "narHash": "sha256-6TwTHERD+2SX21zvBwmm58mtmgVXHLPu273i04JdH9Y=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "dddf2e1c04845d43c89a8e9e37d574519649a404", + "rev": "b390e87cd404e65ab4d786666351f1292e89162a", "type": "github" }, "original": { @@ -150,11 +150,11 @@ "blocklist-hosts": { "flake": false, "locked": { - "lastModified": 1707592967, - "narHash": "sha256-72m+75SQ2V6gwX59dfH/XoWeGdaMNU587hkTeQYzSTA=", + "lastModified": 1708054347, + "narHash": "sha256-Z6Kz4bRtswzoZt4xroSWfSZKMM+fWpsVQMI+Cy7EfVE=", "owner": "StevenBlack", "repo": "hosts", - "rev": "5bcd5c42231f00f6b5d15c612eb3e3d98d0a7bf8", + "rev": "61080e8dadbc9ee10d4567668cdbf017bb9f172e", "type": "github" }, "original": { @@ -466,11 +466,11 @@ ] }, "locked": { - "lastModified": 1707591592, - "narHash": "sha256-sTFPBn9MnJHcoBcG+xpljsG/JGJxPaevpzhdOrW2uf0=", + "lastModified": 1708031129, + "narHash": "sha256-EH20hJfNnc1/ODdDVat9B7aKm0B95L3YtkIRwKLvQG8=", "owner": "nix-community", "repo": "home-manager", - "rev": "4c0357ff874f8250fcae621d5626aba1c7161710", + "rev": "3d6791b3897b526c82920a2ab5f61d71985b3cf8", "type": "github" }, "original": { @@ -582,11 +582,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1707268954, - "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", + "lastModified": 1708118438, + "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", + "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80", "type": "github" }, "original": { @@ -597,11 +597,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1707347730, - "narHash": "sha256-0etC/exQIaqC9vliKhc3eZE2Mm2wgLa0tj93ZF/egvM=", + "lastModified": 1708161998, + "narHash": "sha256-6KnemmUorCvlcAvGziFosAVkrlWZGIc6UNT9GUYr0jQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6832d0d99649db3d65a0e15fa51471537b2c56a6", + "rev": "84d981bae8b5e783b3b548de505b22880559515f", "type": "github" }, "original": { @@ -741,11 +741,11 @@ "org-timeblock": { "flake": false, "locked": { - "lastModified": 1705791229, - "narHash": "sha256-vEvhZGo9C9yNw+wP0xMpjl5ueBzAojV8tO4p9gz3Z7w=", + "lastModified": 1707720561, + "narHash": "sha256-aSZWSlKdYwx62h6cXCDHOyLJMG1/Ls9zANyTSG04AuA=", "owner": "ichernyshovvv", "repo": "org-timeblock", - "rev": "7b39e19d511536835a3891f1cfbcdff4983b29b6", + "rev": "b423b01712b9c25dff3e4203c7cde736225f62ef", "type": "github" }, "original": { @@ -876,11 +876,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1707530952, - "narHash": "sha256-t5Q418k3S2TpAMNl1pQWuKkSGOkkx0kWx7SGa7yyRtc=", + "lastModified": 1708241671, + "narHash": "sha256-zSulX9tP4R35Y8A842dGSzaHMVP91W2Ry0SXvQKD2BQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "49550275c3956b861dbb7cb83a732803f013bdbb", + "rev": "d500e370b26f9b14303cb39bf1509df0a920c8b0", "type": "github" }, "original": { @@ -922,11 +922,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1707492526, - "narHash": "sha256-i87wM/l56Hrvmr5D41+S7lL0uWBDHQUJGp3dVzKNQXM=", + "lastModified": 1707757489, + "narHash": "sha256-YyqHbxtDGB3OIITPQ3XtkM20fh9/t4CXkYXKzg9DuP8=", "owner": "danth", "repo": "stylix", - "rev": "b17c41ca43866609579ea9c9ef96532d8854b85f", + "rev": "50cae37cfe23e5ad202ed53f48529139dfa0d008", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 66f1e8c..520814a 100644 --- a/flake.nix +++ b/flake.nix @@ -46,7 +46,6 @@ src = nixpkgs; patches = [ ./patches/emacs-no-version-check.patch - ./patches/nixos-nixpkgs-268027.patch ]; }; diff --git a/patches/nixos-nixpkgs-268027.patch b/patches/nixos-nixpkgs-268027.patch deleted file mode 100644 index 68b055f..0000000 --- a/patches/nixos-nixpkgs-268027.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 397a8fd06bd576cae7f1fae71dbfd9fbce30dc66 Mon Sep 17 00:00:00 2001 -From: K900 -Date: Fri, 17 Nov 2023 07:48:13 +0300 -Subject: [PATCH] python2/mk-python-derivation: disable catchConflictsHook - -It's broken on Py2. Hopefully people still using 2 know what they're doing? ---- - .../interpreters/python/python2/mk-python-derivation.nix | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix -index 1a6f9c784cf675..6d51b51b215d43 100644 ---- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix -+++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix -@@ -57,3 +57,3 @@ - # Raise an error if two packages are installed with the same name - # add the runtime deps until after buildPhase. --, catchConflicts ? (python.stdenv.hostPlatform == python.stdenv.buildPlatform) -+, catchConflicts ? false - - # Additional arguments to pass to the makeWrapper function, which wraps - # generated binaries. diff --git a/user/app/browser/qutebrowser.nix b/user/app/browser/qutebrowser.nix index bbd1b55..54d0be8 100644 --- a/user/app/browser/qutebrowser.nix +++ b/user/app/browser/qutebrowser.nix @@ -2,10 +2,6 @@ { - nixpkgs.config.packageOverrides = pkgs: { - qutebrowser = pkgs.qutebrowser.override { enableVulkan = false; }; - }; - home.packages = [ pkgs.qutebrowser (pkgs.callPackage ./qute-containers.nix { dmenuCmd = "fuzzel -d"; }) ]; diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el index 7cf5e61..ca6c34d 100644 --- a/user/app/doom-emacs/config.el +++ b/user/app/doom-emacs/config.el @@ -1234,7 +1234,7 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)." "q" 'helpful-kill-buffers) ;;;------ helpful configuration ------;;; -(add-load-path! "~/.nix-profile/share/emacs/site-lisp/elpa/mu4e-1.10.7") +(add-load-path! "~/.nix-profile/share/emacs/site-lisp/elpa/mu4e-1.10.8") (require 'mu4e) (require 'mu4e-contrib) (require 'mu4e-actions) diff --git a/user/app/doom-emacs/doom.nix b/user/app/doom-emacs/doom.nix index 9f1289d..2bb1cb7 100644 --- a/user/app/doom-emacs/doom.nix +++ b/user/app/doom-emacs/doom.nix @@ -1,6 +1,5 @@ -{ config, lib, pkgs, userSettings, systemSettings, - eaf, eaf-browser, org-nursery, org-yaap, - org-side-tree, org-timeblock, phscroll, ... }: +{ config, lib, pkgs, pkgs-stable, userSettings, systemSettings, + org-nursery, org-yaap, org-side-tree, org-timeblock, phscroll, ... }: let themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + "../../../../themes"+("/"+userSettings.theme)+"/polarity.txt")); dashboardLogo = ./. + "/nix-" + themePolarity + ".png"; @@ -41,19 +40,17 @@ in extension = ".el"; }; - home.packages = with pkgs; [ + home.packages = (with pkgs; [ nil nixfmt git file - nodejs wmctrl jshon aria hledger hunspell hunspellDicts.en_US-large pandoc - nodePackages.mermaid-cli (pkgs.mu.override { emacs = emacs29-pgtk; }) emacsPackages.mu4e isync @@ -61,29 +58,15 @@ in (python3.withPackages (p: with p; [ pandas requests - pyqt6 sip qtpy qt6.qtwebengine epc lxml pyqt6-webengine + epc lxml pysocks pymupdf markdown ])) - ]; - - nixpkgs.overlays = [ - (self: super: - { - mu = super.mu.overrideAttrs (oldAttrs: rec { - pname = "mu"; - version = "1.10.7"; - src = super.fetchFromGitHub { - owner = "djcb"; - repo = "mu"; - rev = "v1.10.7"; - hash = "sha256-x1TsyTOK5U6/Y3QInm+XQ7T32X49iwa+4UnaHdiyqCI="; - }; - }); - } - ) - ]; + ]) ++ (with pkgs-stable; [ + nodejs + nodePackages.mermaid-cli + ]); services.mbsync = { enable = true; @@ -91,11 +74,6 @@ in frequency = "*:0/5"; }; - home.file.".emacs.d/eaf" = { - source = "${eaf}"; - recursive = true; - }; - home.file.".emacs.d/org-yaap" = { source = "${org-yaap}"; recursive = true; @@ -111,17 +89,6 @@ in recursive = true; }; - home.file.".emacs.d/eaf/app/browser" = { - source = "${eaf-browser}"; - recursive = true; - onChange = " - pushd ~/.emacs.d/eaf/app/browser; - rm package*.json; - npm install darkreader @mozilla/readability && rm package*.json; - popd; - "; - }; - home.file.".emacs.d/org-nursery" = { source = "${org-nursery}"; }; diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org index d66a953..d3bb5aa 100644 --- a/user/app/doom-emacs/doom.org +++ b/user/app/doom-emacs/doom.org @@ -20,7 +20,6 @@ - [[#focus-mode-configuration][Focus Mode Configuration]] - [[#helpful-mode-configuration][Helpful Mode Configuration]] - [[#mu4e-configuration][mu4e Configuration]] - - [[#eaf][EAF]] - [[#direnv][Direnv]] - [[#projectile][Projectile]] - [[#sudo-edit][sudo-edit]] @@ -1458,7 +1457,7 @@ I don't have this active right now since it's kinda weird with pgtk... ** mu4e Configuration #+BEGIN_SRC emacs-lisp :tangle config.el ;;;------ helpful configuration ------;;; -(add-load-path! "~/.nix-profile/share/emacs/site-lisp/elpa/mu4e-1.10.7") +(add-load-path! "~/.nix-profile/share/emacs/site-lisp/elpa/mu4e-1.10.8") (require 'mu4e) (require 'mu4e-contrib) (require 'mu4e-actions) @@ -1579,40 +1578,6 @@ I don't have this active right now since it's kinda weird with pgtk... ;; (mu4e-message-contact-field-matches msg ;; :to ,catch-address))))) -#+END_SRC -** EAF -EAF doesn't work on Wayland :( -#+BEGIN_SRC emacs-lisp -;;;-- Load emacs application framework;;;-- -(use-package! eaf - :load-path "~/.emacs.d/eaf/" - :init - :custom - (eaf-browser-continue-where-left-off t) - (eaf-browser-enable-adblocker t) - (browse-url-browser-function 'eaf-open-browser) ;; Make EAF Browser my default browser - :config - (defalias 'browse-web #'eaf-open-browser) - - (require 'eaf-browser) - - (require 'eaf-evil) - (define-key key-translation-map (kbd "SPC") - (lambda (prompt) - (if (derived-mode-p 'eaf-mode) - (pcase eaf--buffer-app-name - ("browser" (if (string= (eaf-call-sync "eval_function" eaf--buffer-id "is_focus") "True") - (kbd "SPC") - (kbd eaf-evil-leader-key))) - (_ (kbd "SPC"))) - (kbd "SPC"))))) - -(setq browse-url-browser-function 'browse-url-default-browser) - -(map! :leader - :desc "Open web browser" - "o w" #'eaf-open-browser-with-history) - #+END_SRC ** Direnv #+BEGIN_SRC emacs-lisp :tangle config.el @@ -1977,9 +1942,8 @@ Any git package can be configured for a particular commit or branch: * Nix Integration In order to have Nix load my Doom Emacs configuration [[./doom.nix][doom.nix]], which I source in the =imports= block of my [[../../../profiles/work/home.nix][home.nix]]. #+BEGIN_SRC nix :tangle doom.nix -{ config, lib, pkgs, userSettings, systemSettings, - eaf, eaf-browser, org-nursery, org-yaap, - org-side-tree, org-timeblock, phscroll, ... }: +{ config, lib, pkgs, pkgs-stable, userSettings, systemSettings, + org-nursery, org-yaap, org-side-tree, org-timeblock, phscroll, ... }: let themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + "../../../../themes"+("/"+userSettings.theme)+"/polarity.txt")); dashboardLogo = ./. + "/nix-" + themePolarity + ".png"; @@ -2020,19 +1984,17 @@ in extension = ".el"; }; - home.packages = with pkgs; [ + home.packages = (with pkgs; [ nil nixfmt git file - nodejs wmctrl jshon aria hledger hunspell hunspellDicts.en_US-large pandoc - nodePackages.mermaid-cli (pkgs.mu.override { emacs = emacs29-pgtk; }) emacsPackages.mu4e isync @@ -2040,29 +2002,15 @@ in (python3.withPackages (p: with p; [ pandas requests - pyqt6 sip qtpy qt6.qtwebengine epc lxml pyqt6-webengine + epc lxml pysocks pymupdf markdown ])) - ]; - - nixpkgs.overlays = [ - (self: super: - { - mu = super.mu.overrideAttrs (oldAttrs: rec { - pname = "mu"; - version = "1.10.7"; - src = super.fetchFromGitHub { - owner = "djcb"; - repo = "mu"; - rev = "v1.10.7"; - hash = "sha256-x1TsyTOK5U6/Y3QInm+XQ7T32X49iwa+4UnaHdiyqCI="; - }; - }); - } - ) - ]; + ]) ++ (with pkgs-stable; [ + nodejs + nodePackages.mermaid-cli + ]); services.mbsync = { enable = true; @@ -2070,11 +2018,6 @@ in frequency = "*:0/5"; }; - home.file.".emacs.d/eaf" = { - source = "${eaf}"; - recursive = true; - }; - home.file.".emacs.d/org-yaap" = { source = "${org-yaap}"; recursive = true; @@ -2090,17 +2033,6 @@ in recursive = true; }; - home.file.".emacs.d/eaf/app/browser" = { - source = "${eaf-browser}"; - recursive = true; - onChange = " - pushd ~/.emacs.d/eaf/app/browser; - rm package*.json; - npm install darkreader @mozilla/readability && rm package*.json; - popd; - "; - }; - home.file.".emacs.d/org-nursery" = { source = "${org-nursery}"; }; diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index ac10d7e..d64073b 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -38,7 +38,6 @@ exec-once = waybar exec-once = emacs --daemon - #exec-once = swayidle -w timeout 90 '${pkgs.gtklock}/bin/gtklock -d' timeout 210 'suspend-unless-render' resume '${pkgs.hyprland}/bin/hyprctl dispatch dpms on' before-sleep "${pkgs.gtklock}/bin/gtklock -d" exec-once = swayidle -w timeout 90 '${config.programs.swaylock.package}/bin/swaylock -f' timeout 210 'suspend-unless-render' resume '${pkgs.hyprland}/bin/hyprctl dispatch dpms on' before-sleep "${config.programs.swaylock.package}/bin/swaylock -f" exec-once = obs-notification-mute-daemon