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

Satori: misc changes

Browse Source
This commit is contained in:
Amneesh Singh
2021-07-04 21:33:07 +05:30
parent b1d7988152
commit e7da496981
13 changed files with 211 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
cert.pem
View File

@@ -1,29 +1,29 @@
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
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
waMVK3m6w1uNBKvuEVz1 LUHIEflezPJoCBc1CBBm
-----END CERTIFICATE----- -----END CERTIFICATE-----

12
configs/nvim.nix
View File

@@ -23,18 +23,10 @@
vim-rooter vim-rooter
vim-polyglot vim-polyglot
nvim-tree-lua nvim-tree-lua
presence-nvim
indentLine indentLine
vim-vsnip
(gruvbox.overrideAttrs (oa: { patches = [ ./nvim/gruvbox.patch ]; })) (gruvbox.overrideAttrs (oa: { patches = [ ./nvim/gruvbox.patch ]; }))
(pkgs.vimUtils.buildVimPlugin {
name = "presence-nvim";
src = pkgs.fetchFromGitHub {
owner = "andweeb";
repo = "presence.nvim";
rev = "f4c1e227be0a0c863c2de201155401950eda572e";
sha256 = "08s4az1gv6r5sl0jqkaf4yzibglibb7n2sivh7qccj8dz8id3883";
};
patches = [./nvim/test.patch];
})
]; ];
}; };
}; };

96
configs/nvim/init.lua
View File

@@ -1,7 +1,6 @@
local nvim_lsp = require('lspconfig') local nvim_lsp = require('lspconfig')
local comm = vim.api.nvim_command local comm = vim.api.nvim_command
local bind = vim.api.nvim_set_keymap local bind = vim.api.nvim_set_keymap
local set = function(a) comm("set " .. a) end
local setvar = vim.api.nvim_set_var local setvar = vim.api.nvim_set_var
local getvar = vim.api.nvim_get_var local getvar = vim.api.nvim_get_var
@@ -13,33 +12,34 @@ end
comm("syntax enable") comm("syntax enable")
comm("syntax sync minlines=100") comm("syntax sync minlines=100")
set("cmdheight=1") vim.o.cmdheight = 1
set("modifiable") vim.o.modifiable = true
set("cursorline") vim.o.cursorline = true
set("hidden") vim.o.hidden = true
set("encoding=utf-8") vim.o.encoding= "utf-8"
set("pumheight=10") vim.o.pumheight = 10
set("fileencoding=utf-8") vim.o.fileencoding = "utf-8"
set("ruler") vim.o.ruler = true
set("cmdheight=1") vim.o.cmdheight = 1
set("mouse=a") vim.o.mouse = "a"
set("splitbelow") vim.o.splitbelow = true
set("splitright") vim.o.splitright = true
set("nowrap") comm("set nowrap")
set("conceallevel=0") vim.o.conceallevel = 0
set("tabstop=4") vim.o.tabstop = 4
set("shiftwidth=4") vim.o.shiftwidth = 4
set("smarttab") vim.o.smarttab = true
set("expandtab") vim.o.expandtab = true
set("smartindent") vim.o.smartindent = true
set("autoindent") vim.o.autoindent = true
set("number") vim.o.number = true
set("relativenumber") vim.o.relativenumber = true
set("showtabline=2") vim.o.showtabline = 2
set("updatetime=300") vim.o.updatetime = 300
set("lazyredraw") vim.o.lazyredraw = true
set("timeoutlen=100") vim.o.timeoutlen = 100
set("clipboard=unnamedplus") vim.o.clipboard = "unnamedplus"
vim.o.completeopt = "menuone,noselect"
--KEYBINDS --KEYBINDS
@@ -74,8 +74,8 @@ bind('n', "<C-m>", "<C-w>h", {noremap=true})
bind('n', "<C-n>", "<C-w>j", {noremap=true}) bind('n', "<C-n>", "<C-w>j", {noremap=true})
bind('n', "<C-e>", "<C-w>k", {noremap=true}) bind('n', "<C-e>", "<C-w>k", {noremap=true})
bind('n', "<C-i>", "<C-w>l", {noremap=true}) bind('n', "<C-i>", "<C-w>l", {noremap=true})
bind('n', "<C-v>", ":vsplit<CR>", {noremap=true, silent=true}) bind('n', "<M-v>", ":vsplit<CR>", {noremap=true, silent=true})
bind('n', "<C-h>", ":split<CR>", {noremap=true, silent=true}) bind('n', "<M-h>", ":split<CR>", {noremap=true, silent=true})
--RUN AND REPL (using vim-floaterm) --RUN AND REPL (using vim-floaterm)
@@ -141,7 +141,7 @@ bind('n', "<Space>f", ":NvimTreeFindFile<CR>", {noremap=true, silent=true})
vim.g.gruvbox_italic=1 vim.g.gruvbox_italic=1
vim.g.gruvbox_contrast_dark="hard" vim.g.gruvbox_contrast_dark="hard"
vim.g.gruvbox_contrast_light="hard" vim.g.gruvbox_contrast_light="hard"
set("background=dark") vim.o.background="dark"
comm("colorscheme gruvbox") comm("colorscheme gruvbox")
--floaterm --floaterm
@@ -151,10 +151,10 @@ vim.g.floaterm_keymap_prev = '<F3>'
vim.g.floaterm_keymap_new = '<F4>' vim.g.floaterm_keymap_new = '<F4>'
vim.g.floaterm_gitcommit='floaterm' vim.g.floaterm_gitcommit='floaterm'
vim.g.floaterm_autoinsert=1 vim.g.floaterm_autoinsert=1
vim.g.floaterm_width=1.0
vim.g.floaterm_height=0.3
vim.g.floaterm_shell="/usr/bin/env zsh" vim.g.floaterm_shell="/usr/bin/env zsh"
vim.g.floaterm_wintype = "split" vim.g.floaterm_position="bottom"
vim.g.floaterm_width=0.99
vim.g.floaterm_height=0.6
--closetag --closetag
vim.g.closetag_filenames = "*.html,*.xhtml,*.phtml,*.js,*.erb,*.jsx" vim.g.closetag_filenames = "*.html,*.xhtml,*.phtml,*.js,*.erb,*.jsx"
@@ -237,33 +237,37 @@ end
_G.tab_complete = function() _G.tab_complete = function()
if vim.fn.pumvisible() == 1 then if vim.fn.pumvisible() == 1 then
return t "<C-n>" return t "<C-n>"
elseif vim.fn.call("vsnip#available", {1}) == 1 then
return t "<Plug>(vsnip-expand-or-jump)"
elseif check_back_space() then elseif check_back_space() then
return t "<Tab>" return t "<Tab>"
else else
return vim.fn['compe#complete']() return vim.fn['compe#complete']()
end end
end end
_G.s_tab_complete = function() _G.s_tab_complete = function()
if vim.fn.pumvisible() == 1 then if vim.fn.pumvisible() == 1 then
return t "<C-p>" return t "<C-e>"
elseif vim.fn.call("vsnip#jumpable", {-1}) == 1 then elseif vim.fn.call("vsnip#jumpable", {-1}) == 1 then
return t "<Plug>(vsnip-jump-prev)" return t "<Plug>(vsnip-jump-prev)"
else else
-- If <S-Tab> is not working in your terminal, change it to <C-h>
return t "<S-Tab>" return t "<S-Tab>"
end end
end end
vim.api.nvim_set_keymap("i", "<Tab>", "v:lua.tab_complete()", {expr = true, silent = true}) vim.api.nvim_set_keymap("i", "<Tab>", "v:lua.tab_complete()", {expr = true, silent = true})
vim.api.nvim_set_keymap("s", "<Tab>", "v:lua.tab_complete()", {expr = true, silent = true}) vim.api.nvim_set_keymap("s", "<Tab>", "v:lua.tab_complete()", {expr = true, silent = true})
vim.api.nvim_set_keymap("i", "<S-Tab>", "v:lua.s_tab_complete()", {expr = true, silent = true}) vim.api.nvim_set_keymap("i", "<S-Tab>", "v:lua.s_tab_complete()", {expr = true, silent = true})
vim.api.nvim_set_keymap("s", "<S-Tab>", "v:lua.s_tab_complete()", {expr = true, silent = true}) vim.api.nvim_set_keymap("s", "<S-Tab>", "v:lua.s_tab_complete()", {expr = true, silent = true})
vim.api.nvim_set_keymap("i", "<CR>", "compe#confirm('<CR>')", {expr = true, silent = true})
set("shortmess+=c") comm("set shortmess+=c")
--STATUSLINE --STATUSLINE
set("noruler") comm("set noruler")
set("laststatus=2") vim.o.laststatus = 2
local function mode() local function mode()
local mode_map = { local mode_map = {
['n'] = 'normal ', ['n'] = 'normal ',
@@ -314,9 +318,19 @@ local statusline = {
vim.o.statusline = table.concat(statusline) vim.o.statusline = table.concat(statusline)
vim.api.nvim_set_option("termguicolors", true) vim.api.nvim_set_option("termguicolors", true)
local servers = { "clangd", "rust_analyzer", "tsserver", "jedi_language_server" } local servers = { "ccls", "rust_analyzer", "tsserver", "pyls", "hls"}
local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities.textDocument.completion.completionItem.snippetSupport = true
capabilities.textDocument.completion.completionItem.resolveSupport = {
properties = {
'documentation',
'detail',
'additionalTextEdits',
}
}
for _, lsp in ipairs(servers) do for _, lsp in ipairs(servers) do
nvim_lsp[lsp].setup { on_attach = on_attach } nvim_lsp[lsp].setup { capabilities = capabilities, on_attach = on_attach }
end end
require'colorizer'.setup() require'colorizer'.setup()

27
configs/nvim/test.patch
View File

@@ -1,27 +0,0 @@
diff --color -ru a/lua/presence/file_assets.lua b/lua/presence/file_assets.lua
--- a/lua/presence/file_assets.lua 2021-06-09 07:56:33.416958354 +0530
+++ b/lua/presence/file_assets.lua 2021-06-09 07:57:23.336181080 +0530
@@ -80,7 +80,7 @@
hack = { "Hack", "hack" },
hpp = { "C++ header file", "c_plus_plus" },
hs = { "Haskell", "haskell" },
- html = { "HTML", "html" },
+ html = { "HTML", "html", "htm" },
hx = { "Haxe", "haxe" },
hxx = { "C++ header file", "c_plus_plus" },
ini = { "Configuration file", "config" },
diff --color -ru a/lua/presence/init.lua b/lua/presence/init.lua
--- a/lua/presence/init.lua 2021-06-10 09:03:09.696734425 +0530
+++ b/lua/presence/init.lua 2021-06-10 12:12:21.061551934 +0530
@@ -293,10 +293,10 @@
end
local env_vars = {
+ "XDG_RUNTIME_DIR",
"TEMP",
"TMP",
"TMPDIR",
- "XDG_RUNTIME_DIR",
}
for i = 1, #env_vars do

138
flake.lock generated
View File

@@ -2,15 +2,14 @@
"nodes": { "nodes": {
"agenix": { "agenix": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1620307122, "lastModified": 1620877075,
"narHash": "sha256-YLS8foCbVXJiUPoz3NpfAwysxCMsKNIpWK0fetfPNI0=", "narHash": "sha256-XvgTqtmQZHegu9UMDSR50gK5cHEM2gbnRH0qecmdN54=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "c12ac8b6f336e1029f6d45c8ca0f2a3f95fbeb6b", "rev": "e543aa7d68f222e1e771165da9e9a64b5bf7b3e3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -36,21 +35,6 @@
} }
}, },
"flake-utils": { "flake-utils": {
"locked": {
"lastModified": 1600209923,
"narHash": "sha256-zoOWauTliFEjI++esk6Jzk7QO5EKpddWXQm9yQK24iM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3cd06d3c1df6879c9e41cb2c33113df10566c760",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"locked": { "locked": {
"lastModified": 1610051610, "lastModified": 1610051610,
"narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=", "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=",
@@ -67,16 +51,14 @@
}, },
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": "nixpkgs_2"
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1619711895, "lastModified": 1625384440,
"narHash": "sha256-CWc6RAoqHSX7vhRqMbd1K1oULO7fy3IJ6o+J9zkHtcI=", "narHash": "sha256-WnDK+LZioER6eeC8Sm7GPvbiS6XPyUqn+qtc2lvjLHo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d57c59e7cb4beba06825c042df35cc1f707bb41a", "rev": "ac319fd3149b23a3ad8ee24cb2def6e67acf194c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -87,15 +69,15 @@
}, },
"mailserver": { "mailserver": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_3",
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1622699922, "lastModified": 1624568578,
"narHash": "sha256-KJ2R+URPXVCdignP9v2eCA+/YwiNYY5HSQ0/Szv47KM=", "narHash": "sha256-E6mgpF2PVlPRWpyZBcpie6e03u2kAdWlveB6AI10Bos=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "49074b7835c6d40846cb23953c04a03e1d2a4a9e", "rev": "a9f87ca461a1f0e23e85a1ba8c696672ed9e11e2",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@@ -104,20 +86,36 @@
"type": "gitlab" "type": "gitlab"
} }
}, },
"master": {
"locked": {
"lastModified": 1625397485,
"narHash": "sha256-psfWKhIp10coR+bGMegtagjMnV67vJVCgKO29wKevOw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0168c6ff9f6f4a67261bdf7ba5aea48ec8e4389a",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"neovim-flake": { "neovim-flake": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1622056438, "lastModified": 1625382879,
"narHash": "sha256-9wQSoVvkUno39cAsqseMkSzIDMQDNZzA5MIYmmr61cw=", "narHash": "sha256-pi9EfFYaAdzCJuar24CT+nhkS29FCg2nufai1Qb0mZA=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "192f89ea1bdb86e8d12a9940872f92f0fc88b300", "rev": "490615612ed5ec587c8023de28db495b3181de30",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -129,12 +127,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1599148892, "lastModified": 1618628710,
"narHash": "sha256-V76c6DlI0ZZffvbBpxGlpVSpXxZ14QpFHwAvEEujIsY=", "narHash": "sha256-9xIoU+BrCpjs5nfWcd/GlU7XCVdnNKJPffoNTxgGfhs=",
"owner": "NixOS", "path": "/nix/store/z1rf17q0fxj935cmplzys4gg6nxj1as0-source",
"repo": "nixpkgs", "rev": "7919518f0235106d050c77837df5e338fb94de5d",
"rev": "7ff50a7f7b9a701228f870813fe58f01950f870b", "type": "path"
"type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
@@ -142,6 +139,20 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1625397485,
"narHash": "sha256-psfWKhIp10coR+bGMegtagjMnV67vJVCgKO29wKevOw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0168c6ff9f6f4a67261bdf7ba5aea48ec8e4389a",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1607522989, "lastModified": 1607522989,
"narHash": "sha256-o/jWhOSAlaK7y2M57OIriRt6whuVVocS/T0mG7fd1TI=", "narHash": "sha256-o/jWhOSAlaK7y2M57OIriRt6whuVVocS/T0mG7fd1TI=",
@@ -156,29 +167,29 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_3": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1619464443, "lastModified": 1625286343,
"narHash": "sha256-R7WAb8EnkIJxxaF6GTHUPytjonhB4Zm0iatyWoW169A=", "narHash": "sha256-bTzz52TDRqjFR7/xKyoJxNz90bIHdXQXhOc5BBRFNAM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17", "rev": "7918dc5148d7ce7b7e011a1186051693e14e1a4c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1621840840, "lastModified": 1625281901,
"narHash": "sha256-o6h6+d5ZwrFmOTe+ma9s1Z9kyHsCW1C84IA8RZ9/fIU=", "narHash": "sha256-DkZDtTIPzhXATqIps2ifNFpnI+PTcfMYdcrx/oFm00Q=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ea7d4aa9b8225abd6147339f0d56675d6f1f0fd1", "rev": "09c38c29f2c719cd76ca17a596c2fdac9e186ceb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -190,11 +201,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1619994493, "lastModified": 1625385778,
"narHash": "sha256-cYKOTkRp1J0DIrJ6MNBH4dAmpQGaf2shppxKuI0eIac=", "narHash": "sha256-Eqg3xVVGtgbW2lLke7alDb7+pX+eJvuHqnYVOanNSMk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "72fd1387746e2d2806e1ec172886c149c3f46180", "rev": "45e7ba0f1eb13b76f4b978b0d9295d594aaf29f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -207,14 +218,14 @@
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"neovim-flake": "neovim-flake", "neovim-flake": "neovim-flake",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1622104855, "lastModified": 1625386273,
"narHash": "sha256-e+8QFAVA/umRZAOOSIj/0b+WmyRhPk7NSu7f5H7rMok=", "narHash": "sha256-72a9jmmR5LDU68jiDzQuwme8DuwGgbfCoco0wIjzCq4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "823a11a8579d8d63d2eb42b2c577e6396aaf2d70", "rev": "85ac1e60a0d8ec5bff474219bf64f2c4b320f9c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -228,7 +239,8 @@
"agenix": "agenix", "agenix": "agenix",
"home-manager": "home-manager", "home-manager": "home-manager",
"mailserver": "mailserver", "mailserver": "mailserver",
"nixpkgs": "nixpkgs_3", "master": "master",
"nixpkgs": "nixpkgs_4",
"nur": "nur", "nur": "nur",
"nvim": "nvim", "nvim": "nvim",
"stable": "stable", "stable": "stable",
@@ -237,16 +249,16 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1622197592, "lastModified": 1625176478,
"narHash": "sha256-MS2v6/oDzW5uej8fnjg0v//WWVvEdNooP4plG2AdMGQ=", "narHash": "sha256-s1RTYNKw7ySyqrZjns9Cq+Nnjpp75ePgL06pgcbIpoA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "85960bea533dc2d89dff8836d8a0a1239ddd5c9c", "rev": "21b696caf392ad6fa513caf3327d0aa0430ffb72",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-20.09", "ref": "nixos-21.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -268,11 +280,11 @@
}, },
"utils_2": { "utils_2": {
"locked": { "locked": {
"lastModified": 1620759905, "lastModified": 1623875721,
"narHash": "sha256-WiyWawrgmyN0EdmiHyG2V+fqReiVi8bM9cRdMaKQOFg=", "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "b543720b25df6ffdfcf9227afafc5b8c1fabfae8", "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772",
"type": "github" "type": "github"
}, },
"original": { "original": {

21
flake.nix
View File

@@ -1,22 +1,17 @@
{ {
inputs = { inputs = {
nixpkgs.url = github:nixos/nixpkgs/nixos-unstable; nixpkgs.url = github:nixos/nixpkgs/nixpkgs-unstable;
stable.url = github:nixos/nixpkgs/nixos-20.09; stable.url = github:nixos/nixpkgs/nixos-21.05;
home-manager = { master.url = github:nixos/nixpkgs/master;
url = github:nix-community/home-manager; home-manager.url = github:nix-community/home-manager;
inputs.nixpkgs.follows = "nixpkgs"; nur.url = github:nix-community/NUR;
};
nur = {
url = github:nix-community/NUR;
inputs.nixpkgs.follows = "nixpkgs";
};
agenix.url = github:ryantm/agenix; agenix.url = github:ryantm/agenix;
utils.url = github:numtide/flake-utils; utils.url = github:numtide/flake-utils;
nvim.url = github:nix-community/neovim-nightly-overlay; nvim.url = github:nix-community/neovim-nightly-overlay;
mailserver.url = gitlab:simple-nixos-mailserver/nixos-mailserver; mailserver.url = gitlab:simple-nixos-mailserver/nixos-mailserver;
}; };
outputs = inputs@{self, nixpkgs, stable, ... }: outputs = inputs@{self, nixpkgs, stable, master, ... }:
inputs.utils.lib.eachDefaultSystem (system: inputs.utils.lib.eachDefaultSystem (system:
let let
overlays = [ overlays = [
@@ -30,6 +25,9 @@
overlays = overlays ++ [ overlays = overlays ++ [
inputs.nur.overlay inputs.nur.overlay
inputs.nvim.overlay inputs.nvim.overlay
(_:_: {unstable = nixpkgs.legacyPackages.${system};})
(_:_: {stable = stable.legacyPackages.${system};})
(_:_: {master = master.legacyPackages.${system};})
]; ];
config.allowUnfree = true; config.allowUnfree = true;
config.allowBroken = true; config.allowBroken = true;
@@ -58,7 +56,6 @@
Satori = nixpkgs.lib.nixosSystem { Satori = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./modules/vault-agent.nix
./hosts/personal/satori.nix ./hosts/personal/satori.nix
inputs.agenix.nixosModules.age inputs.agenix.nixosModules.age
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager

25
home/config/xmonad/xmonad.hs
View File

@@ -12,6 +12,8 @@ import XMonad.Layout.ThreeColumns
import XMonad.Layout.ResizableTile import XMonad.Layout.ResizableTile
import XMonad.Hooks.ManageDocks import XMonad.Hooks.ManageDocks
import XMonad.Util.Run (spawnPipe) import XMonad.Util.Run (spawnPipe)
import XMonad.Actions.FloatKeys (keysMoveWindow,
keysResizeWindow)
import Graphics.X11.ExtraTypes.XF86 import Graphics.X11.ExtraTypes.XF86
import qualified XMonad.StackSet as W import qualified XMonad.StackSet as W
import qualified Data.Map as M import qualified Data.Map as M
@@ -123,16 +125,28 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
windows W.swapUp ) windows W.swapUp )
, ((mod1Mask, xK_m), , ((mod1Mask, xK_m),
sendMessage Shrink) withFocused (keysResizeWindow (-20, 0) (0, 0)))
, ((mod1Mask, xK_i), , ((mod1Mask, xK_i),
sendMessage Expand) withFocused (keysResizeWindow (20, 0) (0, 0)))
, ((mod1Mask, xK_n), , ((mod1Mask, xK_n),
sendMessage MirrorShrink) withFocused (keysResizeWindow (0, 20) (0, 0)))
, ((mod1Mask, xK_e), , ((mod1Mask, xK_e),
sendMessage MirrorExpand) withFocused (keysResizeWindow (0, -20) (0, 0)))
, ((mod1Mask .|. shiftMask, xK_m),
withFocused (keysMoveWindow (-40, 0)))
, ((mod1Mask .|. shiftMask, xK_i),
withFocused (keysMoveWindow (40, 0)))
, ((mod1Mask .|. shiftMask, xK_n),
withFocused (keysMoveWindow (0, 40)))
, ((mod1Mask .|. shiftMask, xK_e),
withFocused (keysMoveWindow (0, -40)))
, ((modMask, xK_t), , ((modMask, xK_t),
withFocused $ windows . W.sink) withFocused $ windows . W.sink)
@@ -154,8 +168,9 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
| (i, k) <- zip (XMonad.workspaces conf) [xK_1 .. xK_9] | (i, k) <- zip (XMonad.workspaces conf) [xK_1 .. xK_9]
, (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]] , (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]]
myLayoutHook = smartSpacing 8 $ smartBorders $ avoidStruts ( myLayoutHook = smartSpacing 8 $ smartBorders $ avoidStruts (
spiral (1/1) ||| spiral (6/7) |||
tabbed shrinkText tabConfig ||| tabbed shrinkText tabConfig |||
ThreeCol 1 (3/100) (1/2) ||| ThreeCol 1 (3/100) (1/2) |||
Tall 1 (3/100) (1/2) ||| Tall 1 (3/100) (1/2) |||

BIN
home/secrets/.zshrc.age
View File

Binary file not shown.

13
hosts/personal/satori/boot.nix
View File

@@ -4,9 +4,17 @@
boot = { boot = {
# kernelPackages = pkgs.linuxPackages_lqx; # kernelPackages = pkgs.linuxPackages_lqx;
initrd={ initrd={
availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod"]; availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "vfio-pci"];
kernelModules = [ ]; /* preDeviceCommands = ''
DEVS="0000:01:00.0 0000:01:00.1 0000:01:00.2 0000:01:00.3"
for DEV in $DEVS; do
echo "vfio-pci" > /sys/bus/pci/devices/$DEV/driver_override
done
modprobe -i vfio-pci
'';*/
kernelModules = [];
}; };
kernelParams = [ "nvidia-drm.modeset=1" "intel_pstate=active" "intel_iommu=on" ];
kernelModules = [ "kvm-intel"]; kernelModules = [ "kvm-intel"];
extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ]; extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
loader = { loader = {
@@ -24,6 +32,5 @@
configurationName = "nixbruh"; configurationName = "nixbruh";
}; };
}; };
kernelParams = [ "nvidia-drm.modeset=1" "intel_pstate=active" ];
}; };
} }

7
hosts/personal/satori/networking.nix
View File

@@ -4,9 +4,10 @@
networking = { networking = {
hostName = "Satori"; hostName = "Satori";
wireless.enable = true; wireless.enable = true;
wireless.interfaces = [ "wlp0s20f3" ];
firewall = { firewall = {
allowedTCPPorts = [ 22 ]; allowedTCPPorts = [ 22 18172 ];
allowedUDPPorts = [ 17840 ]; allowedUDPPorts = [ 22 17840 18172 ];
}; };
interfaces = { interfaces = {
enp7s0.useDHCP = true; enp7s0.useDHCP = true;
@@ -21,7 +22,7 @@
wireguard.interfaces.wg0 = { wireguard.interfaces.wg0 = {
ips = [ "10.55.0.3/32" ]; ips = [ "10.55.0.3/32" ];
listenPort = 17840; listenPort = 17840;
privateKeyFile = "/var/secrets/wg.key"; privateKeyFile = "/var/wg";
peers = [ peers = [
{ {
#Oracle VM1 #Oracle VM1

3
hosts/personal/satori/pkgs.nix
View File

@@ -18,6 +18,7 @@
gcc gcc
rustc rustc
jdk jdk
virtmanager
]; ];
programs = { programs = {
@@ -77,5 +78,7 @@
experimental-features = nix-command ca-references flakes experimental-features = nix-command ca-references flakes
''; '';
trustedUsers = [ "root" "natto" ]; trustedUsers = [ "root" "natto" ];
# binaryCaches = ["http://152.67.11.101/" "https://cache.nixos.org/"];
# binaryCachePublicKeys = ["152.67.11.101:lbEG3jz8pB5IxxjCQcZwS1a85XK5HIYN7g2E9Zw0r1M="];
}; };
} }

39
hosts/personal/satori/services.nix
View File

@@ -15,42 +15,10 @@
services = { services = {
tor.enable = true; tor.enable = true;
logmein-hamachi.enable = true; logmein-hamachi.enable = true;
mysql = {
enable = true;
package = pkgs.mysql;
dataDir = "/var/db";
};
openssh = { openssh = {
enable = true; enable = true;
permitRootLogin = "yes"; permitRootLogin = "yes";
}; };
vault-agent = {
enable = true;
settings = {
vault = {
address = "https://10.55.0.2:8800";
client_cert = "/var/vault/cert.pem";
client_key = "/var/vault/key.pem";
};
auto_auth = {
method = [
{
"cert" = {
name = "Satori";
};
}
];
};
template = [
{
source = pkgs.writeText "wg.tpl" ''
{{ with secret "kv/systems/Satori/wg" }}{{ .Data.data.private }}{{ end }}
'';
destination = "/var/secrets/wg.key";
}
];
};
};
btrfs.autoScrub.enable = true; btrfs.autoScrub.enable = true;
udev.extraRules = '' udev.extraRules = ''
ACTION=="add|change", KERNEL=="sda", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="bfq" ACTION=="add|change", KERNEL=="sda", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="bfq"
@@ -60,9 +28,14 @@
tor.wantedBy = lib.mkForce []; tor.wantedBy = lib.mkForce [];
logmein-hamachi.wantedBy = lib.mkForce []; logmein-hamachi.wantedBy = lib.mkForce [];
openssh.wantedBy = lib.mkForce []; openssh.wantedBy = lib.mkForce [];
mysql.wantedBy = lib.mkForce [];
#printing.wantedBy = lib.mkForce []; #printing.wantedBy = lib.mkForce [];
#vault.wantedBy = lib.mkForce []; #vault.wantedBy = lib.mkForce [];
}; };
security.pki.certificateFiles = [ ../../../cert.pem ]; security.pki.certificateFiles = [ ../../../cert.pem ];
/* virtualisation.libvirtd = {
enable = true;
onBoot = "ignore";
onShutdown = "shutdown";
qemuRunAsRoot = false;
};*/
} }

2
hosts/personal/satori/stuff.nix
View File

@@ -32,7 +32,7 @@
isNormalUser = true; isNormalUser = true;
shell = pkgs.zsh; shell = pkgs.zsh;
home = "/home/natto"; home = "/home/natto";
extraGroups = [ "wheel" "adbusers" "video" ]; extraGroups = [ "wheel" "adbusers" "video" "libvirtd" ];
}; };
i18n.inputMethod = { i18n.inputMethod = {
# enabled = "fcitx5"; # enabled = "fcitx5";