diff --git a/flake.nix b/flake.nix index bc9f4ad..fb71e7f 100644 --- a/flake.nix +++ b/flake.nix @@ -57,10 +57,10 @@ niri = { url = "github:sodiboo/niri-flake"; }; - iceshrimp = { - url = "git+https://iceshrimp.dev/iceshrimp/packaging"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + #iceshrimp = { + # url = "git+https://iceshrimp.dev/iceshrimp/packaging"; + # inputs.nixpkgs.follows = "nixpkgs"; + #}; }; outputs = { self, nixpkgs, home-manager, ... }@inputs: { diff --git a/hosts/hermes/configuration.nix b/hosts/hermes/configuration.nix index 992a00d..13844ee 100644 --- a/hosts/hermes/configuration.nix +++ b/hosts/hermes/configuration.nix @@ -119,6 +119,7 @@ in { "wheel" "libvirtd" "dialout" + "input" ]; packages = with pkgs; [ # wezterm @@ -164,7 +165,7 @@ in { # wget gnomeExtensions.pop-shell gnomeExtensions.blur-my-shell - gnomeExtensions.rounded-window-corners + gnomeExtensions.rounded-window-corners-reborn # gnomeExtensions.prime-indicator gnomeExtensions.clipboard-indicator gnomeExtensions.gsconnect diff --git a/users/ultra/configs/emacs/init.el b/users/ultra/configs/emacs/init.el index de3058e..bafdc78 100644 --- a/users/ultra/configs/emacs/init.el +++ b/users/ultra/configs/emacs/init.el @@ -48,6 +48,7 @@ (keymap-global-set "M-s M-b" #'consult-buffer) (keymap-global-set "M-s M-m" #'consult-man) +(setq-default cursor-type 'bar) (setq corfu-cycle t) (setq corfu-auto t) @@ -143,16 +144,20 @@ (require 'doom-themes) (load-theme 'doom-tokyo-night) (use-package kakoune - :bind (("C-;" . ryo-modal-mode) - ("C-z" . ryo-modal-mode) +; :bind (("C-;" . ryo-modal-mode) +; ("C-z" . ryo-modal-mode) + ; ("" . ryo-modal-mode)) + :bind (("C-z" . ryo-modal-mode) ("" . ryo-modal-mode)) :hook (after-init . my/kakoune-setup) + :init (require 'bind-key) :config (defun ryo-enter () "Enter normal mode" (interactive) (ryo-modal-mode 1)) (defun my/kakoune-setup () "Call kakoune-setup-keybinds then add some personal config." (kakoune-setup-keybinds) - (setq ryo-modal-cursor-type 'line) + (setq ryo-modal-cursor-type 'box) + (setq ryo-modal-cursor-color "#dadeff") (add-hook 'prog-mode-hook #'ryo-enter) (define-key ryo-modal-mode-map (kbd "SPC h") 'help-command) ;; Access all C-x bindings easily @@ -167,6 +172,7 @@ ("M-m" mc/edit-lines) ("*" mc/mark-all-like-this) ("v" er/expand-region) + ("/" phi-search) ("C-v" set-rectangular-region-anchor) ("M-s" mc/split-region) (";" (("q" delete-window) @@ -189,6 +195,7 @@ ;; Emacs incremental search doesn't work with multiple cursors, but this fixes that (use-package phi-search + :init (require 'bind-key) :bind (("C-s" . phi-search) ("C-r" . phi-search-backward))) diff --git a/users/ultra/home.nix b/users/ultra/home.nix index f96701e..1d2aada 100644 --- a/users/ultra/home.nix +++ b/users/ultra/home.nix @@ -79,6 +79,7 @@ let visual-regexp phi-search undo-tree + counsel ]; }); helix = inputs.helix.packages.${pkgs.system}.default; @@ -265,7 +266,7 @@ in { f1viewer vlc wineWowPackages.wayland - blender +# blender vesktop ktailctl caddy