Signed-off-by: Alex Stan <alex.stan.2010@proton.me>
This commit is contained in:
Alex Stan 2024-11-10 14:46:02 +02:00
parent 3c275c14bd
commit ae37b22a42
4 changed files with 18 additions and 9 deletions

View file

@ -57,10 +57,10 @@
niri = { niri = {
url = "github:sodiboo/niri-flake"; url = "github:sodiboo/niri-flake";
}; };
iceshrimp = { #iceshrimp = {
url = "git+https://iceshrimp.dev/iceshrimp/packaging"; # url = "git+https://iceshrimp.dev/iceshrimp/packaging";
inputs.nixpkgs.follows = "nixpkgs"; # inputs.nixpkgs.follows = "nixpkgs";
}; #};
}; };
outputs = { self, nixpkgs, home-manager, ... }@inputs: { outputs = { self, nixpkgs, home-manager, ... }@inputs: {

View file

@ -119,6 +119,7 @@ in {
"wheel" "wheel"
"libvirtd" "libvirtd"
"dialout" "dialout"
"input"
]; ];
packages = with pkgs; [ packages = with pkgs; [
# wezterm # wezterm
@ -164,7 +165,7 @@ in {
# wget # wget
gnomeExtensions.pop-shell gnomeExtensions.pop-shell
gnomeExtensions.blur-my-shell gnomeExtensions.blur-my-shell
gnomeExtensions.rounded-window-corners gnomeExtensions.rounded-window-corners-reborn
# gnomeExtensions.prime-indicator # gnomeExtensions.prime-indicator
gnomeExtensions.clipboard-indicator gnomeExtensions.clipboard-indicator
gnomeExtensions.gsconnect gnomeExtensions.gsconnect

View file

@ -48,6 +48,7 @@
(keymap-global-set "M-s M-b" #'consult-buffer) (keymap-global-set "M-s M-b" #'consult-buffer)
(keymap-global-set "M-s M-m" #'consult-man) (keymap-global-set "M-s M-m" #'consult-man)
(setq-default cursor-type 'bar)
(setq corfu-cycle t) (setq corfu-cycle t)
(setq corfu-auto t) (setq corfu-auto t)
@ -143,16 +144,20 @@
(require 'doom-themes) (require 'doom-themes)
(load-theme 'doom-tokyo-night) (load-theme 'doom-tokyo-night)
(use-package kakoune (use-package kakoune
:bind (("C-;" . ryo-modal-mode) ; :bind (("C-;" . ryo-modal-mode)
("C-z" . ryo-modal-mode) ; ("C-z" . ryo-modal-mode)
; ("<escape>" . ryo-modal-mode))
:bind (("C-z" . ryo-modal-mode)
("<escape>" . ryo-modal-mode)) ("<escape>" . ryo-modal-mode))
:hook (after-init . my/kakoune-setup) :hook (after-init . my/kakoune-setup)
:init (require 'bind-key)
:config :config
(defun ryo-enter () "Enter normal mode" (interactive) (ryo-modal-mode 1)) (defun ryo-enter () "Enter normal mode" (interactive) (ryo-modal-mode 1))
(defun my/kakoune-setup () (defun my/kakoune-setup ()
"Call kakoune-setup-keybinds then add some personal config." "Call kakoune-setup-keybinds then add some personal config."
(kakoune-setup-keybinds) (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) (add-hook 'prog-mode-hook #'ryo-enter)
(define-key ryo-modal-mode-map (kbd "SPC h") 'help-command) (define-key ryo-modal-mode-map (kbd "SPC h") 'help-command)
;; Access all C-x bindings easily ;; Access all C-x bindings easily
@ -167,6 +172,7 @@
("M-m" mc/edit-lines) ("M-m" mc/edit-lines)
("*" mc/mark-all-like-this) ("*" mc/mark-all-like-this)
("v" er/expand-region) ("v" er/expand-region)
("/" phi-search)
("C-v" set-rectangular-region-anchor) ("C-v" set-rectangular-region-anchor)
("M-s" mc/split-region) ("M-s" mc/split-region)
(";" (("q" delete-window) (";" (("q" delete-window)
@ -189,6 +195,7 @@
;; Emacs incremental search doesn't work with multiple cursors, but this fixes that ;; Emacs incremental search doesn't work with multiple cursors, but this fixes that
(use-package phi-search (use-package phi-search
:init (require 'bind-key)
:bind (("C-s" . phi-search) :bind (("C-s" . phi-search)
("C-r" . phi-search-backward))) ("C-r" . phi-search-backward)))

View file

@ -79,6 +79,7 @@ let
visual-regexp visual-regexp
phi-search phi-search
undo-tree undo-tree
counsel
]; ];
}); });
helix = inputs.helix.packages.${pkgs.system}.default; helix = inputs.helix.packages.${pkgs.system}.default;
@ -265,7 +266,7 @@ in {
f1viewer f1viewer
vlc vlc
wineWowPackages.wayland wineWowPackages.wayland
blender # blender
vesktop vesktop
ktailctl ktailctl
caddy caddy