materus/nixos-config
1
0
Fork 0
mirror of https://github.com/materusPL/nixos-config synced 2026-06-19 00:47:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

common: restructure config, update tmux and wezterm

Browse Source
This commit is contained in:
Mateusz Słodkowicz 2026-06-18 17:29:42 +02:00
parent a485b83e49
commit ac43221eec
Signed by: materus
SSH Key Fingerprint: SHA256:rzVduzTiiszuYfLPYD0SDZV+g8lxhpcRgpbOZA1X0Uo
13 changed files with 111 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/shell/zsh/.zshrc
View File

@ -132,8 +132,8 @@ if [[ $(whence -p "eza") ]]; then
alias ll="eza -alF --color=auto --hyperlink" alias ll="eza -alF --color=auto --hyperlink"
alias ls="eza --color=auto" alias ls="eza --color=auto"
else else
alias l="ls -lah --color=auto --hyperlink" alias l="ls -lah --color=auto"
alias ll="ls -alF --color=auto --hyperlink" alias ll="ls -alF --color=auto"
alias ls="ls --color=auto" alias ls="ls --color=auto"
fi fi

3
config/terminal/wezterm/wezterm.lua
View File

@ -1,8 +1,9 @@
local wezterm = require 'wezterm' local wezterm = require 'wezterm'
local config = wezterm.config_builder() local config = wezterm.config_builder()
-- config.color_scheme = 'Duotone Dark'
config.enable_scroll_bar = true config.enable_scroll_bar = true
config.scrollback_lines = 50000 config.scrollback_lines = 50000
return config return config

1
config/tmux/tmux.conf
View File

@ -9,3 +9,4 @@ setw -g mouse on
setw -g clock-mode-style 24 setw -g clock-mode-style 24
set -ga terminal-overrides ',xterm*:smcup@:rmcup@' set -ga terminal-overrides ',xterm*:smcup@:rmcup@'
set -g allow-passthrough on

84
flake.lock generated
View File

@ -91,11 +91,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1781534792, "lastModified": 1781786549,
"narHash": "sha256-ZH9sr0MtoqonoEDWUQhO7kSbDDn+NIoglhAXpPVb3pg=", "narHash": "sha256-IIbSs+b6MTmgjhQ5kC4MAcMpHgLvXNhpSMnyTiNVrZ4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "4e006e9741eff4cb4b02545c904a4ff3e9897b1e", "rev": "2a564fc31d2f77b26f1a180589599afe756f74a6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -114,11 +114,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1781534792, "lastModified": 1781786549,
"narHash": "sha256-ZH9sr0MtoqonoEDWUQhO7kSbDDn+NIoglhAXpPVb3pg=", "narHash": "sha256-IIbSs+b6MTmgjhQ5kC4MAcMpHgLvXNhpSMnyTiNVrZ4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "4e006e9741eff4cb4b02545c904a4ff3e9897b1e", "rev": "2a564fc31d2f77b26f1a180589599afe756f74a6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -370,11 +370,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1781533608, "lastModified": 1781788787,
"narHash": "sha256-Mgsu/x5cs8EqlhIQ7bMBo14LpkAYtgzDbG/S/eattJA=", "narHash": "sha256-YqlTCRRhGvNjcJejPeMuHrYQ/TVhOO2MV/nEGMWb8nk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8aec76cc1e045f37b55d82ca3cee4910ae04d3db", "rev": "d456f483f157d4b706416005da226234b9c116ff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -448,11 +448,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1781499522, "lastModified": 1781756886,
"narHash": "sha256-41T+jXsG5FusLGed0GwviF42t4wFuriXL/m9BR4FrqA=", "narHash": "sha256-O19FRVtXC+2fNkbIlwssYVay284ynwEK9QAvHAVTLFA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "37d164940d9db2188b3d12ab1cd5206494ea4ac1", "rev": "092eb7e14b6950afb62ad4b0bc2532a122d206e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -470,11 +470,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1781499522, "lastModified": 1781756886,
"narHash": "sha256-41T+jXsG5FusLGed0GwviF42t4wFuriXL/m9BR4FrqA=", "narHash": "sha256-O19FRVtXC+2fNkbIlwssYVay284ynwEK9QAvHAVTLFA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "37d164940d9db2188b3d12ab1cd5206494ea4ac1", "rev": "092eb7e14b6950afb62ad4b0bc2532a122d206e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -497,11 +497,11 @@
"nur": "nur" "nur": "nur"
}, },
"locked": { "locked": {
"lastModified": 1781461917, "lastModified": 1781796426,
"narHash": "sha256-OvdeYLUcCfLqsGrZbU30JhAhYBbxDrWquehflQhWwPc=", "narHash": "sha256-QEWeBiAJcPS4rBdEUoatYKFtMxRNobZyPS68xVZ8c60=",
"owner": "materusPL", "owner": "materusPL",
"repo": "Nixerus", "repo": "Nixerus",
"rev": "be078046d0aea8a5d3f5b7f30fe9850425b24be8", "rev": "b8eb02bb22b15d60fd9634f039a6b2075cf5cd1e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -524,11 +524,11 @@
"nur": "nur_3" "nur": "nur_3"
}, },
"locked": { "locked": {
"lastModified": 1781461917, "lastModified": 1781796426,
"narHash": "sha256-OvdeYLUcCfLqsGrZbU30JhAhYBbxDrWquehflQhWwPc=", "narHash": "sha256-QEWeBiAJcPS4rBdEUoatYKFtMxRNobZyPS68xVZ8c60=",
"owner": "materusPL", "owner": "materusPL",
"repo": "Nixerus", "repo": "Nixerus",
"rev": "be078046d0aea8a5d3f5b7f30fe9850425b24be8", "rev": "b8eb02bb22b15d60fd9634f039a6b2075cf5cd1e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -543,11 +543,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1781168557, "lastModified": 1781622756,
"narHash": "sha256-LOnLQ2tpYF9gqIDDr3+j3DbpJJr/QCH6zPRT2GzEUOE=", "narHash": "sha256-JrPh4M6S7aPsEE9tOENuZrxC6o2szSLlK+t4+nLke9s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "6358ff76821101c178e3ab4919a62799bfe3652e", "rev": "08018c72174a4df5657f8d94178ac69fb9c243e5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -562,11 +562,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1781168557, "lastModified": 1781622756,
"narHash": "sha256-LOnLQ2tpYF9gqIDDr3+j3DbpJJr/QCH6zPRT2GzEUOE=", "narHash": "sha256-JrPh4M6S7aPsEE9tOENuZrxC6o2szSLlK+t4+nLke9s=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "6358ff76821101c178e3ab4919a62799bfe3652e", "rev": "08018c72174a4df5657f8d94178ac69fb9c243e5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -578,11 +578,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1780749050, "lastModified": 1781577229,
"narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=", "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a799d3e3886da994fa307f817a6bc705ae538eeb", "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -626,11 +626,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1781074563, "lastModified": 1781577229,
"narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=", "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca", "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -671,11 +671,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1780749050, "lastModified": 1781577229,
"narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=", "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a799d3e3886da994fa307f817a6bc705ae538eeb", "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -736,11 +736,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1781208515, "lastModified": 1781794604,
"narHash": "sha256-Ke76KeYDAnm/w3OGEviATXQMFw4QnRPFS/Wj6MWqM0Y=", "narHash": "sha256-+A52qDscDCQelWn+aSZA7iSv500HXRPmsO8KRR3mivg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "d66d4c98290f2b8dc3487e43bd1eb3d038039ab2", "rev": "8661c872ba8979434bf38bd2eb814d4f73578b38",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -775,11 +775,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1781208515, "lastModified": 1781794604,
"narHash": "sha256-Ke76KeYDAnm/w3OGEviATXQMFw4QnRPFS/Wj6MWqM0Y=", "narHash": "sha256-+A52qDscDCQelWn+aSZA7iSv500HXRPmsO8KRR3mivg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "d66d4c98290f2b8dc3487e43bd1eb3d038039ab2", "rev": "8661c872ba8979434bf38bd2eb814d4f73578b38",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View File

@ -38,7 +38,7 @@
}: }:
let let
#region Variables #region Variables
path = builtins.toString ./.; path = toString ./.;
files = { files = {
ssh-keys = { ssh-keys = {
materus = ./extra-files/ssh/materus.pub; materus = ./extra-files/ssh/materus.pub;

1
nix-config/host/materusPC/home-manager/materus.nix
View File

@ -27,6 +27,7 @@ in
signing.key = "/mkk/config/extra-files/ssh/materus.pub"; signing.key = "/mkk/config/extra-files/ssh/materus.pub";
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [
eza
wezterm wezterm
materusArgs.inputs.nixerus.packages.x86_64-linux.polymc materusArgs.inputs.nixerus.packages.x86_64-linux.polymc

3
nix-config/host/materusPC/services.nix
View File

@ -1,4 +1,4 @@
{ pkgs, ... }: { pkgs, materusArgs, ... }:
{ {
imports = [ imports = [
#region KDE #region KDE
@ -61,6 +61,7 @@
capSysAdmin = true; capSysAdmin = true;
openFirewall = true; openFirewall = true;
autoStart = false; autoStart = false;
package = materusArgs.inputs.nixerus.packages.x86_64-linux.sunshine;
}; };
#endregion #endregion
#region Syncthing #region Syncthing

17
nix-config/shared/default.nix
View File

@ -1,5 +1,10 @@
isHm: isHm:
{ lib, materusArgs, config, ... }: {
lib,
materusArgs,
config,
...
}:
{ {
options.mkk.dir = lib.mkOption { options.mkk.dir = lib.mkOption {
@ -8,15 +13,17 @@ isHm:
}; };
options.mkk.var = lib.mkOption { options.mkk.var = lib.mkOption {
default = {}; default = { };
type = lib.types.attrs; type = lib.types.attrs;
}; };
imports = [ imports = [
(import ./nvim.nix isHm)
./nix.nix ./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; config._module.args.mkk = config.mkk.var;
} }

4
nix-config/shared/hm/default.nix Normal file
View File

@ -0,0 +1,4 @@
{ ... }:
{
imports = [ ./nvim.nix ];
}

39
nix-config/shared/hm/nvim.nix Normal file
View File

@ -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
];
};
}

48
nix-config/shared/nvim.nix
View File

@ -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
];
};
}

4
nix-config/shared/os/default.nix Normal file
View File

@ -0,0 +1,4 @@
{ ... }:
{
imports = [ ];
}

BIN
nix-config/shared/private/variables.nix
View File

Binary file not shown.