diff --git a/flake.lock b/flake.lock index c7d6d6b..db496cb 100644 --- a/flake.lock +++ b/flake.lock @@ -321,9 +321,7 @@ "emacs-overlay": "emacs-overlay", "flake-compat": "flake-compat", "flake-utils": "flake-utils_3", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay" }, "locked": { @@ -336,8 +334,8 @@ }, "original": { "owner": "emacs-ng", + "ref": "58fcf8c", "repo": "emacs-ng", - "rev": "58fcf8c19a1b93c91c06d4b885cfbff5ccf86982", "type": "github" } }, @@ -1295,6 +1293,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1707268954, + "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1722813957, "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", @@ -1309,7 +1323,7 @@ "type": "indirect" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1718428119, "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=", @@ -1325,7 +1339,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1714912032, "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", @@ -1654,7 +1668,7 @@ "nix-doom-emacs": "nix-doom-emacs", "nix-on-droid": "nix-on-droid", "nix-straight": "nix-straight", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable_2", "nwg-dock-hyprland-pin-nixpkgs": "nwg-dock-hyprland-pin-nixpkgs", "org-krita": "org-krita", @@ -1709,7 +1723,7 @@ }, "rust-overlay_2": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1723083652, @@ -1769,7 +1783,7 @@ "flake-compat": "flake-compat_3", "gnome-shell": "gnome-shell", "home-manager": "home-manager", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1722946882, diff --git a/flake.nix b/flake.nix index e250af1..c1486b4 100644 --- a/flake.nix +++ b/flake.nix @@ -246,8 +246,9 @@ hyprgrass.url = "github:horriblename/hyprgrass/0bb3b822053c813ab6f695c9194089ccb5186cc3"; hyprgrass.inputs.hyprland.follows = "hyprland"; - emacsng.url = "github:emacs-ng/emacs-ng/58fcf8c19a1b93c91c06d4b885cfbff5ccf86982"; - emacsng.inputs.nixpkgs.follows = "nixpkgs"; + # FIXME emacsng doesn't build or dumps core + #emacsng.url = "github:emacs-ng/emacs-ng/58fcf8c"; + #emacsng.inputs.nixpkgs.follows = "nixpkgs"; nix-doom-emacs.url = "github:nix-community/nix-doom-emacs"; nix-doom-emacs.inputs.nixpkgs.follows = "emacs-pin-nixpkgs"; diff --git a/profiles/work/home.nix b/profiles/work/home.nix index e9ef317..47e3a14 100644 --- a/profiles/work/home.nix +++ b/profiles/work/home.nix @@ -13,6 +13,7 @@ ../../user/shell/sh.nix # My zsh and bash config ../../user/shell/cli-collection.nix # Useful CLI apps ../../user/app/doom-emacs/doom.nix # My doom emacs config + #../../user/app/emacsng # Me experimenting with emacsng and a vanilla config ../../user/app/ranger/ranger.nix # My ranger file manager config ../../user/app/git/git.nix # My git config ../../user/app/keepass/keepass.nix # My password manager diff --git a/user/app/emacsng/default.nix b/user/app/emacsng/default.nix index 7cdaeb9..e2c4c61 100644 --- a/user/app/emacsng/default.nix +++ b/user/app/emacsng/default.nix @@ -2,6 +2,7 @@ { home.packages = [ - inputs.emacsng.${pkgs.system}.emacsngWRPgtk + inputs.emacsng.packages.${pkgs.system}.emacsngWRPgtk + pkgs.source-code-pro ]; }