formatted all files with nixfmt, added env variable to hold secrets

This commit is contained in:
pagedmov
2024-11-09 16:20:27 -05:00
parent d38da56ba2
commit 2a1ba18c09
93 changed files with 948 additions and 1254 deletions

View File

@@ -1,16 +1,3 @@
{
inputs,
nixpkgs,
config,
self,
username,
host,
lib,
...
}: {
imports = [
./hardware
./software
./environment
];
{ inputs, nixpkgs, config, self, username, host, lib, ... }: {
imports = [ ./hardware ./software ./environment ];
}

View File

@@ -1,16 +1,4 @@
{
inputs,
nixpkgs,
nixvim,
config,
self,
username,
host,
...
}: {
imports =
[(import ./sddm.nix)]
++ [(import ./issue.nix)]
++ [(import ./nix.nix)]
++ [(import ./stylix.nix)];
{ inputs, nixpkgs, nixvim, config, self, username, host, ... }: {
imports = [ (import ./sddm.nix) ] ++ [ (import ./issue.nix) ]
++ [ (import ./nix.nix) ] ++ [ (import ./stylix.nix) ];
}

View File

@@ -1,6 +1,7 @@
{lib, config, ...}: {
{ lib, config, ... }: {
options = {
movOpts.sysEnv.issue.enable = lib.mkEnableOption "enables custom /etc/issue splash screen for the tty";
movOpts.sysEnv.issue.enable =
lib.mkEnableOption "enables custom /etc/issue splash screen for the tty";
};
config = lib.mkIf config.movOpts.sysEnv.issue.enable {
environment.etc."issue".text = ''

View File

@@ -1,6 +1,7 @@
{lib, config, ... }: {
{ lib, config, ... }: {
options = {
movOpts.sysEnv.nixSettings.enable = lib.mkEnableOption "enables my nixos settings";
movOpts.sysEnv.nixSettings.enable =
lib.mkEnableOption "enables my nixos settings";
};
config = lib.mkIf config.movOpts.sysEnv.nixSettings.enable {
system.stateVersion = "24.05";
@@ -8,8 +9,8 @@
nix = {
settings = {
auto-optimise-store = true;
experimental-features = ["nix-command" "flakes"];
substituters = ["https://nix-gaming.cachix.org"];
experimental-features = [ "nix-command" "flakes" ];
substituters = [ "https://nix-gaming.cachix.org" ];
};
gc = {
automatic = true;

View File

@@ -1,24 +1,17 @@
{
pkgs,
self,
lib,
config,
...
}: {
{ pkgs, self, lib, config, ... }: {
options = {
movOpts.sysEnv.sddmConfig.enable = lib.mkEnableOption "enables custom sddm configuration";
movOpts.sysEnv.sddmConfig.enable =
lib.mkEnableOption "enables custom sddm configuration";
};
config = lib.mkIf config.movOpts.sysEnv.sddmConfig.enable {
environment.systemPackages = [
(
pkgs.catppuccin-sddm.override {
flavor = "mocha";
font = "JetBrains Mono Nerd Font";
fontSize = "14";
loginBackground = true;
background = "${self}/assets/wallpapers/dark-waves.jpg";
}
)
(pkgs.catppuccin-sddm.override {
flavor = "mocha";
font = "JetBrains Mono Nerd Font";
fontSize = "14";
loginBackground = true;
background = "${self}/assets/wallpapers/dark-waves.jpg";
})
];
services.displayManager.sddm = {
enable = true;

View File

@@ -1,18 +1,12 @@
{
pkgs,
self,
lib,
config,
...
}:
{ pkgs, self, lib, config, ... }:
let
scheme = "tokyo-night-dark";
wallpaper = "${self}/assets/wallpapers/dark-waves.jpg";
in
{
in {
options = {
movOpts.sysEnv.stylixConfig.enable = lib.mkEnableOption "enables custom stylix options";
movOpts.sysEnv.stylixConfig.enable =
lib.mkEnableOption "enables custom stylix options";
};
config = lib.mkIf config.movOpts.sysEnv.stylixConfig.enable {
stylix = {
@@ -25,7 +19,7 @@ in
};
polarity = "dark";
autoEnable = true;
opacity.terminal = 0.50;
opacity.terminal = 0.5;
targets = {
console.enable = true;
feh.enable = true;
@@ -39,15 +33,15 @@ in
};
fonts = {
monospace = {
package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];};
package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; };
name = "JetBrains Mono Nerd Font";
};
sansSerif = {
package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];};
package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; };
name = "JetBrains Mono Nerd Font";
};
serif = {
package = pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];};
package = pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; };
name = "JetBrains Mono Nerd Font";
};
sizes = {

View File

@@ -1,6 +1,7 @@
{pkgs, lib, config, ...}: {
{ pkgs, lib, config, ... }: {
options = {
movOpts.hardwareCfg.bootLoader.enable = lib.mkEnableOption "enables bootloader config";
movOpts.hardwareCfg.bootLoader.enable =
lib.mkEnableOption "enables bootloader config";
};
config = lib.mkIf config.movOpts.hardwareCfg.bootLoader.enable {
boot = {

View File

@@ -1,15 +1,4 @@
{
inputs,
nixpkgs,
nixvim,
config,
self,
username,
host,
...
}: {
imports =
[(import ./bootloader.nix)]
++ [(import ./network.nix)]
++ [(import ./powerprofiles.nix)];
{ inputs, nixpkgs, nixvim, config, self, username, host, ... }: {
imports = [ (import ./bootloader.nix) ] ++ [ (import ./network.nix) ]
++ [ (import ./powerprofiles.nix) ];
}

View File

@@ -1,16 +1,16 @@
{host, lib, config, ...}:
{
{ host, lib, config, ... }: {
options = {
movOpts.hardwareCfg.networkModule.enable = lib.mkEnableOption "enables network configuration";
movOpts.hardwareCfg.networkModule.enable =
lib.mkEnableOption "enables network configuration";
};
config = lib.mkIf config.movOpts.hardwareCfg.networkModule.enable {
networking = {
networkmanager.enable = true;
hostName = "${host}";
hosts = {
"192.168.1.200" = ["xenon"];
"192.168.1.201" = ["oganesson"];
"192.168.1.202" = ["mercury"];
"192.168.1.200" = [ "xenon" ];
"192.168.1.201" = [ "oganesson" ];
"192.168.1.202" = [ "mercury" ];
};
firewall = {
enable = true;

View File

@@ -1,6 +1,7 @@
{lib, config, ... }: {
{ lib, config, ... }: {
options = {
movOpts.hardwareCfg.powerProfiles.enable = lib.mkEnableOption "enables power profiles";
movOpts.hardwareCfg.powerProfiles.enable =
lib.mkEnableOption "enables power profiles";
};
config = lib.mkIf config.movOpts.hardwareCfg.powerProfiles.enable {
services = {

View File

@@ -1,16 +1,5 @@
{
inputs,
nixpkgs,
config,
self,
username,
host,
...
}: {
imports =
[(import ./packages.nix)]
++ [(import ./programs.nix)]
++ [(import ./services.nix)]
++ [(import ./virtualization.nix)]
++ [(import ./gaming)];
{ inputs, nixpkgs, config, self, username, host, ... }: {
imports = [ (import ./packages.nix) ] ++ [ (import ./programs.nix) ]
++ [ (import ./services.nix) ] ++ [ (import ./virtualization.nix) ]
++ [ (import ./gaming) ];
}

View File

@@ -1,5 +1,3 @@
{...}: {
imports =
[(import ./steam.nix)]
++ [(import ./gaming_pkgs.nix)];
{ ... }: {
imports = [ (import ./steam.nix) ] ++ [ (import ./gaming_pkgs.nix) ];
}

View File

@@ -1,23 +1,20 @@
{lib, config, pkgs, ...}:
{ lib, config, pkgs, ... }:
let
cust-openrct2 = pkgs.openrct2.overrideAttrs (oldAttrs: {
cmakeFlags = [
"-DDOWNLOAD_OBJECTS=ON"
"-DDOWNLOAD_OPENMSX=ON"
"-DDOWNLOAD_OPENSFX=ON"
"-DDOWNLOAD_TITLE_SEQUENCES=ON"
];
});
in
{
cmakeFlags = [
"-DDOWNLOAD_OBJECTS=ON"
"-DDOWNLOAD_OPENMSX=ON"
"-DDOWNLOAD_OPENSFX=ON"
"-DDOWNLOAD_TITLE_SEQUENCES=ON"
];
});
in {
options = {
movOpts.softwareCfg.gamingPkgs.enable = lib.mkEnableOption "enables gaming packages";
movOpts.softwareCfg.gamingPkgs.enable =
lib.mkEnableOption "enables gaming packages";
};
config = lib.mkIf config.movOpts.softwareCfg.gamingPkgs.enable {
environment.systemPackages = with pkgs; [
snes9x-gtk
cust-openrct2
];
environment.systemPackages = with pkgs; [ snes9x-gtk cust-openrct2 ];
};
}

View File

@@ -1,6 +1,7 @@
{lib, config, ...}: {
{ lib, config, ... }: {
options = {
movOpts.softwareCfg.steamConfig.enable = lib.mkEnableOption "enables steam configuration";
movOpts.softwareCfg.steamConfig.enable =
lib.mkEnableOption "enables steam configuration";
};
config = lib.mkIf config.movOpts.softwareCfg.steamConfig.enable {
programs.steam = {

View File

@@ -1,6 +1,7 @@
{lib, config, pkgs, inputs, ... }: {
{ lib, config, pkgs, inputs, ... }: {
options = {
movOpts.softwareCfg.sysPkgs.enable = lib.mkEnableOption "enables default system packages";
movOpts.softwareCfg.sysPkgs.enable =
lib.mkEnableOption "enables default system packages";
};
config = lib.mkIf config.movOpts.softwareCfg.sysPkgs.enable {
environment.systemPackages = with pkgs; [

View File

@@ -1,6 +1,7 @@
{lib, config, pkgs, ...}: {
{ lib, config, pkgs, ... }: {
options = {
movOpts.softwareCfg.sysProgs.enable = lib.mkEnableOption "enables default system programs";
movOpts.softwareCfg.sysProgs.enable =
lib.mkEnableOption "enables default system programs";
};
config = lib.mkIf config.movOpts.softwareCfg.sysProgs.enable {
programs = {
@@ -8,10 +9,7 @@
zsh.enable = lib.mkDefault true;
nix-ld = {
enable = lib.mkDefault true;
libraries = with pkgs; [
stdenv.cc.cc
ffmpeg-full
];
libraries = with pkgs; [ stdenv.cc.cc ffmpeg-full ];
};
gnupg.agent = {
enable = lib.mkDefault true;

View File

@@ -1,16 +1,15 @@
{lib, config, ...}: {
{ lib, config, ... }: {
options = {
movOpts.softwareCfg.sysServices.enable = lib.mkEnableOption "enables default system services";
movOpts.softwareCfg.sysServices.enable =
lib.mkEnableOption "enables default system services";
};
config = lib.mkIf config.movOpts.softwareCfg.sysServices.enable {
services = {
keyd = {
enable = true;
keyboards.default = {
ids = ["*"];
settings.main = {
capslock = "esc";
};
ids = [ "*" ];
settings.main = { capslock = "esc"; };
};
};
pipewire = {

View File

@@ -1,6 +1,7 @@
{lib, config, username, ...}: {
{ lib, config, username, ... }: {
options = {
movOpts.softwareCfg.virtConfig.enable = lib.mkEnableOption "enables virtualization";
movOpts.softwareCfg.virtConfig.enable =
lib.mkEnableOption "enables virtualization";
};
config = lib.mkIf config.movOpts.softwareCfg.virtConfig.enable {
virtualisation.libvirtd.enable = true;