mirror of
https://github.com/kittywitch/nixfiles.git
synced 2026-02-10 04:49:19 -08:00
dev environment work, moved to alacritty, matrix logging change
This commit is contained in:
parent
43f828b99a
commit
8b19689060
9 changed files with 63 additions and 33 deletions
|
|
@ -114,6 +114,7 @@
|
|||
".config/hedgedoc"
|
||||
".gnupg"
|
||||
".mozilla"
|
||||
"neorg"
|
||||
"docs"
|
||||
"media"
|
||||
"mail"
|
||||
|
|
|
|||
|
|
@ -38,11 +38,11 @@ let cfg = config.kw.theme; in
|
|||
font = {
|
||||
name = mkOption {
|
||||
type = types.str;
|
||||
default = "Fira Code";
|
||||
default = "Iosevka";
|
||||
};
|
||||
termName = mkOption {
|
||||
type = types.str;
|
||||
default = cfg.font.name;
|
||||
default = "Iosevka Term";
|
||||
};
|
||||
size = mkOption {
|
||||
type = types.float;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
};
|
||||
|
||||
fonts.fonts = with pkgs; [
|
||||
fira-code
|
||||
iosevka
|
||||
font-awesome
|
||||
cozette
|
||||
twitter-color-emoji
|
||||
|
|
|
|||
|
|
@ -53,30 +53,28 @@ with lib;
|
|||
max_upload_size = "512M";
|
||||
logConfig = ''
|
||||
version: 1
|
||||
|
||||
# In systemd's journal, loglevel is implicitly stored, so let's omit it
|
||||
# from the message text.
|
||||
formatters:
|
||||
journal_fmt:
|
||||
format: '%(name)s: [%(request)s] %(message)s'
|
||||
|
||||
precise:
|
||||
format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
|
||||
filters:
|
||||
context:
|
||||
(): synapse.util.logcontext.LoggingContextFilter
|
||||
request: ""
|
||||
|
||||
context:
|
||||
(): synapse.util.logcontext.LoggingContextFilter
|
||||
request: ""
|
||||
handlers:
|
||||
journal:
|
||||
class: systemd.journal.JournalHandler
|
||||
formatter: journal_fmt
|
||||
filters: [context]
|
||||
SYSLOG_IDENTIFIER: synapse
|
||||
|
||||
root:
|
||||
console:
|
||||
class: logging.StreamHandler
|
||||
formatter: precise
|
||||
filters: [context]
|
||||
loggers:
|
||||
synapse:
|
||||
level: WARNING
|
||||
handlers: [journal]
|
||||
|
||||
disable_existing_loggers: False
|
||||
synapse.storage.SQL:
|
||||
# beware: increasing this to DEBUG will make synapse log sensitive
|
||||
# information such as access tokens.
|
||||
level: WARNING
|
||||
root:
|
||||
level: WARNING
|
||||
handlers: [console]
|
||||
'';
|
||||
server_name = config.network.dns.domain;
|
||||
app_service_config_files = [
|
||||
|
|
|
|||
|
|
@ -16,10 +16,12 @@ let
|
|||
};
|
||||
in
|
||||
{
|
||||
home.packages = [ doom-emacs pkgs.sqlite ];
|
||||
config = mkIf ((builtins.getEnv "CI_ENV") != "") {
|
||||
home.packages = [ doom-emacs pkgs.sqlite ];
|
||||
|
||||
home.file.".emacs.d/init.el".text = ''
|
||||
(load "default.el")
|
||||
(load-theme 'base16-${lib.elemAt (lib.splitString "." config.base16.alias.default) 1} t)
|
||||
'';
|
||||
home.file.".emacs.d/init.el".text = ''
|
||||
(load "default.el")
|
||||
(load-theme 'base16-${lib.elemAt (lib.splitString "." config.base16.alias.default) 1} t)
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{ ... }: {
|
||||
excludes = [
|
||||
"emacs"
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,8 +39,14 @@ in
|
|||
'';
|
||||
plugins = with pkgs.vimPlugins; [
|
||||
neorg
|
||||
nvim-cmp
|
||||
plenary-nvim
|
||||
nvim-base16
|
||||
nvim-treesitter
|
||||
nvim-web-devicons
|
||||
telescope-nvim
|
||||
(nvim-treesitter.withPlugins (
|
||||
plugins: with plugins; pkgs.tree-sitter.allGrammars
|
||||
))
|
||||
nvim-ts-rainbow
|
||||
coc-yaml
|
||||
coc-git
|
||||
|
|
|
|||
|
|
@ -1,6 +1,21 @@
|
|||
lua << EOF
|
||||
require'nvim-treesitter.configs'.setup {
|
||||
ensure_installed = "maintained", -- one of "all", "maintained" (parsers with maintainers), or a list of languages
|
||||
local cmp = require'cmp'
|
||||
cmp.setup({
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
vim.fn["vsnip#anonymous"](args.body)
|
||||
end,
|
||||
},
|
||||
mapping = {
|
||||
['<C-y>'] = cmp.mapping.confirm({ select = true }),
|
||||
},
|
||||
sources = {
|
||||
{ name = 'neorg' },
|
||||
}
|
||||
})
|
||||
|
||||
require('nvim-treesitter.configs').setup {
|
||||
ensure_installed = "all", -- one of "all", "maintained" (parsers with maintainers), or a list of languages
|
||||
ignore_install = { }, -- List of parsers to ignore installing
|
||||
highlight = {
|
||||
enable = true,
|
||||
|
|
@ -22,11 +37,17 @@ require'nvim-treesitter.configs'.setup {
|
|||
["core.norg.concealer"] = {}, -- Allows for use of icons
|
||||
["core.norg.dirman"] = { -- Manage your directories with Neorg
|
||||
config = {
|
||||
engine = "nvim-cmp",
|
||||
workspaces = {
|
||||
my_workspace = "~/neorg"
|
||||
home = "~/neorg"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
}
|
||||
EOF
|
||||
|
||||
nnoremap <leader>ff <cmd>Telescope find_files<cr>
|
||||
nnoremap <leader>fg <cmd>Telescope live_grep<cr>
|
||||
nnoremap <leader>fb <cmd>Telescope buffers<cr>
|
||||
nnoremap <leader>fh <cmd>Telescope help_tags<cr>
|
||||
|
|
|
|||
|
|
@ -9,6 +9,9 @@
|
|||
font.name = config.kw.theme.font.termName;
|
||||
settings = {
|
||||
font_size = toString config.kw.theme.font.size;
|
||||
bold_font = "auto";
|
||||
italic_font = "auto";
|
||||
bold_italic_font = "auto";
|
||||
background_opacity = "0.9";
|
||||
disable_ligatures = "cursor";
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue