diff options
| -rw-r--r-- | flake.lock | 54 | ||||
| -rw-r--r-- | fw/configuration.nix | 1 | ||||
| -rw-r--r-- | fw/home.nix | 1 | ||||
| -rw-r--r-- | modules/email/default.nix | 2 | ||||
| -rw-r--r-- | modules/foot.nix | 2 | ||||
| -rw-r--r-- | modules/neovim/default.nix | 90 | ||||
| -rw-r--r-- | modules/neovim/nvim/after/ftplugin/markdown.lua | 4 | ||||
| -rw-r--r-- | modules/neovim/nvim/lua/config/colorscheme.lua | 66 | ||||
| -rw-r--r-- | modules/sway/default.nix | 7 |
9 files changed, 118 insertions, 109 deletions
@@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", "type": "github" }, "original": { @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1771102945, - "narHash": "sha256-e5NfW8NhC3qChR8bHVni/asrig/ZFzd1wzpq+cEE/tg=", + "lastModified": 1773810247, + "narHash": "sha256-6Vz1Thy/1s7z+Rq5OfkWOBAdV4eD+OrvDs10yH6xJzQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "ff5e5d882c51f9a032479595cbab40fd04f56399", + "rev": "d47357a4c806d18a3e853ad2699eaec3c01622e7", "type": "github" }, "original": { @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1765963789, - "narHash": "sha256-wYmAe8kXOPo9pI3i/vW89oexk5/9pr/gNT5bAx40ss4=", + "lastModified": 1772053451, + "narHash": "sha256-fNJAWkUoXOw5pRZ15rtl6igpxWBSCqHgWbP1VstOHXw=", "owner": "msanft", "repo": "ida-pro-overlay", - "rev": "1973e45d8b4fc1b39b34bb34aa03cd22c1cf401d", + "rev": "d1dbab124923214cf384d1548e86aec3fbb546a9", "type": "github" }, "original": { @@ -88,11 +88,11 @@ ] }, "locked": { - "lastModified": 1771113898, - "narHash": "sha256-0t6wai1op7OUc4mAhM4BYIbfQMvYmMhW2jXP2VQ0/KA=", + "lastModified": 1773792437, + "narHash": "sha256-xjL22RjFqfN3D4dglBt0PTEFLl1rvN60f6LtHX8kQJs=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "5e829d6d57633d5d56a0f351564331fca40d507b", + "rev": "7f54fc34e0ff994dff6494f074979ad6e4a0eba4", "type": "github" }, "original": { @@ -104,11 +104,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1771089488, - "narHash": "sha256-xHSWR7wo4GiZVWAoBlD4f2szoftfoxOCqlOu1UBL9Wc=", + "lastModified": 1773789001, + "narHash": "sha256-V4hVxVeHk+ZdlaRpssBu6q9G3++WwxBco5MZVTL9E/I=", "owner": "neovim", "repo": "neovim", - "rev": "8ab511bba524bcd5b5913d1b1205b5e4fe3f7210", + "rev": "1d776d909f54dd6298710d50f72e25972b6755bf", "type": "github" }, "original": { @@ -140,11 +140,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1770882871, - "narHash": "sha256-nw5g+xl3veea+maxJ2/81tMEA/rPq9aF1H5XF35X+OE=", + "lastModified": 1773533765, + "narHash": "sha256-qonGfS2lzCgCl59Zl63jF6dIRRpvW3AJooBGMaXjHiY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "af04cb78aa85b2a4d1c15fc7270347e0d0eda97b", + "rev": "f8e82243fd601afb9f59ad230958bd073795cbfe", "type": "github" }, "original": { @@ -156,11 +156,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1771008912, - "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", + "lastModified": 1773734432, + "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a82ccc39b39b621151d6732718e3e250109076fa", + "rev": "cda48547b432e8d3b18b4180ba07473762ec8558", "type": "github" }, "original": { @@ -172,11 +172,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "lastModified": 1772542754, + "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4", "type": "github" }, "original": { @@ -233,11 +233,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1771036703, - "narHash": "sha256-tfKkIWZQBpevF03/8m1yEKbkNUCr01MV48lkx+353I4=", + "lastModified": 1773856794, + "narHash": "sha256-0xeVFhISsfSX6pEFp9PIIgC8POVMZAWtvZXLh/+gCMs=", "owner": "vicinaehq", "repo": "vicinae", - "rev": "586bb62d2ed6aaa9d4dbd0440955e41cc9a3be1f", + "rev": "bbaeb53cf4e017f5255d4d4aa5536f79b699303e", "type": "github" }, "original": { diff --git a/fw/configuration.nix b/fw/configuration.nix index 34ae73e..70a76ec 100644 --- a/fw/configuration.nix +++ b/fw/configuration.nix @@ -23,7 +23,6 @@ ]; services.openssh.enable = true; - programs.light.enable = true; services.xserver = { enable = true; displayManager = { diff --git a/fw/home.nix b/fw/home.nix index 1e7fc63..f905e76 100644 --- a/fw/home.nix +++ b/fw/home.nix @@ -29,7 +29,6 @@ extraPackages = with pkgs; [ wmenu cmatrix - wayneko pfetch nicotine-plus mpc diff --git a/modules/email/default.nix b/modules/email/default.nix index 4b8beec..08a141f 100644 --- a/modules/email/default.nix +++ b/modules/email/default.nix @@ -27,6 +27,8 @@ in }; imap = { host = "imap.s00.xyz"; + port = 993; + tls.enable = true; }; smtp = { host = "smtp.s00.xyz"; diff --git a/modules/foot.nix b/modules/foot.nix index b07b94c..8a5bbf2 100644 --- a/modules/foot.nix +++ b/modules/foot.nix @@ -36,7 +36,7 @@ in blink = "no"; }; - colors = { + colors-dark = { # alpha=0.7; cursor = (fmt scheme.base00) + " " + (fmt scheme.base05); foreground = fmt scheme.base05; diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix index 1b9e345..606e012 100644 --- a/modules/neovim/default.nix +++ b/modules/neovim/default.nix @@ -115,6 +115,7 @@ in nvim-treesitter-parsers.mlir nvim-treesitter-parsers.starlark nvim-treesitter-context + nvim-treesitter-parsers.asm nvim-treesitter-textobjects @@ -277,49 +278,52 @@ in } ]; extraLuaConfig = - # lua - '' - ${builtins.readFile ./nvim/init.lua} - require('tinted-nvim').setup({ - compile = true, - default_scheme = "base24-system-theme", - capabilities = { - undercurl = true, - }, - styles = { - comments = { italic = false }, - }, - schemes = { - ["base24-system-theme"] = { - variant = "${if scheme.light then "light" else "dark"}", - base00 = "${scheme.base00}", - base01 = "${scheme.base01}", - base02 = "${scheme.base02}", - base03 = "${scheme.base03}", - base04 = "${scheme.base04}", - base05 = "${scheme.base05}", - base06 = "${scheme.base06}", - base07 = "${scheme.base07}", - base08 = "${scheme.base08}", - base09 = "${scheme.base09}", - base0A = "${scheme.base0A}", - base0B = "${scheme.base0B}", - base0C = "${scheme.base0C}", - base0D = "${scheme.base0D}", - base0E = "${scheme.base0E}", - base0F = "${scheme.base0F}", - base10 = "${scheme.base10}", - base11 = "${scheme.base11}", - base12 = "${scheme.base12}", - base13 = "${scheme.base13}", - base14 = "${scheme.base14}", - base15 = "${scheme.base15}", - base16 = "${scheme.base16}", - base17 = "${scheme.base17}", - }, - }, - }) - vim.cmd[[doautocmd ColorScheme]] + # lua + '' + package.preload["tinted-colorscheme"] = function() + error(debug.traceback("Something required tinted-colorscheme")) + end + ${builtins.readFile ./nvim/init.lua} + require('tinted-nvim').setup({ + compile = false, + default_scheme = "base24-system-theme", + capabilities = { + undercurl = true, + }, + styles = { + comments = { italic = false }, + }, + schemes = { + ["base24-system-theme"] = { + variant = "${if scheme.light then "light" else "dark"}", + base00 = "${scheme.base00}", + base01 = "${scheme.base01}", + base02 = "${scheme.base02}", + base03 = "${scheme.base03}", + base04 = "${scheme.base04}", + base05 = "${scheme.base05}", + base06 = "${scheme.base06}", + base07 = "${scheme.base07}", + base08 = "${scheme.base08}", + base09 = "${scheme.base09}", + base0A = "${scheme.base0A}", + base0B = "${scheme.base0B}", + base0C = "${scheme.base0C}", + base0D = "${scheme.base0D}", + base0E = "${scheme.base0E}", + base0F = "${scheme.base0F}", + base10 = "${scheme.base10}", + base11 = "${scheme.base11}", + base12 = "${scheme.base12}", + base13 = "${scheme.base13}", + base14 = "${scheme.base14}", + base15 = "${scheme.base15}", + base16 = "${scheme.base16}", + base17 = "${scheme.base17}", + }, + }, + }) + -- vim.cmd[[doautocmd ColorScheme]] vim.opt.runtimepath:prepend('${tsparsers}') ''; diff --git a/modules/neovim/nvim/after/ftplugin/markdown.lua b/modules/neovim/nvim/after/ftplugin/markdown.lua index 849f933..3cc5d65 100644 --- a/modules/neovim/nvim/after/ftplugin/markdown.lua +++ b/modules/neovim/nvim/after/ftplugin/markdown.lua @@ -2,8 +2,8 @@ vim.opt.wrap = true vim.opt.number = false vim.opt.relativenumber = false -vim.keymap.set({'n', 'v'}, 'n', 'g<Down>', { buffer = true }) -vim.keymap.set({'n', 'v'}, 'e', 'g<Up>', { buffer = true }) +vim.keymap.set({'n', 'v'}, '<C-n>', 'g<Down>', { buffer = true }) +vim.keymap.set({'n', 'v'}, '<C-p>', 'g<Up>', { buffer = true }) vim.opt.statusline="%f" vim.opt_local.conceallevel=3 diff --git a/modules/neovim/nvim/lua/config/colorscheme.lua b/modules/neovim/nvim/lua/config/colorscheme.lua index b6bd545..b49a24d 100644 --- a/modules/neovim/nvim/lua/config/colorscheme.lua +++ b/modules/neovim/nvim/lua/config/colorscheme.lua @@ -2,42 +2,44 @@ vim.api.nvim_create_autocmd("ColorScheme", { callback = function(args) -- local colors = require('base16-colorscheme').colors local colors = require("tinted-nvim").get_palette() -- i dislike syntax highlighting - -- vim.api.nvim_set_hl(0, 'Comment', {}) - vim.api.nvim_set_hl(0, 'Constant', {}) - -- vim.api.nvim_set_hl(0, 'String', {}) - vim.api.nvim_set_hl(0, 'Character', { link = "String" }) - vim.api.nvim_set_hl(0, 'Number', {}) - vim.api.nvim_set_hl(0, 'Boolean', {}) - vim.api.nvim_set_hl(0, 'Float', {}) - vim.api.nvim_set_hl(0, 'Identifier', {}) - vim.api.nvim_set_hl(0, 'Function', {}) - vim.api.nvim_set_hl(0, 'Statement', {}) - vim.api.nvim_set_hl(0, 'Conditional', {}) - vim.api.nvim_set_hl(0, 'Repeat', {}) - vim.api.nvim_set_hl(0, 'Label', {}) - vim.api.nvim_set_hl(0, 'Operator', {}) - vim.api.nvim_set_hl(0, 'Keyword', {}) - vim.api.nvim_set_hl(0, 'Exception', {}) - vim.api.nvim_set_hl(0, 'PreProc', {}) - vim.api.nvim_set_hl(0, 'Include', {}) - vim.api.nvim_set_hl(0, 'Define', {}) - vim.api.nvim_set_hl(0, 'Macro', {}) - vim.api.nvim_set_hl(0, 'PreCondit', {}) - vim.api.nvim_set_hl(0, 'Type', {}) - vim.api.nvim_set_hl(0, 'StorageClass', {}) - vim.api.nvim_set_hl(0, 'Structure', {}) - vim.api.nvim_set_hl(0, 'Typedef', {}) - vim.api.nvim_set_hl(0, 'Special', {}) - vim.api.nvim_set_hl(0, 'SpecialChar', { link = 'String' }) - vim.api.nvim_set_hl(0, 'Tag', {}) - vim.api.nvim_set_hl(0, 'Delimiter', {}) - -- vim.api.nvim_set_hl(0, 'SpecialComment', {}) - vim.api.nvim_set_hl(0, 'Debug', {}) - -- vim.api.nvim_set_hl(0, 'Underlined', {}) + -- vim.api.nvim_set_hl(0, 'Constant', {}) + -- vim.api.nvim_set_hl(0, 'Character', { link = "String" }) + -- vim.api.nvim_set_hl(0, 'Number', {}) + -- vim.api.nvim_set_hl(0, 'Boolean', {}) + -- vim.api.nvim_set_hl(0, 'Float', {}) + -- vim.api.nvim_set_hl(0, 'Identifier', {}) + -- vim.api.nvim_set_hl(0, 'Function', {}) + -- vim.api.nvim_set_hl(0, 'Statement', {}) + -- vim.api.nvim_set_hl(0, 'Conditional', {}) + -- vim.api.nvim_set_hl(0, 'Repeat', {}) + -- vim.api.nvim_set_hl(0, 'Label', {}) + -- vim.api.nvim_set_hl(0, 'Operator', {}) + -- vim.api.nvim_set_hl(0, 'Keyword', {}) + -- vim.api.nvim_set_hl(0, 'Exception', {}) + -- vim.api.nvim_set_hl(0, 'PreProc', {}) + -- vim.api.nvim_set_hl(0, 'Include', {}) + -- vim.api.nvim_set_hl(0, 'Define', {}) + -- vim.api.nvim_set_hl(0, 'Macro', {}) + -- vim.api.nvim_set_hl(0, 'PreCondit', {}) + -- vim.api.nvim_set_hl(0, 'Type', {}) + -- vim.api.nvim_set_hl(0, 'StorageClass', {}) + -- vim.api.nvim_set_hl(0, 'Structure', {}) + -- vim.api.nvim_set_hl(0, 'Typedef', {}) + -- vim.api.nvim_set_hl(0, 'Special', {}) + -- vim.api.nvim_set_hl(0, 'SpecialChar', { link = 'String' }) + -- vim.api.nvim_set_hl(0, 'Tag', {}) + -- vim.api.nvim_set_hl(0, 'Delimiter', {}) + -- vim.api.nvim_set_hl(0, 'Debug', {}) vim.api.nvim_set_hl(0, 'FloatBorder', { fg = colors.base01 }) vim.api.nvim_set_hl(0, 'WinSeparator', { fg = colors.base01 }) vim.api.nvim_set_hl(0, 'WinBar', { fg = colors.base03 }) vim.api.nvim_set_hl(0, 'LineNr', { fg = colors.base02 }) + + -- STUFF THAT WAS ALREADY COMMENTED + -- vim.api.nvim_set_hl(0, 'Comment', {}) + -- vim.api.nvim_set_hl(0, 'String', {}) + -- vim.api.nvim_set_hl(0, 'Underlined', {}) + -- vim.api.nvim_set_hl(0, 'SpecialComment', {}) -- vim.api.nvim_set_hl(0, 'LineNrAbove', { fg = colors.base02 }) -- vim.api.nvim_set_hl(0, 'LineNrBelow', { fg = colors.base02 }) -- vim.api.nvim_set_hl(0, 'TSVariable', { fg = colors.base05 }) diff --git a/modules/sway/default.nix b/modules/sway/default.nix index 7ff9b37..2f90122 100644 --- a/modules/sway/default.nix +++ b/modules/sway/default.nix @@ -47,6 +47,7 @@ in autotiling pamixer killall + brightnessctl ]; home.sessionVariables.NIXOS_OZONE_WL="1"; wayland.windowManager.sway = lib.mkIf cfg.enable { @@ -300,8 +301,10 @@ in "--locked XF86AudioLowerVolume" = "exec pamixer -ud 2 && pamixer --get-volume > $WOBSOCK && killall -s USR1 -r py3status"; "--locked XF86AudioMute" = ''exec pamixer --toggle-mute && ( [ "$(pamixer --get-mute)" = "true" ] && echo 0 > $WOBSOCK ) || pamixer --get-volume > $WOBSOCK && killall -s USR1 -r py3status''; - "--locked XF86MonBrightnessUp" = "exec light -A 5 && light -G | cut -d'.' -f1 > $WOBSOCK"; - "--locked XF86MonBrightnessDown" = "exec light -U 5 && light -G | cut -d'.' -f1 > $WOBSOCK"; + "--locked XF86MonBrightnessUp" = "exec brightnessctl set 5%+ && brightnessctl -m | cut -d',' -f4 | tr -d '%' > $WOBSOCK"; + "--locked XF86MonBrightnessDown" = "exec brightnessctl set 5%- && brightnessctl -m | cut -d',' -f4 | tr -d '%' > $WOBSOCK"; + # "--locked XF86MonBrightnessUp" = "exec light -A 5 && light -G | cut -d'.' -f1 > $WOBSOCK"; + # "--locked XF86MonBrightnessDown" = "exec light -U 5 && light -G | cut -d'.' -f1 > $WOBSOCK"; }; startup = cfg.startup; |