Compare commits

..

No commits in common. "a0cc980491960bb8dc8dcb9b25dc974007b985ee" and "6f8da64feaa34ddc141be26838032da34faef093" have entirely different histories.

6 changed files with 73 additions and 108 deletions

View file

@ -29,7 +29,6 @@ in {
networking.hostName = cfg.user.name; networking.hostName = cfg.user.name;
networking.hostId = "a230906f"; networking.hostId = "a230906f";
mods.home.file = ./home.nix; mods.home.file = ./home.nix;
nix.settings.trusted-users = ["root" "muon"];
# Modules # Modules
mods.desktop.enable = true; mods.desktop.enable = true;
@ -62,9 +61,6 @@ in {
virtualisation.virtualbox.host.enable = true; virtualisation.virtualbox.host.enable = true;
users.extraGroups.vboxusers.members = ["user-with-access-to-virtualbox"]; users.extraGroups.vboxusers.members = ["user-with-access-to-virtualbox"];
services.picom.enable = true;
services.picom.opacityRules = ["50:name *= 'Cheat'"];
# Proprietary </3 # Proprietary </3
mods.unfree.steam.enable = true; mods.unfree.steam.enable = true;
mods.unfree.nvidia.enable = true; mods.unfree.nvidia.enable = true;

View file

@ -55,9 +55,6 @@ in {
services.hardware.openrgb.enable = true; services.hardware.openrgb.enable = true;
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
services.picom.enable = true;
services.picom.opacityRules = ["50:name *= 'Cheat'"];
# Persist # Persist
environment.persistence."/persist" = { environment.persistence."/persist" = {
directories = ["/etc/NetworkManager" "/var/lib/NetworkManager"]; directories = ["/etc/NetworkManager" "/var/lib/NetworkManager"];

View file

@ -97,10 +97,6 @@ in
hideEdgeBorders = "smart"; hideEdgeBorders = "smart";
}; };
floating.criteria = [
{title = "Cheat";}
];
defaultWorkspace = "workspace number 1"; defaultWorkspace = "workspace number 1";
workspaceAutoBackAndForth = true; workspaceAutoBackAndForth = true;
focus.wrapping = "yes"; focus.wrapping = "yes";

View file

@ -128,10 +128,7 @@
# python.lsp.package = [(lib.getExe pkgs.ruff) "server"]; # python.lsp.package = [(lib.getExe pkgs.ruff) "server"];
python.format.type = "ruff"; python.format.type = "ruff";
clang = { clang.enable = true;
enable = true;
cHeader = true;
};
}; };
statusline.lualine.enable = true; statusline.lualine.enable = true;

View file

@ -1,23 +1,15 @@
{ { pkgs, lib, config, ... }:
pkgs, let cfg = config.mods.terminal;
lib, in with lib; {
config,
...
}: let
cfg = config.mods.terminal;
in
with lib; {
options.mods.terminal.tools.enable = mkEnableOption "enables cli tools"; options.mods.terminal.tools.enable = mkEnableOption "enables cli tools";
config = mkIf cfg.tools.enable { config = mkIf cfg.tools.enable {
programs =
builtins.listToAttrs (map (name: { programs = builtins.listToAttrs (map (name: {
name = name; name = name;
value = value = {
{
enable = true; enable = true;
} } // optionalAttrs
// optionalAttrs
(builtins.hasAttr "enableZshIntegration" config.programs.${name}) { (builtins.hasAttr "enableZshIntegration" config.programs.${name}) {
enableZshIntegration = mkIf cfg.zsh.enable true; enableZshIntegration = mkIf cfg.zsh.enable true;
}; };
@ -37,12 +29,11 @@ in
"htop" "htop"
"vifm" "vifm"
"rbw" "rbw"
]) ]) // {
// {
atuin = { atuin = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
flags = ["--disable-up-arrow"]; flags = [ "--disable-up-arrow" ];
settings = { settings = {
sync_frequency = "5m"; sync_frequency = "5m";
sync_address = "https://atuin.muon.host"; sync_address = "https://atuin.muon.host";
@ -77,8 +68,6 @@ in
# utilities # utilities
fend fend
xclip xclip
just
devenv
]; ];
}; };
} }

View file

@ -1,23 +1,15 @@
{ { pkgs, lib, config, inputs, system, ... }: {
pkgs,
lib,
config,
inputs,
system,
...
}: {
options = { options = {
mods.nix.upgrade.enable = lib.mkEnableOption "enables nix auto upgrade"; mods.nix.upgrade.enable = lib.mkEnableOption "enables nix auto upgrade";
mods.nix.clean.enable = lib.mkEnableOption "enables nix auto cleaning"; mods.nix.clean.enable = lib.mkEnableOption "enables nix auto cleaning";
}; };
config = let config = let flake = "/home/${config.mods.user.name}/.config/home";
flake = "/home/${config.mods.user.name}/.config/home";
in { in {
system.autoUpgrade = { system.autoUpgrade = {
enable = config.mods.nix.upgrade.enable; enable = config.mods.nix.upgrade.enable;
flake = flake; flake = flake;
flags = ["--commit-lock-file" "-L"]; flags = [ "--commit-lock-file" "-L" ];
dates = "02:00"; dates = "02:00";
randomizedDelaySec = "45min"; randomizedDelaySec = "45min";
}; };
@ -29,21 +21,19 @@
flake = flake; flake = flake;
}; };
nix.settings.experimental-features = ["nix-command" "flakes"]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
nix.settings = { nix.settings = {
substituters = [ substituters = [
"https://cache.nixos.org" "https://cache.nixos.org"
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
"https://nixpkgs-unfree.cachix.org" "https://nixpkgs-unfree.cachix.org"
"https://hyprland.cachix.org" "https://hyprland.cachix.org"
"https://devenv.cachix.org"
]; ];
trusted-public-keys = [ trusted-public-keys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
"devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
]; ];
}; };