From ae3f40b06f23ceecdfd095b803248453dc75f177 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Fri, 6 Dec 2024 14:19:29 -0500 Subject: [PATCH] emacs compilation flags and more --- flake.lock | 30 +++++++++++++++--------------- home/home.nix | 20 +++++++++++++++++--- 2 files changed, 32 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index fdef55e..54e9ba3 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1733050161, - "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", + "lastModified": 1733482664, + "narHash": "sha256-ZD+h1fwvZs+Xvg46lzTWveAqyDe18h9m7wZnTIJfFZ4=", "owner": "nix-community", "repo": "home-manager", - "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", + "rev": "e38d3dd1d355a003cc63e8fe6ff66ef2257509ed", "type": "github" }, "original": { @@ -73,11 +73,11 @@ ] }, "locked": { - "lastModified": 1732661062, - "narHash": "sha256-E8mk/P0wUpHXy7tDQqUzbpa9IJoN/DmA1a6iFBuXqgI=", + "lastModified": 1733444216, + "narHash": "sha256-Xs+HcLsnMy6Z1FpHr0ULsGMc1mI6ESq1dTBAYwlpuVY=", "owner": "musnix", "repo": "musnix", - "rev": "629dcc6010365cfd268702065c2f8149ae19ea02", + "rev": "a38011b5b96624b7f6527c0bc6df530a263297ad", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1733228754, - "narHash": "sha256-Jbt4imHmz5Z0jdaW7RrwAO1HYCmPs3XCt4j86jkG0b4=", + "lastModified": 1733345341, + "narHash": "sha256-8S58zrdpzGhax6tmn1i+R3AA0N9DJMu5FQI8JkA0NNU=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "2880dc44fc8c450b4ffe1609a4bccd19ef759f5c", + "rev": "ebb0be49fc381112ff37726c6dd6df4df2ef5a1b", "type": "github" }, "original": { @@ -142,11 +142,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733217105, - "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", + "lastModified": 1733481457, + "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", + "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", "type": "github" }, "original": { @@ -174,11 +174,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "owner": "nixos", "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { diff --git a/home/home.nix b/home/home.nix index e237b42..e620685 100644 --- a/home/home.nix +++ b/home/home.nix @@ -110,7 +110,7 @@ shfmt shellcheck html-tidy - + tree-sitter libsecret waylandpp.dev @@ -234,6 +234,7 @@ solaar logitech-udev-rules + thunderbird-latest emojify smile gnomeExtensions.smile-complementary-extension @@ -247,7 +248,9 @@ discord slack signal-desktop + onlyoffice-desktopeditors libreoffice + hyphenDicts.en_US plexamp carla wireplumber @@ -340,6 +343,7 @@ GI_TYPELIB_PATH = "/run/current-system/sw/lib/girepository-1.0"; BW_CLIENTID = "***REMOVED***"; BW_CLIENTSECRET = "***REMOVED***"; + NIXOS_OZONE_WL = "1"; }; stateVersion = "24.05"; @@ -372,6 +376,13 @@ msmtp.enable = true; emacs = { enable = true; + package = (pkgs.emacs.override { + withXwidgets = true; + withGTK3 = true; + withNativeCompilation = true; + withTreeSitter = true; + withImageMagick = true; + }); extraPackages = epkgs: [ epkgs.mu4e epkgs.vterm @@ -383,6 +394,7 @@ epkgs.nixpkgs-fmt epkgs.nixfmt epkgs.parinfer-rust-mode + epkgs.tree-sitter-langs ]; }; ripgrep = { @@ -457,11 +469,13 @@ lazygit.enable = true; jq.enable = true; firefox.enable = true; + # thunderbird = { + # enable = true; + # package = pkgs.thunderbird-latest; + # }; rbw.enable = true; }; - home.sessionVariables.NIXOS_OZONE_WL = "1"; - dconf.settings = { "org/gnome/desktop/background" = { picture-options = "none";