added host Marisa (haven't tested config yet)
This commit is contained in:
19
home/config/emacs/gruvbox-el.patch
Normal file
19
home/config/emacs/gruvbox-el.patch
Normal file
@@ -0,0 +1,19 @@
|
||||
--- a/gruvbox.el 2021-05-17 21:19:07.731014155 +0530
|
||||
+++ b/gruvbox.el 2021-05-17 21:20:11.297990471 +0530
|
||||
@@ -162,11 +162,11 @@
|
||||
|
||||
|
||||
;; line numbers
|
||||
- (line-number (:foreground gruvbox-dark4 :background gruvbox-dark1))
|
||||
- (line-number-current-line (:foreground gruvbox-bright_orange :background gruvbox-dark2))
|
||||
- (linum (:foreground gruvbox-dark4 :background gruvbox-dark1))
|
||||
- (linum-highlight-face (:foreground gruvbox-bright_orange :background gruvbox-dark2))
|
||||
- (linum-relative-current-face (:foreground gruvbox-bright_orange :background gruvbox-dark2))
|
||||
+ (line-number (:foreground gruvbox-dark4 :background nil))
|
||||
+ (line-number-current-line (:foreground gruvbox-bright_orange :background gruvbox-dark1))
|
||||
+ (linum (:foreground gruvbox-dark4 :background nil))
|
||||
+ (linum-highlight-face (:foreground gruvbox-bright_orange :background gruvbox-dark1))
|
||||
+ (linum-relative-current-face (:foreground gruvbox-bright_orange :background gruvbox-dark1))
|
||||
|
||||
;; Highlight indentation mode
|
||||
(highlight-indentation-current-column-face (:background gruvbox-dark2))
|
45
home/config/emacs/init.el
Normal file
45
home/config/emacs/init.el
Normal file
@@ -0,0 +1,45 @@
|
||||
;;settings
|
||||
(setq display-line-numbers-type 'relative)
|
||||
(setq inhibit-startup-screen t)
|
||||
(set-face-attribute 'default nil :font "Fira Mono for Powerline" :height 120)
|
||||
|
||||
|
||||
|
||||
;;add packages and shit
|
||||
(require 'package)
|
||||
(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/"))
|
||||
(package-initialize)
|
||||
(setq pkgs '(ivy gruvbox-theme elcord rainbow-delimiters))
|
||||
(while pkgs
|
||||
(require (car pkgs))
|
||||
(setq pkgs (cdr pkgs)))
|
||||
|
||||
|
||||
;;package config and modes
|
||||
(global-hl-line-mode 1)
|
||||
(scroll-bar-mode 0)
|
||||
(tool-bar-mode 0)
|
||||
(menu-bar-mode 0)
|
||||
(fringe-mode 0)
|
||||
(global-display-line-numbers-mode 1)
|
||||
(load-theme 'gruvbox-dark-hard t)
|
||||
(ivy-mode 1)
|
||||
(elcord-mode 1)
|
||||
|
||||
|
||||
;;keybinds
|
||||
;ivy
|
||||
(define-key ivy-minibuffer-map (kbd "C-n") 'ivy-next-line)
|
||||
(define-key ivy-minibuffer-map (kbd "C-e") 'ivy-previous-line)
|
||||
(define-key ivy-minibuffer-map (kbd "C-i") 'ivy-done)
|
||||
|
||||
|
||||
;;hooks
|
||||
;exclude line numbers
|
||||
(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)))
|
||||
|
||||
;rainbow delims
|
||||
(add-hook 'prog-mode-hook 'rainbow-delimiters-mode)
|
@@ -25,11 +25,13 @@ set autoindent
|
||||
set number
|
||||
set relativenumber
|
||||
set background=dark
|
||||
syntax sync minlines=100
|
||||
set showtabline=2
|
||||
set noshowmode
|
||||
set nobackup
|
||||
set nowritebackup
|
||||
set updatetime=300
|
||||
set lazyredraw
|
||||
set timeoutlen=100
|
||||
set formatoptions-=cro
|
||||
set clipboard=unnamedplus
|
||||
|
27
home/ottan.nix
Normal file
27
home/ottan.nix
Normal file
@@ -0,0 +1,27 @@
|
||||
{config, pkgs, lib, ...}:
|
||||
let
|
||||
home = config.home.homeDirectory;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
./stuff/programs/nvim.nix
|
||||
./stuff/programs/emacs.nix
|
||||
];
|
||||
home = {
|
||||
packages = with pkgs; [
|
||||
pamixer
|
||||
customscripts
|
||||
curl
|
||||
];
|
||||
file = {
|
||||
dwm-autostart = {
|
||||
source = ./config/dwm/autostart.sh;
|
||||
target = "${home}/.dwm/autostart.sh";
|
||||
};
|
||||
dwm-status = {
|
||||
source = ./config/dwm/bruhstatus.sh;
|
||||
target = "${home}/.dwm/bruhstatus.sh";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
Binary file not shown.
@@ -3,6 +3,7 @@
|
||||
imports = [
|
||||
./programs/nvim.nix
|
||||
./programs/ncmpcpp.nix
|
||||
./programs/emacs.nix
|
||||
];
|
||||
programs = {
|
||||
firefox = {
|
||||
@@ -31,8 +32,5 @@
|
||||
save-position-on-quit = "yes";
|
||||
};
|
||||
};
|
||||
emacs = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
21
home/stuff/programs/emacs.nix
Normal file
21
home/stuff/programs/emacs.nix
Normal file
@@ -0,0 +1,21 @@
|
||||
{ pkgs, config, ... }:
|
||||
{
|
||||
programs.emacs = {
|
||||
enable = true;
|
||||
extraPackages = epkgs: with epkgs; [
|
||||
elcord
|
||||
gruvbox-theme
|
||||
ivy
|
||||
rainbow-delimiters
|
||||
];
|
||||
overrides = self: super: {
|
||||
gruvbox-theme = self.melpaPackages.gruvbox-theme.overrideAttrs(_: {
|
||||
patches = [ ../../config/emacs/gruvbox-el.patch ];
|
||||
});
|
||||
};
|
||||
};
|
||||
home.file.emacs = {
|
||||
source = ../../config/emacs/init.el;
|
||||
target = "${config.home.homeDirectory}/.emacs.d/init.el";
|
||||
};
|
||||
}
|
@@ -13,7 +13,7 @@ let
|
||||
let g:floaterm_width=0.8
|
||||
let g:floaterm_height=0.8
|
||||
let g:floaterm_wintitle=0
|
||||
let g:floaterm_shell="/usr/bin/env fish"
|
||||
let g:floaterm_shell="/usr/bin/env zsh"
|
||||
'';
|
||||
plugin = pkgs.vimPlugins.vim-floaterm;
|
||||
};
|
||||
@@ -60,10 +60,10 @@ in
|
||||
{
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
vimAlias = true;
|
||||
vimAlias = false;
|
||||
viAlias = false;
|
||||
# withNodeJs = true;
|
||||
# withPython = true;
|
||||
withNodeJs = false;
|
||||
withPython = false;
|
||||
extraConfig = ''
|
||||
let g:gruvbox_italic=1
|
||||
let g:gruvbox_contrast_dark="hard"
|
||||
@@ -75,7 +75,7 @@ in
|
||||
builtins.readFile ../../config/nvim/utils.vim;
|
||||
plugins = with plugs; [
|
||||
auto-pairs
|
||||
#nvim-colorizer
|
||||
# nvim-colorizer
|
||||
floaterm
|
||||
vim-rooter
|
||||
nerdcommenter
|
||||
|
Reference in New Issue
Block a user