natto1784/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

home: update emacs and some other configs

Browse Source 
Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
This commit is contained in:
Amneesh Singh
2023-03-08 06:12:41 +05:30
parent 1626936630
commit 8c32c34bc7
11 changed files with 221 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
flake.lock generated
View File

@@ -22,11 +22,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1674359560, "lastModified": 1677523399,
"narHash": "sha256-gobqd75ujP/zFH6kSZNB3bA3YS4NMXWpZgMo1RAFEdk=", "narHash": "sha256-NdHq1p6ENj+cI2oB8sEttnJBzFgj1f9p4Xr3AcUOFWo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "184ae9c371a6251564e0b07391f7e9aaf310f002", "rev": "e489ac3f5f94c71b759c5b6bbde15be29d873b7c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -72,11 +72,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1673362319, "lastModified": 1675933616,
"narHash": "sha256-Pjp45Vnj7S/b3BRpZEVfdu8sqqA6nvVjvYu59okhOyI=", "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "82c16f1682cf50c01cb0280b38a1eed202b3fe9f", "rev": "47478a4a003e745402acf63be7f9a092d51b83d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -138,11 +138,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1674250603, "lastModified": 1677509389,
"narHash": "sha256-SBolFspxBHpW3hCCDNAFXUiO2mucmkVmf17UmSIK3Cs=", "narHash": "sha256-ry4dkSjIO0WuEbIDpTFV0W2iq2S26kWCv7EX2vKOWEI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "275ab728912006eecb549338a50f24f294a7cfb7", "rev": "ab7c8f4a8427bfcaf01a46bab974298cc27bc1f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -161,11 +161,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1674403405, "lastModified": 1677527262,
"narHash": "sha256-FPOER3tINOEI+oWQGeiWLkpCudVJC3V8wk5cvP9857s=", "narHash": "sha256-CjUQtuLsz3VkSbV1eM1UwcWzruNgvK8ekZrIUevH72o=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "cb98242ea7faff04dad3ae166aff7126184f17c5", "rev": "18229043fa85bdf96a9d829c1e61d0f524a1966a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -181,11 +181,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1672071700, "lastModified": 1677504916,
"narHash": "sha256-Z0pbBVtijv4xbL42rPzMoYFSOqALFRYDMN9iOumSEso=", "narHash": "sha256-lcmVUaGt+h2QVBSqW3sBPkaEPUHpDzivr7YoKbeI+7I=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "37c8121f98d76f57caa00dd7106877876e0d7483", "rev": "d5c0c94d61ac600687382b2e0959864d6fbc84b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -247,11 +247,11 @@
"utils": "utils_3" "utils": "utils_3"
}, },
"locked": { "locked": {
"lastModified": 1673620854, "lastModified": 1677433142,
"narHash": "sha256-kQruy/z1+82iq+7ySGdw6GScSXvILn91t/o+0tbRx9w=", "narHash": "sha256-351eG11Cl4CjKxRoiVvjWAD9nQWLlCxLlltcJWvXGa0=",
"owner": "nbfc-linux", "owner": "nbfc-linux",
"repo": "nbfc-linux", "repo": "nbfc-linux",
"rev": "c267469684d620e6055ec3382f247979704c90e9", "rev": "7954b30531593849fc3b11c760930baf891f5ad1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -270,11 +270,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1674285754, "lastModified": 1677463842,
"narHash": "sha256-7EKYM0Cdd0AOSQ4+lyLgLSTLOS4yRCgWqJfgMrOss/I=", "narHash": "sha256-MgUEDPza573qKV59nRqrykLblPKBZu+DAIUqg9Pl5wU=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "7ef5e363d360f86c5d8d403e90ed256f4de798ec", "rev": "2c9fbe34b20266ef5ab54f6ed14fb38eef60430d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -286,16 +286,14 @@
}, },
"nix-gaming": { "nix-gaming": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": "nixpkgs_2"
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1672665710, "lastModified": 1677507556,
"narHash": "sha256-kK9DB+J7zDSs5H0X0AxEn85VKROLKYnUbPijtZEPrYY=", "narHash": "sha256-ILX2jRfb8hNW/xNf2ZVvUX5B5yfAZFr1C5ky7hD/b4I=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "66c8cbbde08af5a7e87cd3aa4fb4725f20966db2", "rev": "d08381e6d37b008dad4a94e7b863ea0aef1eb223",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -338,11 +336,11 @@
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1672350804, "lastModified": 1675183161,
"narHash": "sha256-jo6zkiCabUBn3ObuKXHGqqORUMH27gYDIFFfLq5P4wg=", "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "677ed08a50931e38382dbef01cba08a8f7eac8f6", "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -355,11 +353,27 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1674236650, "lastModified": 1675614288,
"narHash": "sha256-B4GKL1YdJnII6DQNNJ4wDW1ySJVx2suB1h/v4Ql8J0Q=", "narHash": "sha256-i3Rc/ENnz62BcrSloeVmAyPicEh4WsrEEYR+INs9TYw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d25de6654a34d99dceb02e71e6db516b3b545be6",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1677413016,
"narHash": "sha256-dwvL0VK5iyxXPQzJOPzYmuVinh/R9hwRu7eYq6Bf6ag=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cfb43ad7b941d9c3606fb35d91228da7ebddbfc5", "rev": "84e33aea0f7a8375c92458c5b6cad75fa1dd561b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -369,7 +383,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1671983799, "lastModified": 1671983799,
"narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=", "narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=",
@@ -389,14 +403,14 @@
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"neovim-flake": "neovim-flake", "neovim-flake": "neovim-flake",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1674288814, "lastModified": 1677485761,
"narHash": "sha256-Mso2c8XcbMwL+r8BIuEU8WwVJiO6A0HVZHbRFQEd9og=", "narHash": "sha256-C04OWgNrCxPGUiT7Px/vZd42vfwRY6/EjHwHNUSHv7g=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "4e7c0bc2a80f67e300906d090546f91b4c4c44db", "rev": "aad4d8be05012055861b097b8019311fe62635bf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -415,11 +429,10 @@
"mailserver": "mailserver", "mailserver": "mailserver",
"nbfc": "nbfc", "nbfc": "nbfc",
"nix-gaming": "nix-gaming", "nix-gaming": "nix-gaming",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_3",
"nvim-overlay": "nvim-overlay", "nvim-overlay": "nvim-overlay",
"rust-overlay": "rust-overlay", "rust-overlay": "rust-overlay",
"stable": "stable", "stable": "stable"
"webcord": "webcord"
} }
}, },
"rust-overlay": { "rust-overlay": {
@@ -430,11 +443,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1674354556, "lastModified": 1677465082,
"narHash": "sha256-vUuhf6VTW2hIdBGgivUZiAVkzByHji8TsTQGwS8Wh+s=", "narHash": "sha256-b82PmPWkt0pAsxmc477Yowq1Ez1VyjA5wnxE+yoIOWg=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "a16fb5f08d16e33727c8303dabefd81f06cb64c7", "rev": "2924bfce2fadc1ded4a2b8cfce7f2fd4ef41c36f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -445,11 +458,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1674638707, "lastModified": 1677480869,
"narHash": "sha256-yGYxlb5jPAiuvzCZ4MQAfPqp8DxfgkFEoBzYPhQxX4Y=", "narHash": "sha256-JqSHh8zE2ztj185hYYYx7+ML9DVNjDVMinTDbYP/iq0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d278b8c3f6b9fd9604fd0b7ddb3bf29f1cbaea39", "rev": "02aa9854e20363b33932b5a9d4e87bc3c37ce820",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -504,31 +517,15 @@
"type": "github" "type": "github"
} }
}, },
"webcord": {
"locked": {
"lastModified": 1672958964,
"narHash": "sha256-3SB6mTMTiek1B1zie7oD3DWJWVqKDaB5znQ+Nz6jz/Y=",
"owner": "huantianad",
"repo": "nixpkgs",
"rev": "1d1ed8fbb244fe3d242ebd3d2ad4e647235719eb",
"type": "github"
},
"original": {
"owner": "huantianad",
"ref": "webcord",
"repo": "nixpkgs",
"type": "github"
}
},
"wlroots": { "wlroots": {
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1672824257, "lastModified": 1675374853,
"narHash": "sha256-SbYoZj57VlopTzI+OSW9jlgYxN1gI1KLg/s/HV+87eE=", "narHash": "sha256-BSrjNcddYWhFUMtjGwxiEXw67MYRaIHGvLn19Mvm1NE=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "5f264a7d6c8af27d41ff440c05262b022c055593", "rev": "677a3f2f8847ed2de49dd60868f9d9487a546f58",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {

6
flake.nix
View File

@@ -17,10 +17,7 @@
url = github:oxalica/rust-overlay; url = github:oxalica/rust-overlay;
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-gaming = { nix-gaming.url = github:fufexan/nix-gaming;
url = github:fufexan/nix-gaming;
inputs.nixpkgs.follows = "nixpkgs";
};
nbfc = { nbfc = {
url = github:nbfc-linux/nbfc-linux; url = github:nbfc-linux/nbfc-linux;
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@@ -38,7 +35,6 @@
url = github:hyprwm/contrib; url = github:hyprwm/contrib;
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
webcord.url = github:huantianad/nixpkgs/webcord;
}; };
outputs = inputs@{ self, ... }: outputs = inputs@{ self, ... }:

258
home/natto/config/emacs/config.org
View File

@@ -17,10 +17,11 @@
(tool-bar-mode 0) (tool-bar-mode 0)
(menu-bar-mode 0) (menu-bar-mode 0)
(fringe-mode 0) (fringe-mode 0)
;; (cua-mode 1)
(global-display-line-numbers-mode 1) (global-display-line-numbers-mode 1)
(xterm-mouse-mode 1) (xterm-mouse-mode 1)
(setq ring-bell-function 'ignore) (setq ring-bell-function 'ignore
gc-cons-threshold most-positive-fixnum
initial-major-mode 'fundamental-mode)
#+end_src #+end_src
** Setting some variables ** Setting some variables
@@ -49,6 +50,11 @@
(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/")) (add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/"))
(package-initialize) (package-initialize)
(require 'use-package) (require 'use-package)
(use-package benchmark-init
:ensure t
:config
;; To disable collection of benchmark data after init is done.
(add-hook 'after-init-hook 'benchmark-init/deactivate))
#+end_src #+end_src
** Visual packages ** Visual packages
@@ -143,30 +149,27 @@ To undo and redo easily like vi
#+end_src #+end_src
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package treemacs-evil) (use-package treemacs-evil :defer t)
(use-package treemacs-magit) (use-package treemacs-magit :defer t)
(use-package treemacs-projectile) (use-package treemacs-projectile :defer t)
(use-package treemacs-all-the-icons) (use-package treemacs-all-the-icons :defer t)
#+end_src #+end_src
** LSP ** LSP
*** Configure lsp-mode *** Configure lsp-mode
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package lsp-mode (use-package lsp-mode
:defer 0 :commands lsp)
:commands lsp
:custom
(lsp-rust-analyzer-server-display-inlay-hints t)
(lsp-rust-analyzer-display-chaining-hints t)
(lsp-rust-analyzer-display-closure-return-type-hints t))
#+end_src #+end_src
*** Configure lsp-ui *** Configure lsp-ui
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package lsp-ui (use-package lsp-ui
:defer 0
:init :init
(setq lsp-ui-doc-show-with-cursor t) (setq lsp-ui-doc-delay 1.0
lsp-ui-doc-show-with-mouse t
pgtk-wait-for-event-timeout nil
lsp-ui-doc-show-with-cursor t)
:config :config
(lsp-ui-peek-enable 1) (lsp-ui-peek-enable 1)
(lsp-ui-doc-enable 1)) (lsp-ui-doc-enable 1))
@@ -175,7 +178,6 @@ To undo and redo easily like vi
*** Language specific LSP packages *** Language specific LSP packages
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package lsp-haskell) (use-package lsp-haskell)
(use-package lsp-grammarly)
#+end_src #+end_src
*** Configure flycheck *** Configure flycheck
@@ -193,11 +195,11 @@ To undo and redo easily like vi
For autocomplete For autocomplete
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package company (use-package company
:defer 0
:after lsp-mode :after lsp-mode
:config :config
(add-to-list 'company-backends 'company-dabbrev) (add-to-list 'company-backends 'company-dabbrev)
(setq company-backends (cons 'company-files (remove 'company-files company-backends))) (setq company-backends (cons 'company-files (remove 'company-files company-backends)))
(add-to-list 'company-backends 'company-emoji)
(company-mode 1)) (company-mode 1))
#+end_src #+end_src
@@ -207,14 +209,20 @@ For autocomplete
:hook (company-mode . company-quickhelp-mode)) :hook (company-mode . company-quickhelp-mode))
#+end_src #+end_src
*** Extra company packages
#+begin_src emacs-lisp
(use-package company-emoji)
#+end_src
** Treesitter ** Treesitter
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package tree-sitter-langs) (use-package tree-sitter-langs :defer t)
(use-package tree-sitter (use-package tree-sitter
:after tree-sitter-langs :after tree-sitter-langs
:defer t
:config :config
(global-tree-sitter-mode) (global-tree-sitter-mode)
:init :init
(add-to-list 'tree-sitter-major-mode-language-alist '(fundamental-mode . bash)) (add-to-list 'tree-sitter-major-mode-language-alist '(fundamental-mode . bash))
(add-hook 'tree-sitter-after-on-hook #'tree-sitter-hl-mode)) (add-hook 'tree-sitter-after-on-hook #'tree-sitter-hl-mode))
#+end_src #+end_src
@@ -222,38 +230,30 @@ For autocomplete
** Direnv ** Direnv
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package direnv (use-package direnv
:defer t
:config :config
(direnv-mode)) (direnv-mode))
#+end_src #+end_src
** Lang support ** Lang support
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package inform7)
(use-package haskell-mode) (use-package haskell-mode)
(use-package lsp-latex) (use-package lsp-latex)
(use-package rustic) (use-package rustic)
(use-package yuck-mode) (use-package yuck-mode)
(use-package wgsl-mode) (use-package wgsl-mode)
(use-package nix-mode (use-package nix-mode
:mode "\\.nix\\'") :mode "\\.nix\\'")
(use-package hcl-mode (use-package hcl-mode
:mode :mode
"\\.hcl\\'" "\\.hcl\\'"
"\\.nomad\\'") "\\.nomad\\'")
(use-package go-mode) (use-package go-mode)
#+end_src #+end_src
** Magit ** Magit
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package magit) (use-package magit :defer t)
#+end_src #+end_src
* VTerm * VTerm
@@ -266,6 +266,7 @@ For autocomplete
(setq vterm-timer-delay 0.005)) (setq vterm-timer-delay 0.005))
(use-package vterm-toggle (use-package vterm-toggle
:after vterm
:config :config
(setq vterm-toggle-fullscreen-p nil) (setq vterm-toggle-fullscreen-p nil)
(add-to-list 'display-buffer-alist (add-to-list 'display-buffer-alist
@@ -283,28 +284,32 @@ For autocomplete
** Centaur Tabs ** Centaur Tabs
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package centaur-tabs (use-package centaur-tabs
:demand
:config :config
(setq centaur-tabs-style "rounded" (setq centaur-tabs-style "rounded"
centaur-tabs-height 18 centaur-tabs-height 18
centaur-tabs-set-modified-marker t centaur-tabs-set-modified-marker t
centaur-tabs-set-icons t) centaur-tabs-set-icons t)
(centaur-tabs-group-by-projectile-project) (centaur-tabs-group-by-projectile-project)
(centaur-tabs-headline-match)
(centaur-tabs-mode nil) (centaur-tabs-mode nil)
(set-face-attribute 'tab-line nil :inherit 'centaur-tabs-unselected)) (set-face-attribute 'tab-line nil :inherit 'centaur-tabs-unselected)
(centaur-tabs-headline-match))
#+end_src #+end_src
** Misc packages ** Misc packages
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package elcord (use-package all-the-icons
:defer 0) :if (display-graphic-p))
(use-package elcord :defer t)
(use-package projectile (use-package projectile
:defer t
:config :config
(define-key projectile-mode-map (kbd "C-x p") 'projectile-command-map) (define-key projectile-mode-map (kbd "C-x p") 'projectile-command-map)
(projectile-mode +1)) (projectile-mode +1))
(use-package rainbow-mode :defer t)
(use-package rainbow-delimiters (use-package rainbow-delimiters
:hook (prog-mode . rainbow-delimiters-mode)) :hook (prog-mode . rainbow-delimiters-mode))
@@ -316,6 +321,7 @@ For autocomplete
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package org (use-package org
:after evil :after evil
:defer t
:config :config
(setq evil-want-C-i-jump nil (setq evil-want-C-i-jump nil
org-adapt-indentation t org-adapt-indentation t
@@ -330,13 +336,14 @@ For autocomplete
** Add org-bullets ** Add org-bullets
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package org-bullets (use-package org-bullets
:config :defer t
(add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))) :config
(add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))))
#+end_src #+end_src
** Babel and exports ** Babel and exports
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package htmlize) (use-package htmlize :defer t)
(add-to-list 'org-latex-packages-alist '("" "minted")) (add-to-list 'org-latex-packages-alist '("" "minted"))
(setq org-latex-listings 'minted) (setq org-latex-listings 'minted)
@@ -367,78 +374,13 @@ For autocomplete
#+end_src #+end_src
* Random eye candy stuff * Random eye candy stuff
** Ligature
#+begin_src emacs-lisp
(use-package ligature
:config
(ligature-set-ligatures 't '("www"))
(ligature-set-ligatures 'prog-mode '("www" "**" "***" "**/" "*>" "*/" "\\\\" "\\\\\\" "{-" "::"
":::" ":=" "!!" "!=" "!==" "-}" "----" "-->" "->" "->>"
"-<" "-<<" "-~" "#{" "#[" "##" "###" "####" "#(" "#?" "#_"
"#_(" ".-" ".=" ".." "..<" "..." "?=" "??" ";;" "/*" "/**"
"/=" "/==" "/>" "//" "///" "&&" "||" "||=" "|=" "|>" "^=" "$>"
"++" "+++" "+>" "=:=" "==" "===" "==>" "=>" "=>>" "<="
"=<<" "=/=" ">-" ">=" ">=>" ">>" ">>-" ">>=" ">>>" "<*"
"<*>" "<|" "<|>" "<$" "<$>" "<!--" "<-" "<--" "<->" "<+"
"<+>" "<=" "<==" "<=>" "<=<" "<>" "<<" "<<-" "<<=" "<<<"
"<~" "<~~" "</" "</>" "~@" "~-" "~>" "~~" "~~>" "%%"))
(global-ligature-mode t))
#+end_src
* Custom mode line * Custom mode line
switched to doom modeline after using my own modeline for a while
#+begin_src emacs-lisp #+begin_src emacs-lisp
(defface mode-line-buf-name (use-package doom-modeline
`((t :foreground ,(catppuccin-get-color 'text) :ensure t
:background ,(catppuccin-get-color 'base) :hook (after-init . doom-modeline-mode))
:weight bold
))
"Custom face for buffer name"
:group 'mode-line-faces )
(defface mode-line-maj-mode
`((t :foreground ,(catppuccin-get-color 'text)
:background ,(catppuccin-get-color 'base)
))
"Custom face for major mode"
:group 'mode-line-faces )
(defface mode-line-vc
`((t :foreground ,(catppuccin-get-color 'base)
:background ,(catppuccin-get-color 'sky)
:weight bold
))
"Custom face for VC"
:group 'mode-line-faces )
(defface mode-line-info
`((t :foreground ,(catppuccin-get-color 'base)
:background ,(catppuccin-get-color 'green)
:weight bold
))
"For showing line and column number"
:group 'mode-line-faces )
(setq-default mode-line-format
'((:propertize " %b " face mode-line-buf-name)
(vc-mode (:propertize ("" vc-mode " " ) face mode-line-vc))
(:propertize (" " mode-name " ") face mode-line-maj-mode)
(:propertize (" [[ %l | %c || %p . %+%@ ]] ") face mode-line-info)))
(setq exclude-ln '(term-mode-hook eshell-mode-hook shell-mode-hook))
(while exclude-ln
(add-hook (car exclude-ln) (lambda () (display-line-numbers-mode 0)))
(setq exclude-ln (cdr exclude-ln)))
(let ((default-color (cons (face-background 'mode-line)
(face-foreground 'mode-line))))
(add-hook 'post-command-hook
(lambda ()
(let ((color (cond ((minibufferp) default-color)
((evil-insert-state-p) (cons (catppuccin-get-color 'mauve) (catppuccin-get-color 'base)))
((evil-normal-state-p) (cons (catppuccin-get-color 'yellow) (catppuccin-get-color 'base)))
((evil-visual-state-p) (cons (catppuccin-get-color 'teal) (catppuccin-get-color 'base)))
((buffer-modified-p) (cons (catppuccin-get-color 'red) (catppuccin-get-color 'text)))
(t default-color))))
(set-face-background 'mode-line-buf-name (car color))
(set-face-foreground 'mode-line-buf-name (cdr color))))))
#+end_src #+end_src
* Pop-up terminal * Pop-up terminal
@@ -467,7 +409,7 @@ Stolen from [[https://www.reddit.com/r/emacs/comments/ft84xy/run_shell_command_i
(vterm-send-return))) (vterm-send-return)))
#+end_src #+end_src
This returns the command to run in the terminal Compilation shortcuts for standalone files
#+begin_src emacs-lisp #+begin_src emacs-lisp
(defun candrun () (defun candrun ()
(let ((full buffer-file-name) (let ((full buffer-file-name)
@@ -480,8 +422,8 @@ This returns the command to run in the terminal
("hs" (concat "runhaskell " full)) ("hs" (concat "runhaskell " full))
("sh" (concat "sh " full)) ("sh" (concat "sh " full))
("js" (concat "node " full)) ("js" (concat "node " full))
("ts" (concat "tsc" full " && node " file ".js && rm " file ".js" )) ("ts" (concat "tsc " full " && node " file ".js && rm " file ".js" ))
("rs" (concat "rustc" full " -o " file " && " file " && rm " file))))) ("rs" (concat "rustc " full " -o " file " && " file " && rm " file)))))
#+end_src #+end_src
* Custom Functions * Custom Functions
@@ -512,68 +454,50 @@ This returns the command to run in the terminal
'(visual normal motion)) '(visual normal motion))
(with-eval-after-load 'general (with-eval-after-load 'general
(general-define-key (general-define-key
:states evil-states :states evil-states
"M-c" 'comment-line "M-c" 'comment-line
"C-c M-c" 'comment-box) "C-c M-c" 'comment-box)
(general-define-key (general-define-key
:states '(normal insert) :states '(normal insert)
"M-C-f" 'lsp-format-buffer "M-C-f" 'lsp-format-buffer
"C-S-v" 'yank) "C-S-v" 'yank)
(general-define-key (general-define-key
:keymaps '(global override vterm-mode-map) :keymaps '(global override vterm-mode-map)
:states evil-states :states evil-states
"M-o" 'treemacs "M-o" 'treemacs
"M-v" 'split-window-vertically "M-v" 'split-window-vertically
"M-h" 'split-window-horizontally "M-h" 'split-window-horizontally
"M-m" 'windmove-left "M-m" 'windmove-left
"M-n" 'windmove-down "M-n" 'windmove-down
"M-e" 'windmove-up "M-e" 'windmove-up
"M-i" 'windmove-right "M-i" 'windmove-right
"M-C-m" 'shrink-window-horizontally "M-C-m" 'shrink-window-horizontally
"M-C-i" 'enlarge-window-horizontally "M-C-i" 'enlarge-window-horizontally
"M-C-e" 'shrink-window "M-C-e" 'shrink-window
"M-C-n" 'enlarge-window "M-C-n" 'enlarge-window
"M-," 'centaur-tabs-backward "M-," 'centaur-tabs-backward
"M-." 'centaur-tabs-forward "M-." 'centaur-tabs-forward
"C-q" 'delete-window "C-q" 'delete-window
"M-C-S-q" 'kill-buffer-and-window "M-C-S-q" 'kill-buffer-and-window
"M-w" 'centaur-tabs--kill-this-buffer-dont-ask "M-w" 'centaur-tabs--kill-this-buffer-dont-ask
"M-S-w" 'kill-window) "M-S-w" 'kill-window)
#+end_src #+end_src
*** Pop-up terminal specific keybinds *** Pop-up terminal specific keybinds
#+begin_src emacs-lisp #+begin_src emacs-lisp
(with-eval-after-load 'vterm-toggle (with-eval-after-load 'vterm-toggle
(general-define-key (general-define-key
:keymaps '(global override vterm-mode-map) :keymaps '(global override vterm-mode-map)
:states evil-states :states evil-states
"<f4>" (lambda () (interactive) (vterm t)) "<f4>" (lambda () (interactive) (vterm t))
"C-<f1>" 'vterm-toggle-cd "C-<f1>" 'vterm-toggle-cd
"<f1>" 'vterm-toggle "<f1>" 'vterm-toggle
"<f5>" (lambda () (interactive) (run-in-vterm (candrun)))) "<f5>" (lambda () (interactive) (run-in-vterm (candrun))))
(general-define-key (general-define-key
:keymaps 'vterm-mode-map :keymaps 'vterm-mode-map
"<f2>" 'vterm-toggle-forward "<f2>" 'vterm-toggle-forward
"<f3>" 'vterm-toggle-backward)) "<f3>" 'vterm-toggle-backward)))
#+end_src
*** Toggle Appearance
#+begin_src emacs-lisp
(defun toggle-theme-shade ()
(if (symbol-value dark-theme)
(progn (setq catppuccin-flavor 'latte)
(catppuccin-reload))
(progn (setq catppuccin-flavor 'mocha)
(catppuccin-reload)))
(setq-local dark-theme (not dark-theme))
(centaur-tabs-display-update)
(centaur-tabs-headline-match))
(general-define-key
:states '(normal)
"<f7>" (lambda () (interactive) (toggle-theme-shade)))
)
#+end_src #+end_src

14
home/natto/config/hypr/hyprland.conf
View File

@@ -1,4 +1,7 @@
monitor=,preferred,auto,1 monitor=eDP-1, preferred, auto, 1, bitdepth, 10
monitor=HDMI-A-1, preferred, auto, 1
workspace=eDP-1, 1
workspace=HDMI-A-1, 10
input { input {
kb_layout = us kb_layout = us
@@ -11,6 +14,7 @@ input {
touchpad { touchpad {
natural_scroll = yes natural_scroll = yes
scroll_factor = 0.4
} }
repeat_delay = 300 repeat_delay = 300
@@ -31,7 +35,7 @@ general {
decoration { decoration {
rounding = 1 rounding = 1
blur = yes blur = yes
blur_size = 6 blur_size = 5
blur_passes = 1 blur_passes = 1
blur_new_optimizations = on blur_new_optimizations = on
blur_xray = yes blur_xray = yes
@@ -156,4 +160,10 @@ bind=$mainMod SHIFT, 8, movetoworkspacesilent, 8
bind=$mainMod SHIFT, 9, movetoworkspacesilent, 9 bind=$mainMod SHIFT, 9, movetoworkspacesilent, 9
bind=$mainMod SHIFT, 0, movetoworkspacesilent, 10 bind=$mainMod SHIFT, 0, movetoworkspacesilent, 10
bind=$mainMod SHIFT, comma, focusmonitor, -1
bind=$mainMod SHIFT, period, focusmonitor, +1
bind=CTRL ALT, r, pass, ^(com\.obsproject\.Studio)$
exec-once=eww open bar exec-once=eww open bar
exec-once=swaybg -i ~/Wallpapers/current.*

12
home/natto/emacs.nix
View File

@@ -3,13 +3,23 @@ let
mymacs = config: # with inputs.emacs-overlay.packages.${pkgs.system}; already resolved with overlay mymacs = config: # with inputs.emacs-overlay.packages.${pkgs.system}; already resolved with overlay
with pkgs; emacsWithPackagesFromUsePackage { with pkgs; emacsWithPackagesFromUsePackage {
inherit config; inherit config;
package = emacsPgtk; package = emacsPgtkGcc;
alwaysEnsure = true; alwaysEnsure = true;
alwaysTangle = true; alwaysTangle = true;
extraEmacsPackages = epkgs: with epkgs; [ extraEmacsPackages = epkgs: with epkgs; [
use-package use-package
(epkgs.tree-sitter-langs.withPlugins (_: epkgs.tree-sitter-langs.plugins)) (epkgs.tree-sitter-langs.withPlugins (_: epkgs.tree-sitter-langs.plugins))
]; ];
override = epkgs: epkgs // {
catppuccin-theme = epkgs.melpaPackages.catppuccin-theme.overrideAttrs (_: {
src = pkgs.fetchFromGitHub {
owner = "natto1784";
repo = "catppuccin-emacs";
rev = "company";
sha256 = "sha256-wI+RiOeRrvV5eXXVs6hBb3x9BMD9HgHmsjom7kzAFJg=";
};
});
};
}; };
in in
{ {

7
home/natto/email.nix
View File

@@ -2,14 +2,15 @@
let let
key = "53EC089EF230E47A83BA8F8195949BD4B853F559"; key = "53EC089EF230E47A83BA8F8195949BD4B853F559";
host = "mail.weirdnatto.in"; host = "mail.weirdnatto.in";
realName = "Amneesh Singh";
address = "natto@weirdnatto.in";
in in
{ {
accounts.email = { accounts.email = {
accounts = { accounts = {
natto = rec { natto = rec {
realName = "Amneesh Singh"; inherit address realName;
primary = true; primary = true;
address = "natto@weirdnatto.in";
userName = address; userName = address;
gpg = { gpg = {
inherit key; inherit key;
@@ -61,7 +62,7 @@ in
}; };
}; };
home = { home = {
packages = with pkgs; [ mailcap ]; packages = with pkgs; [ mailcap w3m ];
file = { file = {
mailcap = { mailcap = {
source = ./config/mailcap; source = ./config/mailcap;

33
home/natto/eww/bar/bar.scss
View File

@@ -1,33 +1,3 @@
$rosewater: #F5E0DC;
$flamingo: #F2CDCD;
$pink: #F5C2E7;
$mauve: #CBA6F7;
$red: #F38BA8;
$maroon: #EBA0AC;
$peach: #FAB387;
$yellow: #F9E2AF;
$green: #A6E3A1;
$teal: #94E2D5;
$sky: #89DCEB;
$sapphire: #74C7EC;
$blue: #89B4FA;
$lavender: #B4BEFE;
$text: #CDD6F4;
$subtext1: #BAC2DE;
$subtext0: #A6ADC8;
$overlay2: #9399B2;
$overlay1: #7F849C;
$overlay0: #6C7086;
$surface2: #585B70;
$surface1: #45475A;
$surface0: #313244;
$base: #1E1E2E;
$mantle: #181825;
$crust: #11111B;
$background: $base;
$foreground: $text;
* { * {
all: unset; all: unset;
} }
@@ -78,6 +48,7 @@ tooltip {
.workspace-active { .workspace-active {
@include color-shadow($mauve, $on-hover: 0); @include color-shadow($mauve, $on-hover: 0);
font-size: 20px; font-size: 20px;
font-weight: bold;
} }
.workspace-inactive { .workspace-inactive {
@@ -106,7 +77,7 @@ tooltip {
.music-large { .music-large {
border: solid 3px $sapphire; border: solid 3px $sapphire;
color: $mauve; color: $mauve;
border-radius: 5px; border-radius: 8px;
.music-large-cover { .music-large-cover {
background-size: cover; background-size: cover;

2
home/natto/eww/bar/music.yuck
View File

@@ -85,7 +85,7 @@
:monitor 0 :monitor 0
:geometry (geometry :geometry (geometry
:x "0%" :x "0%"
:y "20px" :y "10px"
:width "0%" :width "0%"
:height "0%" :height "0%"
:anchor "top center") :anchor "top center")

30
home/natto/eww/eww.scss
View File

@@ -1 +1,31 @@
$rosewater: #F5E0DC;
$flamingo: #F2CDCD;
$pink: #F5C2E7;
$mauve: #CBA6F7;
$red: #F38BA8;
$maroon: #EBA0AC;
$peach: #FAB387;
$yellow: #F9E2AF;
$green: #A6E3A1;
$teal: #94E2D5;
$sky: #89DCEB;
$sapphire: #74C7EC;
$blue: #89B4FA;
$lavender: #B4BEFE;
$text: #CDD6F4;
$subtext1: #BAC2DE;
$subtext0: #A6ADC8;
$overlay2: #9399B2;
$overlay1: #7F849C;
$overlay0: #6C7086;
$surface2: #585B70;
$surface1: #45475A;
$surface0: #313244;
$base: #1E1E2E;
$mantle: #181825;
$crust: #11111B;
$background: $base;
$foreground: $text;
@import "bar/bar.scss" @import "bar/bar.scss"

8
home/natto/pkgs.nix
View File

@@ -25,12 +25,13 @@
powertop powertop
cachix cachix
undervolt undervolt
w3m
# GUI utils # GUI utils
(discord.override { (discord.override {
nss = nss_latest; nss = nss_latest;
}) })
inputs.webcord.legacyPackages.${pkgs.system}.webcord webcord
(xfce.thunar.override { (xfce.thunar.override {
thunarPlugins = with xfce; [ thunarPlugins = with xfce; [
thunar-media-tags-plugin thunar-media-tags-plugin
@@ -51,9 +52,10 @@
# Wine and games and stuff # Wine and games and stuff
steam steam
winetricks winetricks
# (inputs.nix-gaming.packages.${pkgs.system}.osu-stable) lutris
(flake.packages.${pkgs.system}.tlauncher) flake.packages.${pkgs.system}.tlauncher
mangohud mangohud
inputs.nix-gaming.packages.${pkgs.system}.osu-stable
# Programming and dev stuff # Programming and dev stuff
rust-analyzer rust-analyzer

1
home/natto/wayland.nix
View File

@@ -55,5 +55,6 @@
slurp slurp
inputs.hyprland-contrib.packages.${pkgs.system}.grimblast inputs.hyprland-contrib.packages.${pkgs.system}.grimblast
wl-clipboard wl-clipboard
swaybg
]; ];
} }