diff --git a/config.el b/config.el index 28978ab..31b9c09 100644 --- a/config.el +++ b/config.el @@ -1,4 +1,4 @@ -; -*- lexical-binding: t -*- +;; -*- lexical-binding: t -*- (use-package emacs :init @@ -26,27 +26,24 @@ (scroll-bar-mode -1) :hook (prog-mode . display-line-numbers-mode)) -(use-package doom-modeline - :init - (doom-modeline-mode 1)) +(use-package mood-line + :hook (after-init . mood-line-mode)) (use-package helm :bind (("C-x C-f" . helm-find-files) ("M-x" . helm-M-x) ("M-s o" . helm-occur) ("C-h a" . helm-apropos)) - :init - (helm-mode 1)) - + :hook (after-init . helm-mode)) + (use-package savehist - :init - (savehist-mode 1)) + :hook (after-init . savehist-mode)) (use-package which-key - :init (which-key-mode 1)) + :hook (after-init . which-key-mode)) (use-package base16-theme - :init + :config (load-theme 'base16-everforest-dark-hard t)) (use-package nix-mode @@ -68,12 +65,12 @@ :mode "\\.hs\\'") (use-package python - :custom - (python-indent-offset 4)) + :config + (setq python-indent-offset 4)) (use-package cc-mode - :custom - (c-basic-offset 4)) + :config + (setq c-basic-offset 4)) (use-package vterm :preface diff --git a/flake.lock b/flake.lock index 05352ba..74cad55 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1732381887, - "narHash": "sha256-BN5xYNaROH5yE5KR5ZJfYte/Dl4G2schjkalmQoQq8s=", + "lastModified": 1741485571, + "narHash": "sha256-fpm1ZTfGfMG36c4G3HSwmbd09zU3egmM0dfgDxkT3h4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "61af138b0b7ffc19b1221b5d6d28f164a8c0d919", + "rev": "db37ae9cd947031ad83288dec514233ffd262ffd", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1741379970, + "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", "type": "github" }, "original": { @@ -39,16 +39,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1741332913, + "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "20755fa05115c84be00b04690630cb38f0a203ad", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -60,11 +60,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { diff --git a/lib.nix b/lib.nix index 00ab238..cc70185 100644 --- a/lib.nix +++ b/lib.nix @@ -29,7 +29,7 @@ inherit (epkgs) spacious-padding - doom-modeline + mood-line helm base16-theme nix-mode