diff --git a/flake.lock b/flake.lock index 7fae54f..fe65c3f 100644 --- a/flake.lock +++ b/flake.lock @@ -34,6 +34,28 @@ } }, "emacs-overlay": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1694687465, + "narHash": "sha256-rbAxvy9cIAsVb8Uc/oZdoR4W9C3dPPv10JRE06jU73E=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "4d65e731b6c3891445cdd80ad0c3c94f7955b039", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "emacs-overlay", + "type": "github" + } + }, + "emacs-overlay_2": { "flake": false, "locked": { "lastModified": 1676366521, @@ -182,6 +204,24 @@ "inputs": { "systems": "systems" }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -220,16 +260,15 @@ ] }, "locked": { - "lastModified": 1694465129, - "narHash": "sha256-8BQiuobMrCfCbGM7w6Snx+OBYdtTIm0+cGVaKwQ5BFg=", + "lastModified": 1694643239, + "narHash": "sha256-pv2k/5FvyirDE8g4TNehzwZ0T4UOMMmqWSQnM/luRtE=", "owner": "nix-community", "repo": "home-manager", - "rev": "9787dffff5d315c9593d3f9fb0f9bf2097e1b57b", + "rev": "d9b88b43524db1591fb3d9410a21428198d75d49", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", "repo": "home-manager", "type": "github" } @@ -238,7 +277,7 @@ "inputs": { "doom-emacs": "doom-emacs", "doom-snippets": "doom-snippets", - "emacs-overlay": "emacs-overlay", + "emacs-overlay": "emacs-overlay_2", "emacs-so-long": "emacs-so-long", "evil-escape": "evil-escape", "evil-markdown": "evil-markdown", @@ -246,7 +285,7 @@ "evil-quick-diff": "evil-quick-diff", "explain-pause-mode": "explain-pause-mode", "flake-compat": "flake-compat", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "format-all": "format-all", "nix-straight": "nix-straight", "nixpkgs": "nixpkgs", @@ -307,6 +346,22 @@ "type": "indirect" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1694499547, + "narHash": "sha256-R7xMz1Iia6JthWRHDn36s/E248WB1/je62ovC/dUVKI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e5f018cf150e29aac26c61dac0790ea023c46b24", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1694499547, @@ -453,6 +508,7 @@ }, "root": { "inputs": { + "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", "nix-doom-emacs": "nix-doom-emacs", "nixpkgs": "nixpkgs_2", @@ -506,6 +562,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "ts-fold": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 45c2660..0bdacea 100644 --- a/flake.nix +++ b/flake.nix @@ -10,12 +10,16 @@ url = "github:blitz/tuxedo-nixos"; }; home-manager = { - url = "github:nix-community/home-manager/release-23.05"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-doom-emacs = { url = "github:nix-community/nix-doom-emacs"; }; + emacs-overlay = { + url = "github:nix-community/emacs-overlay"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { @@ -24,6 +28,7 @@ nixpkgs, tuxedo-nixos, nix-doom-emacs, + emacs-overlay }: { nixosConfigurations = { nixos-pulse = nixpkgs.lib.nixosSystem { @@ -32,6 +37,7 @@ ./configuration.nix { _module.args.nix-doom-emacs-module = nix-doom-emacs.hmModule; + nixpkgs.pkgs = nixpkgs.legacyPackages.x86_64-linux.extend emacs-overlay.overlay; } ./home.nix home-manager.nixosModules.home-manager diff --git a/home.nix b/home.nix index 6437135..6d6d600 100644 --- a/home.nix +++ b/home.nix @@ -29,6 +29,7 @@ programs.doom-emacs = { enable = true; doomPrivateDir = ./doom.d; + emacsPackage = pkgs.emacs-unstable-pgtk; }; programs.fish.enable = true; @@ -53,6 +54,7 @@ atool alacritty bitwarden + binutils brave btop direnv @@ -61,6 +63,7 @@ neofetch kate rust-motd + (ripgrep.override {withPCRE2 = true;}) signal-desktop statix tailscale