update

2 files changed, 93 insertions, 117 deletions

diff --git a/config/emacs/init.el b/config/emacs/init.el
index 3c40151..8e9a664 100644
--- a/config/emacs/init.el
+++ b/config/emacs/init.el
@@ -2,120 +2,72 @@
 (add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/") t)
 (package-initialize)
 (custom-set-variables
- '(package-selected-packages '(fzf kaolin-themes evil popper flycheck company lsp-mode cmake-mode nix-mode clang-format direnv magit evil-collection vue-mode typescript-mode haml-mode yaml-mode)))
+ '(package-selected-packages '(fzf kaolin-themes evil evil-collection popper corfu direnv magit ccls clang-format make-mode nix-mode vue-mode typescript-mode haml-mode yaml-mode)))
 
-(require 'direnv)
-(direnv-mode 1)
+(set-fontset-font t nil "UbuntuMono Nerd Font Mono" nil 'append)
 
-(setq lsp-completion-enable t)
-(setq company-idle-delay 0)
-(company-mode)
-(global-flycheck-mode 1)
-(add-hook 'python-mode-hook #'lsp-deferred)
-(add-hook 'c-mode-hook #'lsp-deferred)
-(add-hook 'c++-mode-hook #'lsp-deferred)
+(require 'kaolin-themes)
+(load-theme 'kaolin-dark t)
 
-(require 'popper)
-(setq popper-reference-buffers
-      '("\\*Messages\\*"
-        "Output\\*$"
-        "\\*Async Shell Command\\*"
-        "\\*Async-native-compile-log\\*"
-        "\\*lsp-log\\*"
-        help-mode))
-(popper-mode 1)
-(global-set-key (kbd "M-`") 'popper-toggle)
-(global-set-key (kbd "C-`") 'popper-cycle)
-(global-set-key (kbd "s-`") 'popper-toggle-type)
+(add-to-list 'load-path (concat user-emacs-directory "/modeline"))
+(require 'simple-modeline)
+(simple-modeline-mode)
 
-(setq-default tab-width 2)
-(setq-default indent-tabs-mode nil)
 (setq-default c-basic-offset 2)
+(setq-default cursor-type 'bar)
+(setq-default indent-tabs-mode nil)
+(setq-default tab-width 2)
 
-(setq evil-want-C-u-scroll t)
-(setq evil-undo-system 'undo-redo)
-(setq evil-emacs-state-modes nil)
-(setq evil-insert-state-modes nil)
-(setq evil-motion-state-modes nil)
-(setq evil-want-keybinding nil)
-(require 'evil)
-(evil-mode 1)
-
-(evil-collection-init)
-
-(global-set-key (kbd "M-<") 'tab-bar-switch-to-prev-tab)
-(global-set-key (kbd "M->") 'tab-bar-switch-to-next-tab)
-(global-set-key (kbd "M-t") 'tab-bar-new-tab)
-(global-set-key (kbd "M-w") 'tab-bar-close-tab)
-(setq tab-bar-close-button-show nil)
-(setq tab-bar-tab-hints t)
-(setq tab-bar-format '(tab-bar-format-tabs tab-bar-separator))
-
-(set-fontset-font t nil "UbuntuMono Nerd Font Mono" nil 'append)
-
-(setq make-backup-files nil)
 (setq auto-save-default nil)
 (setq compilation-scroll-output t)
-
-(setq-default cursor-type 'bar)
-
+(setq dired-listing-switches "-lah --group-directories-first")
+(setq dired-recursive-copies 'always)
+(setq dired-recursive-deletes 'always)
+(setq display-line-numbers-type 'relative)
+(setq make-backup-files nil)
+(setq ring-bell-function 'ignore)
+(setq scroll-margin 5)
 (setq scroll-step 1)
+(setq sentence-end-double-space nil)
+(setq tab-bar-close-button-show nil)
+(setq tab-bar-format '(tab-bar-format-tabs tab-bar-separator))
+(setq tab-bar-tab-hints t)
+
+(fset 'yes-or-no-p 'y-or-n-p)
 
-(menu-bar-mode -1)
-(tool-bar-mode -1)
-(scroll-bar-mode -1)
 (blink-cursor-mode -1)
+(delete-selection-mode 1)
 (global-goto-address-mode 1)
 (global-visual-line-mode 1)
-(delete-selection-mode 1)
+(menu-bar-mode -1)
 (save-place-mode 1)
-(setq scroll-margin 5)
-(setq display-line-numbers-type 'relative)
-
-(global-set-key (kbd "C-h") 'windmove-left)
-(global-set-key (kbd "C-j") 'windmove-down)
-(global-set-key (kbd "C-k") 'windmove-up)
-(global-set-key (kbd "C-l") 'windmove-right)
-
-(global-set-key (kbd "M--") 'split-window-below)
-(global-set-key (kbd "M-\\") 'split-window-right)
-(global-set-key (kbd "M-d") 'dired-jump)
-(global-set-key (kbd "M-]") 'next-buffer)
-(global-set-key (kbd "M-[") 'previous-buffer)
-(global-set-key (kbd "M-k") 'kill-buffer)
-(global-set-key (kbd "M-q") 'delete-window)
-(global-set-key (kbd "M-a") 'eshell)
-(global-set-key (kbd "M-c") 'comment-line)
-
-(global-set-key (kbd "M-RET") 'project-compile)
-
-(defun show-flycheck-errors (buffer _action)
-  (let ((window (display-buffer-in-side-window
-                 buffer '((side . bottom) (slot . 0) (window-height . 0.25) (window-width . 0.75)))))
-    (select-window window)
-    window))
-
-(defun show-buffers (buffer _action)
-  (let ((window (display-buffer-in-side-window
-                 buffer '((side . bottom) (slot . 1) (window-height . 0.25) (window-width . 0.25)))))
-    (select-window window)
-    window))
-
-(add-to-list 'display-buffer-alist
-		'("^\\*Flycheck errors\\*$" . (show-flycheck-errors)))
+(scroll-bar-mode -1)
+(tool-bar-mode -1)
 
-(add-to-list 'display-buffer-alist
-             '("^\\*Ibuffer\\*$" . (show-buffers)))
+(require 'direnv)
+(direnv-mode 1)
 
-(global-set-key (kbd "M-e") 'flycheck-list-errors)
-(global-set-key (kbd "M-z") 'ibuffer-list-buffers)
+(setq evil-emacs-state-modes nil)
+(setq evil-insert-state-modes nil)
+(setq evil-motion-state-modes nil)
+(setq evil-undo-system 'undo-redo)
+(setq evil-want-C-u-scroll t)
+(setq evil-want-keybinding nil)
+(require 'evil)
+(evil-mode 1)
+(evil-collection-init)
 
-(setq ibuffer-mode-hook '(ibuffer-auto-mode))
-(setq ibuffer-formats
-      '((mark modified read-only locked " "
-              (name 35 35 :left :elide))))
+(setq corfu-auto t)
+(global-corfu-mode)
 
-(fset 'yes-or-no-p 'y-or-n-p)
+(require 'popper)
+(setq popper-reference-buffers
+      '("\\*Messages\\*"
+        "Output\\*$"
+        "\\*Async Shell Command\\*"
+        "\\*Async-native-compile-log\\*"
+        help-mode))
+(popper-mode 1)
 
 (add-hook 'minibuffer-exit-hook
       #'(lambda ()
@@ -123,16 +75,6 @@
            (and (get-buffer buffer)
                 (kill-buffer buffer)))))
 
-(add-hook 'compilation-filter-hook 'ansi-color-compilation-filter)
-
-(setq dired-listing-switches "-lah --group-directories-first")
-(setq dired-recursive-copies 'always)
-(setq dired-recursive-deletes 'always)
-
-(setq sentence-end-double-space nil)
-
-(setq ring-bell-function 'ignore)
-
 (global-display-line-numbers-mode 1)
 
 (electric-pair-mode 1)
@@ -140,13 +82,6 @@
 (savehist-mode 1)
 (setq savehist-additional-variables '(kill-ring search-ring regexp-search-ring))
 
-(require 'kaolin-themes)
-(load-theme 'kaolin-dark t)
-
-(add-to-list 'load-path (concat user-emacs-directory "/modeline"))
-(require 'simple-modeline)
-(simple-modeline-mode)
-
 (require 'fzf)
 (setq fzf/args "-x --color bw --print-query --margin=1,0 --no-hscroll --no-unicode"
     fzf/executable "fzf"
@@ -155,8 +90,33 @@
     fzf/position-bottom t
     fzf/window-height 15)
 
-(global-set-key (kbd "C-SPC") 'fzf-git)
-(global-set-key (kbd "M-f") 'fzf-git-grep)
+(add-hook 'compilation-filter-hook 'ansi-color-compilation-filter)
 
 (add-hook 'c-mode-hook 'clang-format-on-save-mode)
 (add-hook 'c++-mode-hook 'clang-format-on-save-mode)
+
+(global-set-key (kbd "s-`") 'popper-toggle)
+(global-set-key (kbd "C-`") 'popper-cycle)
+(global-set-key (kbd "M-`") 'popper-toggle-type)
+
+(global-set-key (kbd "M-<") 'tab-bar-switch-to-prev-tab)
+(global-set-key (kbd "M->") 'tab-bar-switch-to-next-tab)
+(global-set-key (kbd "M-t") 'tab-bar-new-tab)
+(global-set-key (kbd "M-w") 'tab-bar-close-tab)
+
+(global-set-key (kbd "C-h") 'windmove-left)
+(global-set-key (kbd "C-j") 'windmove-down)
+(global-set-key (kbd "C-k") 'windmove-up)
+(global-set-key (kbd "C-l") 'windmove-right)
+
+(global-set-key (kbd "M--") 'split-window-below)
+(global-set-key (kbd "M-\\") 'split-window-right)
+(global-set-key (kbd "M-d") 'dired-jump)
+(global-set-key (kbd "M-]") 'next-buffer)
+(global-set-key (kbd "M-[") 'previous-buffer)
+(global-set-key (kbd "M-k") 'kill-buffer)
+(global-set-key (kbd "M-q") 'delete-window)
+(global-set-key (kbd "M-c") 'comment-line)
+(global-set-key (kbd "M-RET") 'project-compile)
+(global-set-key (kbd "C-SPC") 'fzf-git)
+(global-set-key (kbd "M-f") 'fzf-git-grep)
diff --git a/modules/laptop.nix b/modules/laptop.nix
index 39719ae..c6c1f70 100644
--- a/modules/laptop.nix
+++ b/modules/laptop.nix
@@ -1,7 +1,7 @@
 { pkgs, config, ... }:
 
 {
-  /* services.tlp = {
+  services.tlp = {
     enable = true;
     settings = {
       CPU_SCALING_GOVERNOR_ON_AC = "performance";
@@ -9,8 +9,24 @@
 
       CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
       CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
+
+      CPU_MIN_PERF_ON_AC = 40;
+      CPU_MAX_PERF_ON_AC = 100;
+      CPU_MIN_PERF_ON_BAT = 0;
+      CPU_MAX_PERF_ON_BAT = 30;
+
+      CPU_BOOST_ON_AC = 1;
+      CPU_BOOST_ON_BAT = 0;
+
+      CPU_HWP_DYN_BOOST_ON_AC = 1;
+      CPU_HWP_DYN_BOOST_ON_BAT = 0;
+
+      PLATFORM_PROFILE_ON_AC = "performance";
+      PLATFORM_PROFILE_ON_BAT = "low-power";
     };
-  }; */
+  };
+
+  services.power-profiles-daemon.enable = false;
 
   boot = {
     kernelModules = [ "acpi_call" ];