From 002b44869bce58576bac14137ca972e4e1db50f4 Mon Sep 17 00:00:00 2001
From: Alex Stan <90788596+Ultra980@users.noreply.github.com>
Date: Thu, 7 Mar 2024 20:17:35 +0200
Subject: [PATCH] IT WORKSSSSSSSSSSSSS

Signed-off-by: Alex Stan <90788596+Ultra980@users.noreply.github.com>
---
 users/ultra/configs/emacs/init.el | 45 ++++++++++++++++++++++++++++---
 users/ultra/home.nix              | 12 +++++++--
 2 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/users/ultra/configs/emacs/init.el b/users/ultra/configs/emacs/init.el
index db607fa..77e38ec 100644
--- a/users/ultra/configs/emacs/init.el
+++ b/users/ultra/configs/emacs/init.el
@@ -1,15 +1,52 @@
-(setq standard-indent 2)
+(let ((indent 2))
+  (setq standard-indent indent)
+   (setq-default indent-tabs-mode nil)
+   (setq-default tab-width 2)
+   (setq c-basic-offset indent))
 (load (expand-file-name "~/.quicklisp/slime-helper.el"))
 (setq inferior-lisp-program "sbcl")
-(set-face-attribute 'default nil :height 120)
+(defun font-size-to-height (size) (* 10 size))
+(let ((font-size 14))
+  (set-face-attribute 'default nil :height (font-size-to-height font-size)))
 (setq mastodon-instance-url "https://shonk.phite.ro"
       mastodon-active-user "graphite")
 (evil-mode 1)
-(parinfer-rust-mode t)
+(add-hook 'lisp-mode 'parinfer-rust-mode)
 (require 'bshell)
 (add-hook 'eshell-load-hook #'eat-eshell-mode)
 (add-hook 'eshell-load-hook #'eat-eshell-visual-command-mode)
 ; (load (expand-file-name "~/.emacs.d/everblush-theme.el"))
 (load-theme 'uwu)
 (if (window-system)
-    (set-frame-size (80 20)))
+    (set-frame-size (selected-frame) 80 20))
+;; (add-hook 'c++-mode-hook 'irony-mode)
+;; (add-hook 'c-mode-hook 'irony-mode)
+;; (add-hook 'irony-mode-hook 'irony-cdb-autosetup-compile-options)
+(add-hook 'emacs-lisp-mode-hook 'parinfer-rust-mode)
+
+;(push 'hotfuzz completion-styles)
+
+(setq vertico-cycle nil)
+(setq vertico-resize t)
+;; (bind-key "C-j" vertico-next-group)
+;; (global-set-key (kbd "C-k") vertico-previous-group)
+;; (global-set-key (kbd "<tab>") vertico-insert)
+(vertico-mode)
+
+(savehist-mode)
+
+(marginalia-mode 1)
+
+
+;; (global-set-key (kbd "M-s M-g") consult-grep)
+;; (global-set-key (kbd "M-s M-f") consult-find)
+;; (global-set-key (kbd "M-s M-o") consult-outline)
+;; (global-set-key (kbd "M-s M-l") consult-line)
+;; (global-set-key (kbd "M-s M-b") consult-buffer)
+;; (global-set-key (kbd "M-s M-m") consult-man)
+
+
+(setq corfu-cycle t)
+(setq corfu-auto t)
+;(corfu-separator ?\s)
+(global-corfu-mode)
diff --git a/users/ultra/home.nix b/users/ultra/home.nix
index 22805eb..d28083f 100644
--- a/users/ultra/home.nix
+++ b/users/ultra/home.nix
@@ -28,13 +28,13 @@ let
       (setq inferior-lisp-program "sbcl")
       (set-face-attribute 'default nil :height 120)
     '';*/
-    extraEmacsPackages = epkgs: [
+    extraEmacsPackages = epkgs: with epkgs; [
       epkgs.use-package
       epkgs.nix-mode
       epkgs.slime
       epkgs.parinfer-rust-mode
       epkgs.sly
-      epkgs.spacemacs-theme
+      # epkgs.spacemacs-theme
       epkgs.paredit
       epkgs.evil
       epkgs.magit
@@ -45,6 +45,13 @@ let
       epkgs.eat
       epkgs.gruvbox-theme
       epkgs.uwu-theme
+      epkgs.irony
+      hotfuzz
+      vertico
+      marginalia
+      consult
+      corfu
+      bind-key
     ];
   });
   helix = inputs.helix.packages.${pkgs.system}.default;
@@ -234,6 +241,7 @@ in {
         floorp
         mpris-scrobbler
         sbcl
+        clang-tools
         #emacs-package
       ];
         file = {