Skip to content

Commit

Permalink
update configs
Browse files Browse the repository at this point in the history
  • Loading branch information
luqmanishere committed May 5, 2024
1 parent 3dab5e6 commit 2209a9c
Show file tree
Hide file tree
Showing 9 changed files with 56 additions and 13 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.direnv
.devenv
/result
projectile-bookmarks.eld
recentf
1 change: 1 addition & 0 deletions home/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
self.homeModules.misc-gui

./editors/emacs
./editors/vscode.nix
];
};

Expand Down
6 changes: 6 additions & 0 deletions home/editors/emacs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,11 @@

services.emacs.enable = true;
services.emacs.package = emacs-pkg;

home.file = {
".emacs.d/init.el".source = ./init.el;
".emacs.d/early-init.el".source = ./early-init.el;
".emacs.d/lisp".source = ./lisp;
};
};
}
29 changes: 22 additions & 7 deletions home/editors/emacs/init.el
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
;;; Init --- SolemnAttic's Emacs config
;;; Commentary: These lines are here because flymake is complaining about them
;;; not being here
;;; -*- lexical-binding: t; -*-.
;; this opening portion is taken from centaur emacs
(when (version< emacs-version "27.1")
(error "Emacs 27.1 and above required!"))

;; delay the gc
;; delay the gc
(setq gc-cons-threshold most-positive-fixnum)

;; dont show the default mode line
Expand Down Expand Up @@ -42,7 +46,10 @@ Otherwise the startup will be very slow."

(update-load-path)
;; end of centaur emacs stuff in init
;; i dont need these warnings hahah
(setq custom-safe-themes t)

;; just Suppress these
(setq inhibit-startup-message t)

(scroll-bar-mode -1) ; Disable visible scrollbar
Expand All @@ -69,6 +76,8 @@ Otherwise the startup will be very slow."
;; Initialize package sources
(require 'package)

(setq package-user-dir "~/.emacs.d/packages")

(setq package-archives '(("melpa" . "https://melpa.org/packages/")
("org" . "https://orgmode.org/elpa/")
("elpa" . "https://elpa.gnu.org/packages/")))
Expand Down Expand Up @@ -236,6 +245,17 @@ Otherwise the startup will be very slow."
:config
(add-hook 'after-init-hook #'global-flycheck-mode))

(use-package centaur-tabs
:demand
:config
(centaur-tabs-mode t)
:bind
("C-c h". centaur-tabs-backward)
("C-c l" . centaur-tabs-forward))

(use-package tree-sitter)
(use-package tree-sitter-langs)

(require 'init-lsp)
(use-package rustic
:init
Expand All @@ -256,12 +276,7 @@ Otherwise the startup will be very slow."
'("8c7e832be864674c220f9a9361c851917a93f921fedb7717b1b5ece47690c098"
"e3daa8f18440301f3e54f2093fe15f4fe951986a8628e98dcd781efbec7a46f2"
default))
'(package-selected-packages
'(command-log-mode counsel dap-mode dashboard doom-modeline
doom-themes embark-consult flycheck helpful
ivy-rich key-chord lsp-mode lsp-ui marginalia
meow orderless projectile rainbow-delimiters
smartparens vertico which-key)))
'(package-selected-packages nil))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
Expand Down
6 changes: 4 additions & 2 deletions home/editors/emacs/lisp/init-keymaps.el
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
;;; lexical-binding: t
(defun meow-setup ()
"Setup meow binds"
"Setup meow binds."
(setq meow-cheatsheet-layout meow-cheatsheet-layout-qwerty)
(meow-motion-overwrite-define-key
'("j" . meow-next)
Expand Down Expand Up @@ -83,7 +84,7 @@
'("Y" . meow-sync-grab)
'("z" . meow-pop-selection)
'("'" . repeat)
'("<escape>" . ignore)))
'("<escape>" . ignore)))

(use-package meow
:config
Expand All @@ -100,3 +101,4 @@
(key-chord-define meow-insert-state-keymap "kj" 'meow-insert-exit))

(provide 'init-keymaps)
;;; init-keymaps.el ends here
7 changes: 6 additions & 1 deletion home/editors/emacs/lisp/init-lsp.el
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
;;; lexical-binding: t
(use-package lsp-mode
:init
;; set prefix for lsp-command-keymap (few alternatives - "C-l", "C-c l")
(setq lsp-keymap-prefix "C-c l")
:hook (;; replace XXX-mode with concrete major-mode(e. g. python-mode)
(XXX-mode . lsp)
(rustic-mode . lsp)
;; if you want which-key integration
(lsp-mode . lsp-enable-which-key-integration))
:init
(setq lsp-inlay-hint-enable t)
:config
(lsp-inlay-hints-mode)
:commands lsp)

;; optionally
Expand Down
8 changes: 8 additions & 0 deletions home/editors/vscode.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{pkgs, ...}: {
config = {
programs.vscode = {
enable = true;
package = pkgs.vscode;
};
};
}
4 changes: 3 additions & 1 deletion home/wayland-shell/hyprland/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ in {
"opaque, title:(muzik)"
"float, class:(ayaya-project-manager)"
"opaque, class:(ayaya-project-manager)"
"float, class:(Ayaya-project-manager)"
"opaque, class:(Ayaya-project-manager)"
"float, title:(Extension: (Raindrop.io) - Bookmark saved — Mozilla Firefox)"

"animation slide, class:(pavucontrol)"
Expand Down Expand Up @@ -216,7 +218,7 @@ in {
"SUPERSHIFT, N, exec, killall -SIGUSR1 waybar" # waybar hide

"SUPERSHIFT, L, exec, loginctl lock-session && sleep 5 && hyprctl dispatch dpms off"
"SUPERSHIFT, S, exec, ${lib.getExe pkgs.grim} -g ${lib.getExe pkgs.slurp} "
"SUPERSHIFT, S, exec, grim -g \"\$(${lib.getExe pkgs.slurp})\" "

# FIXME: WTH IS THIS?
"SUPER, T, exec, /home/luqman/scripts/autoclicktrigger.sh"
Expand Down
6 changes: 4 additions & 2 deletions systems/asuna/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,8 @@ in {
# TODO: refactor into own module
console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";

environment.sessionVariables.NIXOS_OZONE_WL = "1";

# TODO: wth do i do with this?
environment.systemPackages = with pkgs; [
wayland
Expand Down Expand Up @@ -270,8 +272,8 @@ in {
};

virtualisation = {
waydroid.enable = false;
lxd.enable = false;
waydroid.enable = true;
lxd.enable = true;
podman = {
enable = true;
defaultNetwork.settings.dns_enabled = true;
Expand Down

0 comments on commit 2209a9c

Please sign in to comment.