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

Compare commits

base: materus:8b9b884bc31d206fecadb56f362a8f323450f8a0
Branches Tags
materus:master
materus:old
materus:inputs
..
compare: materus:bd10321f19cba727791a0ae1975c4c8485a2b78a
Branches Tags
materus:master
materus:old
materus:inputs

No commits in common. "8b9b884bc31d206fecadb56f362a8f323450f8a0" and "bd10321f19cba727791a0ae1975c4c8485a2b78a" have entirely different histories.
8b9b884bc3 ... bd10321f19

12 changed files with 35 additions and 135 deletions
Show Stats Expand all files Collapse all files

42
config/editor/neovim/init.lua
View File

@ -1,42 +0,0 @@
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
if vim.fn.executable("git") == 1 then
if not (vim.uv or vim.loop).fs_stat(lazypath) then
vim.fn.system({
"git",
"clone",
"--filter=blob:none",
"https://github.com/folke/lazy.nvim.git",
"--branch=stable", -- latest stable release
lazypath,
})
end
vim.opt.rtp:prepend(lazypath)
local opts = {}
local plugins = {
{
"Mofiqul/dracula.nvim",
lazy = false,
priority = 1000,
opts = {}
},
{
"romgrk/barbar.nvim",
init = function() vim.g.barbar_auto_setup = false end,
dependencies = {"nvim-tree/nvim-web-devicons","lewis6991/gitsigns.nvim"}
},
--[[
{
"kevinhwang91/nvim-ufo",
dependencies = {"kevinhwang91/promise-async"},
opts = {}
}]]
}
require("lazy").setup(plugins, opts)
vim.cmd [[colorscheme dracula]]
vim.cmd [[set number]]
end

6
config/shell/zsh/zshrc
View File

@ -16,6 +16,7 @@ if zmodload zsh/terminfo && (( "$terminfo[colors]" >= "256" )); then
__MATERUS_ZSH_256COLORS="${__MATERUS_ZSH_256COLORS:-0}"; __MATERUS_ZSH_256COLORS="${__MATERUS_ZSH_256COLORS:-0}";
fi fi
#region Plugins #region Plugins
# Clone plugins if not exists # Clone plugins if not exists
[ -d $ZSH_DATA_DIR/plugins/powerlevel10k ] || git clone https://github.com/romkatv/powerlevel10k $ZSH_DATA_DIR/plugins/powerlevel10k [ -d $ZSH_DATA_DIR/plugins/powerlevel10k ] || git clone https://github.com/romkatv/powerlevel10k $ZSH_DATA_DIR/plugins/powerlevel10k
@ -103,11 +104,6 @@ speedtest() {
} }
#endregion #endregion
#region Aliases
if [[ "$TERM" = "xterm-kitty" ]]; then
alias ssh="kitty +kitten ssh"
fi
#endregion
if [[ "$__MATERUS_ZSH_256COLORS" = "1" ]] ; then [[ ! -f ${ZSH_CONFIG_DIR}/p10kcfg/fullcolor.zsh ]] || source ${ZSH_CONFIG_DIR}/p10kcfg/fullcolor.zsh; if [[ "$__MATERUS_ZSH_256COLORS" = "1" ]] ; then [[ ! -f ${ZSH_CONFIG_DIR}/p10kcfg/fullcolor.zsh ]] || source ${ZSH_CONFIG_DIR}/p10kcfg/fullcolor.zsh;
else [[ ! -f ${ZSH_CONFIG_DIR}/p10kcfg/compatibility.zsh ]] || source ${ZSH_CONFIG_DIR}/p10kcfg/compatibility.zsh; else [[ ! -f ${ZSH_CONFIG_DIR}/p10kcfg/compatibility.zsh ]] || source ${ZSH_CONFIG_DIR}/p10kcfg/compatibility.zsh;

48
flake.lock generated
View File

@ -92,11 +92,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773264488, "lastModified": 1770260404,
"narHash": "sha256-rK0507bDuWBrZo+0zts9bCs/+RRUEHuvFE5DHWPxX/Q=", "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5c0f63f8d55040a7eed69df7e3fcdd15dfb5a04c", "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -114,11 +114,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773422513, "lastModified": 1770491427,
"narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=", "narHash": "sha256-8b+0vixdqGnIIcgsPhjdX7EGPdzcVQqYxF+ujjex654=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056", "rev": "cbd8a72e5fe6af19d40e2741dc440d9227836860",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -178,11 +178,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773543606, "lastModified": 1770519952,
"narHash": "sha256-phMmtcMDGos4O82iEE3qFl58jp7fp1mu2liDE0A11gQ=", "narHash": "sha256-Ba2onCjl55f34Nyopcgwao0ekcVx1TbWoXNZCVwSLJ8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "014e1925a28b3e53f90883530ce6ff80e2da238a", "rev": "efaad19ea43b72af40c8522418a8a3771a6e9d9b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -200,11 +200,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773543606, "lastModified": 1770519952,
"narHash": "sha256-phMmtcMDGos4O82iEE3qFl58jp7fp1mu2liDE0A11gQ=", "narHash": "sha256-Ba2onCjl55f34Nyopcgwao0ekcVx1TbWoXNZCVwSLJ8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "014e1925a28b3e53f90883530ce6ff80e2da238a", "rev": "efaad19ea43b72af40c8522418a8a3771a6e9d9b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -286,11 +286,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1773389992, "lastModified": 1770197578,
"narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=", "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c06b4ae3d6599a672a6210b7021d699c351eebda", "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -318,11 +318,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1773375660, "lastModified": 1770464364,
"narHash": "sha256-SEzUWw2Rf5Ki3bcM26nSKgbeoqi2uYy8IHVBqOKjX3w=", "narHash": "sha256-z5NJPSBwsLf/OfD8WTmh79tlSU8XgIbwmk6qB1/TFzY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3e20095fe3c6cbb1ddcef89b26969a69a1570776", "rev": "23d72dabcb3b12469f57b37170fcbc1789bd7457",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -384,11 +384,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773550941, "lastModified": 1770526836,
"narHash": "sha256-wa/++bL2QeMUreNFBZEWluQfOYB0MnQIeGNMuaX9sfs=", "narHash": "sha256-xbvX5Ik+0inJcLJtJ/AajAt7xCk6FOCrm5ogpwwvVDg=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c469b6885f0dcd5c7c56bd935a0f08dbcd9e79e1", "rev": "d6e0e666048a5395d6ea4283143b7c9ac704720d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -406,11 +406,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773550941, "lastModified": 1770526836,
"narHash": "sha256-wa/++bL2QeMUreNFBZEWluQfOYB0MnQIeGNMuaX9sfs=", "narHash": "sha256-xbvX5Ik+0inJcLJtJ/AajAt7xCk6FOCrm5ogpwwvVDg=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "c469b6885f0dcd5c7c56bd935a0f08dbcd9e79e1", "rev": "d6e0e666048a5395d6ea4283143b7c9ac704720d",
"type": "github" "type": "github"
}, },
"original": { "original": {

10
flake.nix
View File

@ -73,7 +73,7 @@
}; };
modules = [ modules = [
./nix-config/host/${host} ./nix-config/host/${host}
(import ./nix-config/shared false) ./nix-config/shared
]; ];
}); });
@ -109,7 +109,7 @@
in in
[ [
./nix-config/home/${user} ./nix-config/home/${user}
(import ./nix-config/shared true) ./nix-config/shared
] ]
++ (if (host != null && builtins.pathExists host-path) then [ host-path ] else [ ]); ++ (if (host != null && builtins.pathExists host-path) then [ host-path ] else [ ]);
extraSpecialArgs = extraArgs // { extraSpecialArgs = extraArgs // {
@ -120,17 +120,13 @@
in in
rec { rec {
nixosConfigurations = { nixosConfigurations = {
materusPC = makeSystem { materusPC = makeSystem { host = "materusPC"; };
host = "materusPC";
stable = true;
};
}; };
homeConfigurations = { homeConfigurations = {
"materus@materusPC" = makeHome { "materus@materusPC" = makeHome {
user = "materus"; user = "materus";
host = "materusPC"; host = "materusPC";
stable = true;
}; };
}; };

2
nix-config/home/materus/default.nix
View File

@ -20,7 +20,7 @@
xdg.enable = true; xdg.enable = true;
xdg.configFile."zsh/cfg".source = xdg.configFile."zsh/cfg".source =
"${config.mkk.dir}/config/shell/zsh"; config.lib.file.mkOutOfStoreSymlink "/mkk/config/config/shell/zsh";
xdg.configFile."zsh/data/plugins/powerlevel10k".source = xdg.configFile."zsh/data/plugins/powerlevel10k".source =
"${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k"; "${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k";
xdg.configFile."zsh/data/plugins/zsh-history-substring-search".source = xdg.configFile."zsh/data/plugins/zsh-history-substring-search".source =

1
nix-config/host/materusPC/audio.nix
View File

@ -46,6 +46,7 @@
odin2 odin2
surge surge
fire fire
decent-sampler
lsp-plugins lsp-plugins
]; ];

2
nix-config/host/materusPC/configuration.nix
View File

@ -307,6 +307,6 @@ in
AllowHybridSleep=no AllowHybridSleep=no
AllowSuspendThenHibernate=no AllowSuspendThenHibernate=no
''; '';
system.stateVersion = "25.11"; system.stateVersion = "25.11";
} }

3
nix-config/host/materusPC/hardware-configuration.nix
View File

@ -179,8 +179,7 @@ in
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.sane.enable = true;
hardware.sane.extraBackends = [ pkgs.hplipWithPlugin ];
hardware.bluetooth = { hardware.bluetooth = {
enable = true; enable = true;
powerOnBoot = true; powerOnBoot = true;

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

@ -1,8 +1,5 @@
{ pkgs, materusArgs, config, ... }: { pkgs, materusArgs, ... }:
{ {
mkk.neovim.enable = true;
mkk.dir = config.lib.file.mkOutOfStoreSymlink "/mkk/config";
programs.git = { programs.git = {
enable = true; enable = true;
lfs.enable = true; lfs.enable = true;
@ -18,7 +15,6 @@
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [
materusArgs.inputs.nixerus.packages.x86_64-linux.polymc materusArgs.inputs.nixerus.packages.x86_64-linux.polymc
neovide
curl curl
wget wget

2
nix-config/host/materusPC/network.nix
View File

@ -11,7 +11,7 @@
''; '';
networking.hostName = "materusPC"; networking.hostName = "materusPC";
#networking.wireless.iwd.enable = true; networking.wireless.iwd.enable = true;
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
networking.firewall.enable = false; networking.firewall.enable = false;

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

@ -1,16 +1,4 @@
isHm: { ... }:
{ lib, materusArgs, ... }:
{ {
options.mkk.dir = lib.mkOption {
default = "${materusArgs.flake-path}";
type = lib.types.path;
};
imports = [
(import ./nvim.nix isHm)
];
config._module.args.mkk = import ./private/variables.nix; config._module.args.mkk = import ./private/variables.nix;
} }

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

@ -1,34 +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/init.lua".source = "${config.mkk.dir}/config/editor/neovim/init.lua";
home.packages = [
pkgs.neovim
pkgs.fd
pkgs.ripgrep
pkgs.tree-sitter
];
}
else
# NixOS
lib.mkIf config.mkk.neovim.enable {
environment.systemPackages = [
pkgs.neovim
];
};
}