diff --git a/configurations/home/materus/default.nix b/configurations/home/materus/default.nix index f3a021e..9f2e4b3 100644 --- a/configurations/home/materus/default.nix +++ b/configurations/home/materus/default.nix @@ -2,11 +2,14 @@ { home.username = "materus"; - home.packages = []; + home.packages = [ ]; programs.git.signing.key = lib.mkDefault "28D140BCA60B4FD1"; programs.git.userEmail = lib.mkDefault "materus@podkos.pl"; programs.git.userName = lib.mkDefault "materus"; + home.stateVersion = lib.mkDefault "23.05"; + home.homeDirectory = lib.mkDefault "/home/materus"; + programs.home-manager.enable = lib.mkDefault true; } diff --git a/configurations/host/materusPC/extraHome.nix b/configurations/host/materusPC/extraHome.nix index f182229..1acf90d 100644 --- a/configurations/host/materusPC/extraHome.nix +++ b/configurations/host/materusPC/extraHome.nix @@ -22,10 +22,10 @@ llvmpkgs.libllvm llvmpkgs.libllvm.dev - + gcc gdb - + nil cmake gnumake ninja diff --git a/configurations/profile/home/editor/emacs/default.nix b/configurations/profile/home/editor/emacs/default.nix index e392238..1f762c0 100644 --- a/configurations/profile/home/editor/emacs/default.nix +++ b/configurations/profile/home/editor/emacs/default.nix @@ -15,28 +15,30 @@ in enable = true; package = with pkgs; lib.mkDefault (if pkgs ? emacs-pgtk then emacs-pgtk else emacs29-gtk); extraPackages = epkgs: with epkgs; [ - evil - evil-numbers - evil-mc - evil-tex - evil-nerd-commenter - + elcord + persp-mode dashboard magit helm avy corfu - ivy vterm centaur-tabs + projectile + treemacs - treemacs-evil treemacs-nerd-icons + treemacs-perspective + treemacs-icons-dired + treemacs-magit + treemacs-projectile tree-edit - doom-modeline + vertico nerd-icons nerd-icons-completion - load-relative + perspective + minions + telephone-line lsp-mode d-mode @@ -44,7 +46,9 @@ in org markdown-mode json-mode - + nix-mode + + minimap moe-theme ]; extraConfig = '' diff --git a/extraFiles/config/emacs/config.el b/extraFiles/config/emacs/config.el index f93db5b..dbf5186 100644 --- a/extraFiles/config/emacs/config.el +++ b/extraFiles/config/emacs/config.el @@ -1,17 +1,20 @@ ;Graphical -;(when (display-graphic-p) -; -;) -(tool-bar-mode -1) +(when (display-graphic-p) + (set-frame-font "FiraCode Nerd Font" nil t) + (tool-bar-mode -1) +) + (load-theme 'moe-dark) (setq-default cursor-type '(bar . 1)) -(set-frame-font "FiraCode Nerd Font" nil t) (pixel-scroll-precision-mode 1) (setq pixel-scroll-precision-large-scroll-height 10.0) -(setq mouse-wheel-follow-mouse 't) - +(setq mouse-wheel-follow-mouse 't) +(setq scroll-step 1) +(setq mouse-drag-and-drop-region t) +(telephone-line-mode 1) +(minions-mode 1) ;Hide startup screen if started with file (defun startup-screen-advice (orig-fun &rest args) @@ -26,7 +29,7 @@ ;Enable dashboard (dashboard-setup-startup-hook) (when (daemonp) - (setq initial-buffer-choice (lambda () (get-buffer "*dashboard*"))) ; Show dashboard when emacs is running as daemon + (setq initial-buffer-choice (lambda () (get-buffer "*dashboard*"))) ; Show dashboard when emacs is running as daemon )