From 7a1e9416d4961b9e5b535c8dc2a1b96a596adc29 Mon Sep 17 00:00:00 2001 From: Sakooooo <78461130+Sakooooo@users.noreply.github.com> Date: Tue, 26 Dec 2023 15:02:02 +0400 Subject: [PATCH] add it back again --- flake.nix | 10 ++--- modules/dev/editors/emacs/default.nix | 64 +++++++++++++-------------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/flake.nix b/flake.nix index 1b6fe5f6..a81bb6ab 100644 --- a/flake.nix +++ b/flake.nix @@ -21,10 +21,10 @@ url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - # emacs-overlay = { - # url = "github:nix-community/emacs-overlay"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; + emacs-overlay = { + url = "github:nix-community/emacs-overlay"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { @@ -33,7 +33,7 @@ home-manager, NixOS-WSL, sops-nix, - # emacs-overlay, + emacs-overlay, ... } @ inputs: let inherit (self) outputs; diff --git a/modules/dev/editors/emacs/default.nix b/modules/dev/editors/emacs/default.nix index 3978f670..78e43e94 100644 --- a/modules/dev/editors/emacs/default.nix +++ b/modules/dev/editors/emacs/default.nix @@ -16,39 +16,39 @@ in { }; config = mkIf cfg.enable { - # nixpkgs.overlays = [ - # inputs.emacs-overlay.overlay - # ]; - # # ues daemon - # services.emacs = { - # enable = cfg.daemon; - # install = true; - # # package = pkgs.emacs29-pgtk; - # package = pkgs.emacsWithPackagesFromUsePackage { - # config = ../../../../config/emacs/emacs.org; - # package = pkgs.emacs-pgtk; - # alwaysEnsure = true; - # alwaysTangle = true; - # extraEmacsPackages = epkgs: [ - # epkgs.use-package - # ]; - # }; - # }; - # users.users.sako.packages = with pkgs; [ - # # direnv - # direnv - # ]; + nixpkgs.overlays = [ + inputs.emacs-overlay.overlay + ]; + # ues daemon + services.emacs = { + enable = cfg.daemon; + install = true; + # package = pkgs.emacs29-pgtk; + package = pkgs.emacsWithPackagesFromUsePackage { + config = ../../../../config/emacs/emacs.org; + package = pkgs.emacs-pgtk; + alwaysEnsure = true; + alwaysTangle = true; + extraEmacsPackages = epkgs: [ + epkgs.use-package + ]; + }; + }; + users.users.sako.packages = with pkgs; [ + # direnv + direnv + ]; - # home-manager.users.sako = {lib, ...}: { - # home.file = { - # ".emacs.d/init.el".source = pkgs.runCommand "init.el" {} '' - # cp ${../../../../config/emacs/emacs.org} emacs.org - # ${pkgs.emacs}/bin/emacs -Q --batch ./emacs.org -f org-babel-tangle - # mv init.el $out - # ''; - # ".emacs.d/dashboard.png".source = ../../../../config/emacs/dashboard.png; - # }; - # }; + home-manager.users.sako = {lib, ...}: { + home.file = { + ".emacs.d/init.el".source = pkgs.runCommand "init.el" {} '' + cp ${../../../../config/emacs/emacs.org} emacs.org + ${pkgs.emacs}/bin/emacs -Q --batch ./emacs.org -f org-babel-tangle + mv init.el $out + ''; + ".emacs.d/dashboard.png".source = ../../../../config/emacs/dashboard.png; + }; + }; fonts.packages = with pkgs; [ (nerdfonts.override {fonts = ["JetBrainsMono"];})