From 43482d60ddabef56bd4959cdacb861af6f6debe7 Mon Sep 17 00:00:00 2001 From: Alex Stan Date: Mon, 26 Aug 2024 22:34:37 +0300 Subject: [PATCH] a lot of shit Signed-off-by: Alex Stan --- .gitignore | 1 + hosts/hermes/configuration.nix | 13 ++++++++----- users/ultra/configs/emacs/init.el | 26 ++++++++++++++++++++++---- users/ultra/home.nix | 30 +++++++++++++++++++++++++++--- 4 files changed, 58 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 26ddae5..80f3ccd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ hosts/titan/services/Sharkey/files hosts/titan/services/Sharkey/db hosts/titan/services/Sharkey/redis hosts/hypnos/services/Sharkey/* +users/ultra/#home.nix# diff --git a/hosts/hermes/configuration.nix b/hosts/hermes/configuration.nix index ebb813d..b1fa830 100644 --- a/hosts/hermes/configuration.nix +++ b/hosts/hermes/configuration.nix @@ -73,7 +73,7 @@ in { printing.enable = true; openssh.enable = true; guix = { - enable = true; + enable = false; stateDir = "/gnu/var"; gc = { enable = true; @@ -86,8 +86,6 @@ in { }; qt.platformTheme = lib.mkForce "gnome"; - # Enable sound with pipewire. - sound.enable = true; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { @@ -114,9 +112,9 @@ in { "dialout" ]; packages = with pkgs; [ - wezterm + # wezterm gradience - gnome.gnome-tweaks + gnome-tweaks alacritty dosbox newsflash @@ -126,6 +124,10 @@ in { floorp qFlipper remmina + arduino-ide + prusa-slicer + solaar + niri ]; shell = pkgs.zsh; ignoreShellProgramCheck = true; # I configured zsh with home-manager @@ -152,6 +154,7 @@ in { gnomeExtensions.clipboard-indicator gnomeExtensions.gsconnect gnomeExtensions.media-controls + gnomeExtensions.solaar-extension nerdfonts everblush bibata-cursors diff --git a/users/ultra/configs/emacs/init.el b/users/ultra/configs/emacs/init.el index 12f05f5..b3902f9 100644 --- a/users/ultra/configs/emacs/init.el +++ b/users/ultra/configs/emacs/init.el @@ -3,6 +3,7 @@ (setq-default indent-tabs-mode nil) (setq-default tab-width 2) (setq c-basic-offset indent)) +(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t) (load (expand-file-name "~/.quicklisp/slime-helper.el")) (setq inferior-lisp-program "sbcl") (defun font-size-to-height (size) (* 10 size)) @@ -18,7 +19,7 @@ ; (load (expand-file-name "~/.emacs.d/everblush-theme.el")) (load-theme 'uwu) (if (window-system) - (set-frame-size (selected-frame) 80 20)) + (set-frame-size (selected-frame) 1000 800)) ;; (add-hook 'c++-mode-hook 'irony-mode) ;; (add-hook 'c-mode-hook 'irony-mode) ;; (add-hook 'irony-mode-hook 'irony-cdb-autosetup-compile-options) @@ -26,7 +27,7 @@ ;(push 'hotfuzz completion-styles) -(setq vertico-cycle nil) +(setq vertico-cycle t) (setq vertico-resize t) (keymap-global-set "C-j" #'vertico-next-group) (keymap-global-set "C-k" #'vertico-previous-group) @@ -115,7 +116,24 @@ (add-hook 'prog-mode-hook 'rainbow-delimiters-mode) -(add-hook 'prog-mode-hoow 'rainbow-mode) +(add-hook 'prog-mode-hook 'rainbow-mode) (add-hook 'eshell-mode-hook #'esh-autosuggest-mode) -(define-key eshell-mode-map [remap eshell-pcomplete] 'helm-esh-pcomplete) +;(define-key eshell-mode-map [remap eshell-pcomplete] 'helm-esh-pcomplete) + + +(dashboard-setup-startup-hook) +(add-hook 'server-after-make-frame-hook #'dashboard-open) + +(add-hook 'prog-mode-hook #'sublimity-mode) + +(add-hook 'prog-mode-hook #'linum-relative-on) + +(add-hook 'prog-mode-hook #'display-line-numbers-mode) + +(setq completion-styles '(orderless basic) + completion-category-defaults nil + completion-category-overrides '((file (styles basic partial-completion)))) + +(setq pulsar-pulse t + pulsar-delay 0.055) diff --git a/users/ultra/home.nix b/users/ultra/home.nix index c58e6e9..f0fe247 100644 --- a/users/ultra/home.nix +++ b/users/ultra/home.nix @@ -66,6 +66,13 @@ let steam zone-sl helm + dashboard + helpful + sublimity + workgroups2 + linum-relative + pulsar + orderless ]; }); helix = inputs.helix.packages.${pkgs.system}.default; @@ -260,12 +267,14 @@ in { clang-tools #emacs-package dino - cinny-desktop + # cinny-desktop (inputs.nix-inst.packages.${pkgs.system}.default) dotnet-runtime_6 + # dotnet-runtime_8 tea thefuck playerctl + # nyxt ]; file = { "emacs.d/everblush-theme.el".source = ./configs/emacs/everblush-theme.el; @@ -312,7 +321,19 @@ in { }; oh-my-zsh = { enable = true; - plugins = [ "git" "thefuck" "history-substring-search" "fzf" ]; + plugins = [ + "git" + "thefuck" + "history-substring-search" + "fzf" + "npm" + "sudo" + "vscode" + "web-search" + "starship" + "git-auto-fetch" + "nmap" + ]; theme = "cloud"; }; history = { @@ -321,8 +342,11 @@ in { extended = true; }; initExtra = '' + zmodload zsh/complist + zstyle ':completion:*' menu yes select + bindkey -M menuselect '?' history-incremental-search-forward eval $(thefuck --alias) - eval $(starship init zsh) + export PATH="$PATH:$HOME/.local/bin" ''; zsh-abbr = { enable = true;