From ac43221eec4e79c68a293631f439e723d8f39baa Mon Sep 17 00:00:00 2001 From: materus Date: Thu, 18 Jun 2026 17:29:42 +0200 Subject: [PATCH] common: restructure config, update tmux and wezterm --- config/shell/zsh/.zshrc | 4 +- config/terminal/wezterm/wezterm.lua | 3 +- config/tmux/tmux.conf | 1 + flake.lock | 84 +++++++++--------- flake.nix | 4 +- .../host/materusPC/home-manager/materus.nix | 1 + nix-config/host/materusPC/services.nix | 3 +- nix-config/shared/default.nix | 17 ++-- nix-config/shared/hm/default.nix | 4 + nix-config/shared/hm/nvim.nix | 39 ++++++++ nix-config/shared/nvim.nix | 48 ---------- nix-config/shared/os/default.nix | 4 + nix-config/shared/private/variables.nix | Bin 897 -> 904 bytes 13 files changed, 111 insertions(+), 101 deletions(-) create mode 100644 nix-config/shared/hm/default.nix create mode 100644 nix-config/shared/hm/nvim.nix delete mode 100644 nix-config/shared/nvim.nix create mode 100644 nix-config/shared/os/default.nix diff --git a/config/shell/zsh/.zshrc b/config/shell/zsh/.zshrc index b7eb701..7b8ed73 100644 --- a/config/shell/zsh/.zshrc +++ b/config/shell/zsh/.zshrc @@ -132,8 +132,8 @@ if [[ $(whence -p "eza") ]]; then alias ll="eza -alF --color=auto --hyperlink" alias ls="eza --color=auto" else - alias l="ls -lah --color=auto --hyperlink" - alias ll="ls -alF --color=auto --hyperlink" + alias l="ls -lah --color=auto" + alias ll="ls -alF --color=auto" alias ls="ls --color=auto" fi diff --git a/config/terminal/wezterm/wezterm.lua b/config/terminal/wezterm/wezterm.lua index 8aff2af..9235cfb 100644 --- a/config/terminal/wezterm/wezterm.lua +++ b/config/terminal/wezterm/wezterm.lua @@ -1,8 +1,9 @@ local wezterm = require 'wezterm' local config = wezterm.config_builder() +-- config.color_scheme = 'Duotone Dark' + config.enable_scroll_bar = true config.scrollback_lines = 50000 - return config \ No newline at end of file diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf index acdb704..6cb9368 100644 --- a/config/tmux/tmux.conf +++ b/config/tmux/tmux.conf @@ -9,3 +9,4 @@ setw -g mouse on setw -g clock-mode-style 24 set -ga terminal-overrides ',xterm*:smcup@:rmcup@' +set -g allow-passthrough on diff --git a/flake.lock b/flake.lock index f6d12af..8fffe0a 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1781534792, - "narHash": "sha256-ZH9sr0MtoqonoEDWUQhO7kSbDDn+NIoglhAXpPVb3pg=", + "lastModified": 1781786549, + "narHash": "sha256-IIbSs+b6MTmgjhQ5kC4MAcMpHgLvXNhpSMnyTiNVrZ4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4e006e9741eff4cb4b02545c904a4ff3e9897b1e", + "rev": "2a564fc31d2f77b26f1a180589599afe756f74a6", "type": "github" }, "original": { @@ -114,11 +114,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1781534792, - "narHash": "sha256-ZH9sr0MtoqonoEDWUQhO7kSbDDn+NIoglhAXpPVb3pg=", + "lastModified": 1781786549, + "narHash": "sha256-IIbSs+b6MTmgjhQ5kC4MAcMpHgLvXNhpSMnyTiNVrZ4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4e006e9741eff4cb4b02545c904a4ff3e9897b1e", + "rev": "2a564fc31d2f77b26f1a180589599afe756f74a6", "type": "github" }, "original": { @@ -370,11 +370,11 @@ ] }, "locked": { - "lastModified": 1781533608, - "narHash": "sha256-Mgsu/x5cs8EqlhIQ7bMBo14LpkAYtgzDbG/S/eattJA=", + "lastModified": 1781788787, + "narHash": "sha256-YqlTCRRhGvNjcJejPeMuHrYQ/TVhOO2MV/nEGMWb8nk=", "owner": "nix-community", "repo": "home-manager", - "rev": "8aec76cc1e045f37b55d82ca3cee4910ae04d3db", + "rev": "d456f483f157d4b706416005da226234b9c116ff", "type": "github" }, "original": { @@ -448,11 +448,11 @@ ] }, "locked": { - "lastModified": 1781499522, - "narHash": "sha256-41T+jXsG5FusLGed0GwviF42t4wFuriXL/m9BR4FrqA=", + "lastModified": 1781756886, + "narHash": "sha256-O19FRVtXC+2fNkbIlwssYVay284ynwEK9QAvHAVTLFA=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "37d164940d9db2188b3d12ab1cd5206494ea4ac1", + "rev": "092eb7e14b6950afb62ad4b0bc2532a122d206e0", "type": "github" }, "original": { @@ -470,11 +470,11 @@ ] }, "locked": { - "lastModified": 1781499522, - "narHash": "sha256-41T+jXsG5FusLGed0GwviF42t4wFuriXL/m9BR4FrqA=", + "lastModified": 1781756886, + "narHash": "sha256-O19FRVtXC+2fNkbIlwssYVay284ynwEK9QAvHAVTLFA=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "37d164940d9db2188b3d12ab1cd5206494ea4ac1", + "rev": "092eb7e14b6950afb62ad4b0bc2532a122d206e0", "type": "github" }, "original": { @@ -497,11 +497,11 @@ "nur": "nur" }, "locked": { - "lastModified": 1781461917, - "narHash": "sha256-OvdeYLUcCfLqsGrZbU30JhAhYBbxDrWquehflQhWwPc=", + "lastModified": 1781796426, + "narHash": "sha256-QEWeBiAJcPS4rBdEUoatYKFtMxRNobZyPS68xVZ8c60=", "owner": "materusPL", "repo": "Nixerus", - "rev": "be078046d0aea8a5d3f5b7f30fe9850425b24be8", + "rev": "b8eb02bb22b15d60fd9634f039a6b2075cf5cd1e", "type": "github" }, "original": { @@ -524,11 +524,11 @@ "nur": "nur_3" }, "locked": { - "lastModified": 1781461917, - "narHash": "sha256-OvdeYLUcCfLqsGrZbU30JhAhYBbxDrWquehflQhWwPc=", + "lastModified": 1781796426, + "narHash": "sha256-QEWeBiAJcPS4rBdEUoatYKFtMxRNobZyPS68xVZ8c60=", "owner": "materusPL", "repo": "Nixerus", - "rev": "be078046d0aea8a5d3f5b7f30fe9850425b24be8", + "rev": "b8eb02bb22b15d60fd9634f039a6b2075cf5cd1e", "type": "github" }, "original": { @@ -543,11 +543,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1781168557, - "narHash": "sha256-LOnLQ2tpYF9gqIDDr3+j3DbpJJr/QCH6zPRT2GzEUOE=", + "lastModified": 1781622756, + "narHash": "sha256-JrPh4M6S7aPsEE9tOENuZrxC6o2szSLlK+t4+nLke9s=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6358ff76821101c178e3ab4919a62799bfe3652e", + "rev": "08018c72174a4df5657f8d94178ac69fb9c243e5", "type": "github" }, "original": { @@ -562,11 +562,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1781168557, - "narHash": "sha256-LOnLQ2tpYF9gqIDDr3+j3DbpJJr/QCH6zPRT2GzEUOE=", + "lastModified": 1781622756, + "narHash": "sha256-JrPh4M6S7aPsEE9tOENuZrxC6o2szSLlK+t4+nLke9s=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6358ff76821101c178e3ab4919a62799bfe3652e", + "rev": "08018c72174a4df5657f8d94178ac69fb9c243e5", "type": "github" }, "original": { @@ -578,11 +578,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1780749050, - "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=", + "lastModified": 1781577229, + "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "type": "github" }, "original": { @@ -626,11 +626,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1781074563, - "narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=", + "lastModified": 1781577229, + "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "type": "github" }, "original": { @@ -671,11 +671,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1780749050, - "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=", + "lastModified": 1781577229, + "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb", + "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", "type": "github" }, "original": { @@ -736,11 +736,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1781208515, - "narHash": "sha256-Ke76KeYDAnm/w3OGEviATXQMFw4QnRPFS/Wj6MWqM0Y=", + "lastModified": 1781794604, + "narHash": "sha256-+A52qDscDCQelWn+aSZA7iSv500HXRPmsO8KRR3mivg=", "owner": "nix-community", "repo": "NUR", - "rev": "d66d4c98290f2b8dc3487e43bd1eb3d038039ab2", + "rev": "8661c872ba8979434bf38bd2eb814d4f73578b38", "type": "github" }, "original": { @@ -775,11 +775,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1781208515, - "narHash": "sha256-Ke76KeYDAnm/w3OGEviATXQMFw4QnRPFS/Wj6MWqM0Y=", + "lastModified": 1781794604, + "narHash": "sha256-+A52qDscDCQelWn+aSZA7iSv500HXRPmsO8KRR3mivg=", "owner": "nix-community", "repo": "NUR", - "rev": "d66d4c98290f2b8dc3487e43bd1eb3d038039ab2", + "rev": "8661c872ba8979434bf38bd2eb814d4f73578b38", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 35f9a1a..884ce2e 100644 --- a/flake.nix +++ b/flake.nix @@ -38,7 +38,7 @@ }: let #region Variables - path = builtins.toString ./.; + path = toString ./.; files = { ssh-keys = { materus = ./extra-files/ssh/materus.pub; @@ -97,7 +97,7 @@ system = arch; config.allowUnfree = true; overlays = [ - inp.nix-vscode-extensions.overlays.default + inp.nix-vscode-extensions.overlays.default ]; }; materusArgs = { diff --git a/nix-config/host/materusPC/home-manager/materus.nix b/nix-config/host/materusPC/home-manager/materus.nix index 943125a..3dce13e 100644 --- a/nix-config/host/materusPC/home-manager/materus.nix +++ b/nix-config/host/materusPC/home-manager/materus.nix @@ -27,6 +27,7 @@ in signing.key = "/mkk/config/extra-files/ssh/materus.pub"; }; home.packages = with pkgs; [ + eza wezterm materusArgs.inputs.nixerus.packages.x86_64-linux.polymc diff --git a/nix-config/host/materusPC/services.nix b/nix-config/host/materusPC/services.nix index 638b378..a075858 100644 --- a/nix-config/host/materusPC/services.nix +++ b/nix-config/host/materusPC/services.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, materusArgs, ... }: { imports = [ #region KDE @@ -61,6 +61,7 @@ capSysAdmin = true; openFirewall = true; autoStart = false; + package = materusArgs.inputs.nixerus.packages.x86_64-linux.sunshine; }; #endregion #region Syncthing diff --git a/nix-config/shared/default.nix b/nix-config/shared/default.nix index 27a88a8..df203e0 100644 --- a/nix-config/shared/default.nix +++ b/nix-config/shared/default.nix @@ -1,5 +1,10 @@ isHm: -{ lib, materusArgs, config, ... }: +{ + lib, + materusArgs, + config, + ... +}: { options.mkk.dir = lib.mkOption { @@ -8,15 +13,17 @@ isHm: }; options.mkk.var = lib.mkOption { - default = {}; + default = { }; type = lib.types.attrs; }; imports = [ - (import ./nvim.nix isHm) ./nix.nix - ]; - config.mkk.var = import ./private/variables.nix; + ] + ++ lib.optionals isHm [ ./hm ] + ++ lib.optionals (!isHm) [ ./os ]; + + config.mkk.var = import ./private/variables.nix {}; config._module.args.mkk = config.mkk.var; } diff --git a/nix-config/shared/hm/default.nix b/nix-config/shared/hm/default.nix new file mode 100644 index 0000000..96a6f33 --- /dev/null +++ b/nix-config/shared/hm/default.nix @@ -0,0 +1,4 @@ +{ ... }: +{ + imports = [ ./nvim.nix ]; +} diff --git a/nix-config/shared/hm/nvim.nix b/nix-config/shared/hm/nvim.nix new file mode 100644 index 0000000..d14bf25 --- /dev/null +++ b/nix-config/shared/hm/nvim.nix @@ -0,0 +1,39 @@ +{ + config, + lib, + pkgs, + ... +}: +{ + options.mkk.neovim = { + enable = lib.mkOption { + default = false; + type = lib.types.bool; + }; + }; + config = + # Home Manager + lib.mkIf config.mkk.neovim.enable { + xdg.configFile."nvim/lua/materus".source = "${config.mkk.dir}/config/editor/neovim/lua/materus"; + programs.neovim = { + enable = true; + withRuby = true; + withPython3 = true; + plugins = [ + pkgs.vimPlugins.nvim-treesitter.withAllGrammars + ]; + + initLua = lib.mkAfter '' + MATERUS = { + NIXOS = 1 + } + require("materus") + ''; + }; + home.packages = [ + pkgs.fd + pkgs.ripgrep + pkgs.tree-sitter + ]; + }; +} diff --git a/nix-config/shared/nvim.nix b/nix-config/shared/nvim.nix deleted file mode 100644 index 61e904e..0000000 --- a/nix-config/shared/nvim.nix +++ /dev/null @@ -1,48 +0,0 @@ -isHm: -{ - config, - lib, - pkgs, - ... -}: -{ - options.mkk.neovim = { - enable = lib.mkOption { - default = false; - type = lib.types.bool; - }; - }; - config = - if isHm then - # Home Manager - lib.mkIf config.mkk.neovim.enable { - xdg.configFile."nvim/lua/materus".source = "${config.mkk.dir}/config/editor/neovim/lua/materus"; - programs.neovim = { - enable = true; - withRuby = true; - withPython3 = true; - plugins = [ - pkgs.vimPlugins.nvim-treesitter.withAllGrammars - ]; - - initLua = lib.mkAfter '' - MATERUS = { - NIXOS = 1 - } - require("materus") - ''; - }; - home.packages = [ - pkgs.fd - pkgs.ripgrep - pkgs.tree-sitter - ]; - } - else - # NixOS - lib.mkIf config.mkk.neovim.enable { - environment.systemPackages = [ - pkgs.neovim - ]; - }; -} diff --git a/nix-config/shared/os/default.nix b/nix-config/shared/os/default.nix new file mode 100644 index 0000000..7437af2 --- /dev/null +++ b/nix-config/shared/os/default.nix @@ -0,0 +1,4 @@ +{ ... }: +{ + imports = [ ]; +} diff --git a/nix-config/shared/private/variables.nix b/nix-config/shared/private/variables.nix index 4a519392abcf7d92a58a5194e7c6a6dc52dbafe0..4e787c3ded9d1a5acc9e635d62c3266dff740f48 100644 GIT binary patch literal 904 zcmZQ@_Y83kiVO&0Xw>997SVU`STX}&Ztb7wRJrWdJl#7RRw}dRc&&JJSbgRfpIOES zIyDZ6zx?+oD=l$X2D5ih8f!Y|lu4`w;r`1ze$L3(p0tkLUsA&&Q^wqS{%@755i^=h zzqA`W{Jxf8>$X(BeI}InATTG(?UzQ~>wM2I3omr6oE4jEQL?uDmi9@8duBZ> zo*^-rk$W`lt{=3Ic%ATEY~9z5e_hr-J9xU@Z>jr%iH-g*)68#+Jz~A^B6V4}gtkdz zin8SY_=d3LW1&;Gh6_c{Z!z(x{&n{&+q3v(l3E!LTeU1Q&u;EK_4DjEt_dCfHEb)m zcXPi#mFD1i_EUBfo9fiY|5i0VyH`tJI+46+Kl69j&Sg!;^ImL>5M-MBoxAY5MZEH& zjBl@Qvj`VSO$go0z1U;w0zR3OogW-RTx04doy#y#~dCuT^wIIcL z%7&h=OjQ$(?%ezFyUKR!{d}TV|I9qUSFHSg+ly~!=JGXndY!Rg@sGDS|F~`S#!RhE zJ5PC>5p4aM`*^~x?GMs@l^9E)}>s$_(6Ar$+;U>)VDjzTyCj$;GdtPZm<93>3#c6 zTdW*yuG-98e8)>XVa3MfzgEw)&~;sS>o}`p-i>QZRvYeZ4u8JTwePajzOxXTIlcQ_Y^;9#SRUw%vSXP$J9Q$5Ov6uXE(z WRan>8VDppRY{^-HC;I{wEu{dzgt|rm literal 897 zcmZQ@_Y83kiVO&0_*K35);#l{E8Az;CU7pd-BDv~efYSKEVl#Ciwav^t;VqR=U(2~ z*uU>&YwQ0P)314d-5M0KDLOK8x@DX0%a&iu8vGeQC z2_NxGimWrO;H`LZrM~`|@Z9VAB_Y=)sh^#7;KQq?$zCs)i>pa*tnodTP^NnArnAjC zn`{4F7i2DsV_LFy<{x*jBeDwT8n0iCkO*LYS-rxI{a-+fva!2ccjANx>F2)&d9#UL zPn^Lj=uj2E#W-8CnBQ!Hk(JHTa)UQZO&Yc>x}YBaApXGIXs1T8yj>q(sjqB*eCg}H zSsx|}@0)%us7y04PsZ-?EZ6`2D-YI{yx-OlAadS*?#77F)9Ul@U7OFpTTD5EIjQJx z=<>D&4<;^OytH?zTj{;i9A|c=NW9>^9hc>qHm_&(;$t@VR#`oc{P^PevsbUae75V6 zRopnMpSfhugx5M}gajL1^o}NWhIV?1Yfa2v8OHPZ(lf(wuf`SE!sNr6St5FNR~EIs z7Jv4B-bB9{Rjs>Y-YpME)XkpL>=*7n>8WJNYP&6(2G7_<{HLw^v@JYvf$-rX+1=~P z8H}&5YLH5MG{xh$QjKj5+l}=Td$jkQe77$!{Y?05-5I-2TWd3&_GnR0aMI?z@L#}V zUKP*8veQrXEd?G&DQ~jvt9vq`T%`79?>lzu=XIOkr$1qvczUoUUn11Gbe>J=V$OMX3gN(R>9q1GozxPe`fyGs(w{v>m6y= z7s}l}c3oqm+|(e|oavnIlPbG<-WD#KWP7X7yQJ#ra>jiJ17uexu66NfyYqk3*JEzI zFOBE={B3*?Jt=DU$83{xZ~rZ4Y0)_sAZ;=Cd)jQZ6I%jPz5T_+B>vCN3jATVzTkF% zSb9NlpZ33coxK8{vyWz0a~=2kKPzDAs*fMGDnB&+zJ~qM-|TuHPpJxV`{k|@5-XUj zoYMqW+aCL<%P9OQD6}Y-qm;{T%Krkh&zJL~MKf;NAGkC}_w^Z7hku?f*1ZJ*_w%?G OUH+s{Dz~QOvnK#mU$VLY