diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 5d34b0e..c909585 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -78,6 +78,17 @@ # tree # ]; # }; + fonts.packages = with pkgs; [ + noto-fonts + noto-fonts-cjk + noto-fonts-emoji + liberation_ttf + fira-code + fira-code-symbols + mplus-outline-fonts.githubRelease + dina-font + (nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; }) + ]; nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "steam" "steam-original" @@ -123,6 +134,9 @@ # System76 Devices hardware.system76.enableAll = true; + services.auto-cpufreq.enable = true; + services.thermald.enable = true; + zramSwap = { enable = true; algorithm = "zstd"; diff --git a/hosts/default/home.nix b/hosts/default/home.nix index 16ac586..eda1037 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -11,6 +11,7 @@ # The home.packages option allows you to install Nix packages into your # environment. + home.packages = [ pkgs.cmake pkgs.contour @@ -33,8 +34,6 @@ pkgs.swww pkgs.thunderbird pkgs.tree - - (pkgs.nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; }) ]; # Home Manager is pretty good at managing dotfiles. The primary way to manage diff --git a/modules/old_configs/contour/contour.yml b/modules/old_configs/contour/contour.yml index b1b7aec..4a481b8 100644 --- a/modules/old_configs/contour/contour.yml +++ b/modules/old_configs/contour/contour.yml @@ -259,7 +259,7 @@ profiles: # Font related configuration (font face, styles, size, rendering mode). font: # Initial font size in pixels. - size: 14 + size: 16 # DPI scaling factor applied on top of the system configured on (default: 1.0). dpi_scale: 1.0 diff --git a/modules/old_configs/emacs/config.el b/modules/old_configs/emacs/config.el index 0f7eb3f..28c9bc0 100644 --- a/modules/old_configs/emacs/config.el +++ b/modules/old_configs/emacs/config.el @@ -164,8 +164,8 @@ "w K" '(evil-window-move-very-top :wk "Move split to top") "w L" '(evil-window-move-far-right :wk "Move split to right") "w c" '(evil-window-delete :wk "Close window") - "w o" '(delete-other-windows :wk "__") - "w =" '(balance-windows :wk "__") + "w o" '(delete-other-windows :wk "Delete other windows") + "w =" '(balance-windows :wk "Balance windows") "q k" '(kill-buffer-and-window :wk "Kill buf and window") "q q" '(save-buffers-kill-terminal :wk "Save bufs, kill term")) @@ -421,7 +421,7 @@ (use-package vterm :config -(setq shell-file-name "/bin/bash" +(setq shell-file-name "/run/current-system/sw/bin/bash" vterm-max-scrollback 5000)) (use-package vterm-toggle @@ -520,6 +520,7 @@ 'ivy-rich-switch-buffer-transformer)) (use-package zig-mode) +(use-package nix-mode) ;; (use-package jai-mode) (use-package rust-mode) (use-package cargo-mode) diff --git a/modules/old_configs/emacs/config.org b/modules/old_configs/emacs/config.org index 3aada4c..61d5a9a 100644 --- a/modules/old_configs/emacs/config.org +++ b/modules/old_configs/emacs/config.org @@ -225,8 +225,8 @@ "w K" '(evil-window-move-very-top :wk "Move split to top") "w L" '(evil-window-move-far-right :wk "Move split to right") "w c" '(evil-window-delete :wk "Close window") - "w o" '(delete-other-windows :wk "__") - "w =" '(balance-windows :wk "__") + "w o" '(delete-other-windows :wk "Delete other windows") + "w =" '(balance-windows :wk "Balance windows") "q k" '(kill-buffer-and-window :wk "Kill buf and window") "q q" '(save-buffers-kill-terminal :wk "Save bufs, kill term"))