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

misc changes

Browse Source 
new services, random config updates
This commit is contained in:
Amneesh Singh
2021-11-30 06:31:53 +05:30
parent 21212a5cf4
commit 6130b448e0
23 changed files with 507 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
modules/emacs/default.nix
View File

@@ -1,63 +1,56 @@
{ pkgs, config, ... }:
{pkgs, ... }:
{
environment.systemPackages = with pkgs; [
(emacsWithPackagesFromUsePackage {
config = ./init.el;
package = emacsGcc;
alwaysEnsure = true;
extraEmacsPackages = epkgs: with epkgs; [
use-package
tsc
];
override = epkgs : epkgs // {
tsc = epkgs.melpaPackages.tsc.overrideAttrs(oa:
let
version = "0.15.1";
tsc-dyn = fetchurl {
url = "https://github.com/emacs-tree-sitter/elisp-tree-sitter/releases/download/${version}/tsc-dyn.so";
sha256 = "sha256-TrwyQZEfARHfafT4IhxR+p7vpjSuw9lUcgOSwCvPxe4=";
};
version-file = writeText "DYN-VERSION" version;
services.emacs = {
enable = true;
package = with pkgs; emacsWithPackagesFromUsePackage {
config = ./init.el;
package = emacsGcc;
alwaysEnsure = true;
extraEmacsPackages = epkgs: with epkgs; [
use-package
tsc
];
#https://github.com/NixOS/nixpkgs/issues/108089
override = epkgs : epkgs // {
tsc = epkgs.melpaPackages.tsc.overrideAttrs(oa:
let
version = "0.15.2";
tsc-dyn = fetchurl {
url = "https://github.com/emacs-tree-sitter/elisp-tree-sitter/releases/download/${version}/tsc-dyn.so";
sha256 = "sha256-oOq/TAooHRUo7JypCblrB/ztABowAHv2LRhFL/ZmVrg=";
};
in {
/* src = fetchFromGitHub {
owner = "emacs-tree-sitter";
repo = "elisp-tree-sitter";
rev = version;
sha256 = "sha256-dGWg4dj+85kxytvm+nNEJUN9UXdr9L6pSRz5OqDMFAM=";
};*/
postInstall = ''
cp ${tsc-dyn} $out/share/emacs/site-lisp/elpa/tsc-${oa.version}/tsc-dyn.so
cp ${version-file} $out/share/emacs/site-lisp/elpa/tsc-${oa.version}/DYN-VERSION
echo -n ${version} > $out/share/emacs/site-lisp/elpa/tsc-${oa.version}/DYN-VERSION
'';
});
tree-sitter-langs = epkgs.melpaPackages.tree-sitter-langs.overrideAttrs (oa:
let
tree-sitter-grammars = super.stdenv.mkDerivation rec {
name = "tree-sitter-grammars";
version = "0.10.4";
src = fetchzip {
url = "https://github.com/emacs-tree-sitter/tree-sitter-langs/releases/download/${version}/tree-sitter-grammars-linux-${version}.tar.gz";
sha256 = "sha256-Z+JtuGLTCVhCJBR60cbcDgWtdKcoYGWoeI5u9GcfvUQ=";
stripRoot = false;
};
tree-sitter-langs = epkgs.melpaPackages.tree-sitter-langs.overrideAttrs (oa:
let
tree-sitter-grammars = super.stdenv.mkDerivation rec {
name = "tree-sitter-grammars";
version = "0.10.7";
src = fetchzip {
url = "https://github.com/emacs-tree-sitter/tree-sitter-langs/releases/download/${version}/tree-sitter-grammars-linux-${version}.tar.gz";
sha256 = "sha256-pdSMyTUUAj4JsRLbJMUMbQSOaSEYlsaqVdmaXtXtSJw=";
stripRoot = false;
};
installPhase = ''
install -d $out/langs/bin
install -m444 * $out/langs/bin
echo -n $version > $out/langs/bin/BUNDLE-VERSION
'';
postInstall = ''
echo -n "${version}" > $out/langs/bin/BUNDLE-VERSION
'';
};
in {
postPatch = oa.postPatch or "" + ''
substituteInPlace ./tree-sitter-langs-build.el \
--replace "tree-sitter-langs-grammar-dir tree-sitter-langs--dir" "tree-sitter-langs-grammar-dir \"${tree-sitter-grammars}/langs\""
'';
# postInstall = oa.postInstall or "" + ''
# mkdir $out/share/emacs/site-lisp/elpa/tree-sitter-langs-${oa.version}/bin
# cp ${binaries}/* $out/share/emacs/site-lisp/elpa/tree-sitter-langs-${oa.version}/bin/
# '';
postPatch = oa.postPatch or "" + ''
substituteInPlace ./tree-sitter-langs-build.el \
--replace "tree-sitter-langs-grammar-dir tree-sitter-langs--dir" "tree-sitter-langs-grammar-dir \"${tree-sitter-grammars}/langs\""
'';
});
gruvbox-theme = epkgs.melpaPackages.gruvbox-theme.overrideAttrs(_: { patches = [ ./gruvbox-el.patch ]; } );
};
})
];
gruvbox-theme = epkgs.melpaPackages.gruvbox-theme.overrideAttrs(_: { patches = [ ./gruvbox-el.patch ]; } );
};
};};
}

46
modules/emacs/init.el
View File

@@ -19,20 +19,19 @@ c-blue-2 "#83a598"
c-magenta-2 "#d3869b"
c-cyan-2 "#8ec07c"
c-white-2 "#ebdbb2")
;(setq vc-handled-backends nil) ; vc is slow as fuck with git
;;settings
(setq display-line-numbers-type 'relative)
(setq inhibit-startup-screen t)
(set-face-attribute 'default nil :font "Monoid" :height 120)
(global-hl-line-mode 1)
(scroll-bar-mode 0)
(tool-bar-mode 0)
(scroll-bar-mode 0) (tool-bar-mode 0)
(menu-bar-mode 0)
(fringe-mode 0)
(global-display-line-numbers-mode 1)
(setq initial-major-mode 'emacs-lisp-mode)
(setq frame-resize-pixelwise t)
(setq auto-window-vscroll nil)
(setq scroll-step 1)
;;add packages and shit
(require 'package)
@@ -56,9 +55,13 @@ c-white-2 "#ebdbb2")
:config
(elcord-mode 1))
(use-package undo-tree
:config
(global-undo-tree-mode 1))
(use-package evil
:config
(setq evil-undo-system 'undo-redo)
(evil-set-undo-system 'undo-tree)
(evil-mode 1))
(use-package evil-colemak-basics
@@ -82,7 +85,8 @@ c-white-2 "#ebdbb2")
(define-key evil-treemacs-state-map (kbd "M-E") #'treemacs-previous-line-other-window)
(define-key evil-treemacs-state-map (kbd "M") #'treemacs-collapse-parent-node)
(evil-define-key 'treemacs treemacs-mode-map (kbd "m") #'treemacs-COLLAPSE-action)
(evil-define-key 'treemacs treemacs-mode-map (kbd "i") #'treemacs-RET-action))
(evil-define-key 'treemacs treemacs-mode-map (kbd "i") #'treemacs-RET-action)
)
(use-package lsp-mode
:config
@@ -121,12 +125,22 @@ c-white-2 "#ebdbb2")
(use-package magit)
(use-package nix-mode
:mode "\\.nix\\'")
(defface bufname
`((t :foreground ,c-fg
:background ,c-bg
:weight bold
))
"Custom faces for buffer name"
"Custom face for buffer name"
:group 'mode-line-faces )
(defface majmode
`((t :foreground ,c-fg
:background ,c-bg
))
"Custom face for major mode"
:group 'mode-line-faces )
(defface gitmode
@@ -134,13 +148,23 @@ c-white-2 "#ebdbb2")
:background ,c-red-2
:weight bold
))
"Custom face for git branch"
"Custom face for VC"
:group 'mode-line-faces )
(defface infomode
`((t :foreground ,c-bg
:background ,c-green
:weight bold
))
"For showing line and column number"
:group 'mode-line-faces )
(setq-default mode-line-format
'((:propertize " %b " face bufname)
(vc-mode (:propertize ("" vc-mode " " ) face gitmode))))
(setq-default mode-line-format
'((:propertize " %b " face bufname)
(vc-mode (:propertize ("" vc-mode " " ) face gitmode))
(:propertize (" " mode-name " ") face majmode)
(:propertize ("[[ %l | %c || %p . %+%@ ]]") face infomode)
("%-")))
(setq exclude-ln '(term-mode-hook eshell-mode-hook shell-mode-hook))
(while exclude-ln

7
modules/nvidia-offload.nix
View File

@@ -16,10 +16,12 @@ in
opengl = {
driSupport32Bit = true;
#package = pkgs.mesa_drivers;
extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
enable = true;
};
nvidia = {
prime = {
# sync.enable = true;
offload = { enable = true; };
intelBusId = "PCI:0:2:0";
nvidiaBusId = "PCI:1:0:0";
@@ -31,5 +33,8 @@ in
};
};
};
services.xserver.videoDrivers = [ "nvidia" ];
services.xserver = {
videoDrivers = [ "nvidia" ];
dpi = 96;
};
}

10
modules/nvim/default.nix
View File

@@ -3,9 +3,10 @@
{
programs.neovim = {
enable = true;
package = pkgs.neovim-unwrapped.overrideAttrs (_:{
nativeBuildInputs = with pkgs.unstable; [ unzip cmake pkgconfig gettext tree-sitter ];
});
package = pkgs.neovim-nightly;
# package = pkgs.neovim-nightly.overrideAttrs (_:{
# nativeBuildInputs = with pkgs; [ unzip cmake pkgconfig gettext tree-sitter ];
# });
defaultEditor = true;
configure = {
customRC = ''
@@ -19,7 +20,6 @@
auto-pairs
vim-floaterm
vim-closetag
vim-floaterm
nerdcommenter
nvim-compe
nvim-lspconfig
@@ -29,7 +29,7 @@
nvim-tree-lua
vim-vsnip
nvim-treesitter
vim-nix
vim-latex-live-preview
(gruvbox.overrideAttrs (oa: { patches = [ ./gruvbox.patch ]; }))
];
};

37
modules/nvim/init.lua
View File

@@ -1,5 +1,5 @@
vim.api.nvim_set_option("termguicolors", true)
local nvim_lsp = require('lspconfig')
local nvimlsp = require('lspconfig')
local comm = vim.api.nvim_command
local bind = vim.api.nvim_set_keymap
local setvar = vim.api.nvim_set_var
@@ -11,8 +11,6 @@ end
--SETTINGS
comm("syntax enable")
comm("syntax sync minlines=100")
vim.o.cmdheight = 1
vim.o.modifiable = true
vim.o.cursorline = true
@@ -25,7 +23,7 @@ vim.o.cmdheight = 1
vim.o.mouse = "a"
vim.o.splitbelow = true
vim.o.splitright = true
comm("set nowrap")
--comm("set nowrap")
vim.o.conceallevel = 0
vim.o.tabstop = 2
vim.o.shiftwidth = 2
@@ -66,6 +64,7 @@ cdhbind('k', 'n')
cdhbind('f', 'e')
cdhbind('t', 'f')
cdhbind('j', 't')
bind('n', "<M-s>", ":w<CR>", {noremap=true})
bind('n', "<M-n>", ":resize -2<CR>", {noremap=true, silent=true})
bind('n', "<M-e>", ":resize +2<CR>", {noremap=true, silent=true})
@@ -90,9 +89,9 @@ function _G.CompileRun()
['java'] = 'java ' .. file,
['lisp'] = 'clisp ' .. file,
['python'] = 'python3 ' .. file,
['c'] = 'gcc ' .. file .. ' -o ' .. noext .. ' && ' .. noext .. ' && rm ' .. noext,
['c'] = 'gcc ' .. file .. ' -o ' .. noext .. ' -Wno-unused-result ' .. ' && ' .. noext .. ' && rm ' .. noext,
['rust'] = 'rustc ' .. file .. ' -o ' .. noext .. ' && ' .. noext .. ' && rm ' .. noext,
['cpp'] = 'g++ -std=c++17 ' .. file .. ' -o ' .. noext .. ' && ' .. noext .. ' && rm ' .. noext,
['cpp'] = 'g++ -std=c++17 ' .. file .. ' -o ' .. noext .. ' -Wno-unused-result ' .. ' && ' .. noext .. ' && rm ' .. noext,
['haskell'] = 'ghc -dynamic ' .. file .. ' && ' .. noext .. ' && rm ' .. noext .. ' ' .. noext .. '.o ' .. noext .. '.hi',
['sh'] = 'sh ' .. file,
['javascript']= 'node ' .. file,
@@ -126,14 +125,15 @@ bind('n', "<F6>", ":call v:lua.Repl()<CR>", {silent=true})
--nvim-tree.lua
vim.g.nvim_tree_auto_close = 1
vim.g.nvim_tree_auto_ignore_ft = { "startify" }
vim.g.nvim_tree_follow = 1
vim.g.nvim_tree_git_hl = 1
vim.g.nvim_tree_highlight_opened_files = 1
vim.g.nvim_tree_width_allow_resize = 1
vim.g.nvim_tree_lsp_diagnostics = 1
vim.g.nvim_tree_lsp_diagnostics = 1
require'nvim-tree'.setup {
nvim_tree_auto_close = 1,
nvim_tree_follow = 1,
nvim_tree_lsp_diagnostics = 1
}
vim.g.nvim_tree_window_picker_exclude = {
['buftype'] = { 'terminal' }
}
@@ -187,7 +187,7 @@ vim.g.presence_main_image = "file"
--treesitter-nvim
require'nvim-treesitter.configs'.setup {
ensure_installed = "all",
ensure_install = "all",
highlight = {
enable = true,
additional_vim_regex_highlighting = true,
@@ -197,7 +197,11 @@ require'nvim-treesitter.configs'.setup {
}
}
--misc
--vim-latex-live-preview
vim.g.livepreview_previewer = "zathura"
require'colorizer'.setup()
--lsp and compe stuff i got from various places
@@ -235,6 +239,7 @@ require'compe'.setup {
spell = true;
treesitter = true;
nvim_lua = true;
vsnip = true;
};
}
@@ -250,6 +255,7 @@ local check_back_space = function()
end
end
vim.g.vsnip_snippet_dir = "/home/natto/.vsnip"
-- Use (s-)tab to:
--- move to prev/next item in completion menuone
--- jump to prev/next snippet's placeholder
@@ -335,7 +341,7 @@ local statusline = {
}
vim.o.statusline = table.concat(statusline)
local servers = { "ccls", "rust_analyzer", "tsserver", "hls", "pylsp" }
local servers = { "ccls", "rust_analyzer", "tsserver", "hls", "pylsp", "texlab", "rnix" }
local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities.textDocument.completion.completionItem.snippetSupport = true
capabilities.textDocument.completion.completionItem.resolveSupport = {
@@ -347,5 +353,8 @@ capabilities.textDocument.completion.completionItem.resolveSupport = {
}
for _, lsp in ipairs(servers) do
nvim_lsp[lsp].setup { capabilities = capabilities, on_attach = on_attach }
nvimlsp[lsp].setup { capabilities = capabilities, on_attach = on_attach }
end
vim.g.tex_flavor = "latex"
comm("set syntax=on")

127
modules/pipewire.nix
View File

@@ -1,66 +1,77 @@
{lib, config, pkgs, ... }:
{
services.pipewire = {
enable = true;
alsa = {
services = {
pipewire = {
enable = true;
support32Bit = true;
};
pulse = {
enable = true;
};
config.pipewire = {
context.modules = [
{
name = "libpipewire-module-rtkit";
args = {
nice.level = -15;
rt.prio = 88;
rt.time.soft = 200000;
rt.time.hard = 200000;
};
flags = [ "ifexists" "nofail" ];
}
{ name = "libpipewire-module-protocol-native"; }
{ name = "libpipewire-module-profiler"; }
{ name = "libpipewire-module-metadata"; }
{ name = "libpipewire-module-spa-device-factory"; }
{ name = "libpipewire-module-spa-node-factory"; }
{ name = "libpipewire-module-client-node"; }
{ name = "libpipewire-module-client-device"; }
{
name = "libpipewire-module-portal";
flags = [ "ifexists" "nofail" ];
}
{
name = "libpipewire-module-access";
args = {};
}
{ name = "libpipewire-module-adapter"; }
{ name = "libpipewire-module-link-factory"; }
{ name = "libpipewire-module-session-manager"; }
];
};
alsa = {
enable = true;
support32Bit = true;
};
pulse.enable = true;
#jack.enable = true;
config.pipewire = {
context.objects = [
{
factory = "spa-node-factory";
args = {
factory.name = "support.node.driver";
node.name = "Dummy-Driver";
priority.driver = 8000;
};
}
];
context.modules = [
{
name = "libpipewire-module-rtkit";
args = {
nice.level = -15;
rt.prio = 88;
rt.time.soft = 200000;
rt.time.hard = 200000;
};
flags = [ "ifexists" "nofail" ];
}
{ name = "libpipewire-module-protocol-native"; }
{ name = "libpipewire-module-profiler"; }
{ name = "libpipewire-module-metadata"; }
{ name = "libpipewire-module-spa-device-factory"; }
{ name = "libpipewire-module-spa-node-factory"; }
{ name = "libpipewire-module-client-node"; }
{ name = "libpipewire-module-client-device"; }
{
name = "libpipewire-module-portal";
flags = [ "ifexists" "nofail" ];
}
{
name = "libpipewire-module-access";
args = {};
}
{ name = "libpipewire-module-adapter"; }
{ name = "libpipewire-module-link-factory"; }
{ name = "libpipewire-module-session-manager"; }
];
};
config.pipewire-pulse = {
context.modules = [
{ name = "libpipewire-module-protocol-native"; }
{ name = "libpipewire-module-client-node"; }
{ name = "libpipewire-module-adapter"; }
{ name = "libpipewire-module-metadata"; }
{
name = "libpipewire-module-protocol-pulse";
args = {
pulse.min.req = "32/48000";
pulse.min.quantum = "32/48000";
pulse.min.frag = "32/48000";
};
}
];
stream.properties = {
node.latency = "32/48000";
resample.quality = 1;
config.pipewire-pulse = {
context.modules = [
{ name = "libpipewire-module-protocol-native"; }
{ name = "libpipewire-module-client-node"; }
{ name = "libpipewire-module-adapter"; }
{ name = "libpipewire-module-metadata"; }
{
name = "libpipewire-module-protocol-pulse";
args = {
pulse.min.req = "32/48000";
pulse.min.quantum = "32/48000";
pulse.min.frag = "32/48000";
};
}
];
stream.properties = {
node.latency = "32/48000";
resample.quality = 1;
};
};
};
};

7
modules/xorg.nix
View File

@@ -7,13 +7,15 @@
# '';
#in
{
console.useXkbConfig = true;
services = {
xserver = {
enable = true;
libinput= {
enable = true;
mouse = {
accelSpeed = null;
accelSpeed = "0";
# accelProfile = "flat";
};
touchpad = {
middleEmulation = false;
@@ -26,7 +28,8 @@
startx = {
enable = true;
};
# sessionCommands = "${pkgs.xorg.xkbcomp}/bin/xkbcomp ${compiledLayout} $DISPLAY";
# lightdm.enable = true;
# sessionCommands = "${pkgs.xorg.xkbcomp}/bin/xkbcomp ${compiledLayout} $DISPLAY";
};
extraLayouts = {
us-colemak = {