Statix formatting fixes
This commit is contained in:
Andre Newman
parent
080110e845
commit
0fcbb04c22
|
|
@ -21,7 +21,7 @@ with lib;
|
||||||
"dev.k8slens.OpenLens"
|
"dev.k8slens.OpenLens"
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
(mkIf (cfg.kubernetes.enable) {
|
(mkIf cfg.kubernetes.enable {
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
kubectl
|
kubectl
|
||||||
kubernetes-helm
|
kubernetes-helm
|
||||||
|
|
|
||||||
|
|
@ -106,17 +106,19 @@ with lib;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Scrub BTRFS partitions if the root partition is btrfs
|
services = {
|
||||||
services.btrfs.autoScrub = lib.mkIf (config.fileSystems."/".fsType == "btrfs") {
|
# Scrub BTRFS partitions if the root partition is btrfs
|
||||||
enable = true;
|
btrfs.autoScrub = lib.mkIf (config.fileSystems."/".fsType == "btrfs") {
|
||||||
interval = "weekly";
|
enable = true;
|
||||||
fileSystems = [ "/" ];
|
interval = "weekly";
|
||||||
};
|
fileSystems = [ "/" ];
|
||||||
|
};
|
||||||
|
|
||||||
# Enable fwupd (firmware updater)
|
# Enable fwupd (firmware updater)
|
||||||
services.fwupd.enable = true;
|
fwupd.enable = true;
|
||||||
|
|
||||||
# Allow systemd user services to keep running after the user has logged out
|
# Allow systemd user services to keep running after the user has logged out
|
||||||
services.logind.killUserProcesses = false;
|
logind.killUserProcesses = false;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -12,89 +12,97 @@ with lib;
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
host.ui.audio.enable = true;
|
host.ui = {
|
||||||
host.ui.flatpak.enable = true;
|
audio.enable = true;
|
||||||
|
flatpak.enable = true;
|
||||||
# Configure the xserver
|
|
||||||
services.xserver = {
|
|
||||||
# Enable the X11 windowing system.
|
|
||||||
enable = true;
|
|
||||||
|
|
||||||
# Configure keymap in X11
|
|
||||||
xkb = {
|
|
||||||
layout = "us";
|
|
||||||
variant = "";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Enable Gnome
|
|
||||||
desktopManager.gnome.enable = true;
|
|
||||||
displayManager = {
|
|
||||||
gdm.enable = true;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Remove default packages that came with the install
|
services = {
|
||||||
services.xserver.excludePackages = with pkgs; [
|
# Configure the xserver
|
||||||
xterm
|
xserver = {
|
||||||
];
|
# Enable the X11 windowing system.
|
||||||
environment.gnome.excludePackages = (with pkgs; [
|
enable = true;
|
||||||
gnome-photos
|
|
||||||
gnome-tour
|
|
||||||
gnomeExtensions.extension-list
|
|
||||||
gedit # text editor
|
|
||||||
]) ++ (with pkgs.gnome; [
|
|
||||||
cheese # webcam tool
|
|
||||||
gnome-music
|
|
||||||
gnome-calendar
|
|
||||||
epiphany # web browser
|
|
||||||
geary # email reader
|
|
||||||
evince # document viewer
|
|
||||||
gnome-characters
|
|
||||||
totem # video player
|
|
||||||
tali # poker game
|
|
||||||
iagno # go game
|
|
||||||
hitori # sudoku game
|
|
||||||
atomix # puzzle game
|
|
||||||
]);
|
|
||||||
|
|
||||||
# Install additional Gnome packages
|
# Configure keymap in X11
|
||||||
environment.systemPackages = with pkgs; [
|
xkb = {
|
||||||
# Gnome tweak tools
|
layout = "us";
|
||||||
gnome.gnome-tweaks
|
variant = "";
|
||||||
# Gnome extensions
|
};
|
||||||
gnomeExtensions.appindicator
|
|
||||||
gnomeExtensions.dash-to-panel
|
|
||||||
gnomeExtensions.gsconnect
|
|
||||||
gnomeExtensions.forge
|
|
||||||
# Themeing
|
|
||||||
gnome.gnome-themes-extra
|
|
||||||
papirus-icon-theme
|
|
||||||
];
|
|
||||||
|
|
||||||
# Install Flatpaks
|
# Enable Gnome
|
||||||
services.flatpak.packages = [
|
desktopManager.gnome.enable = true;
|
||||||
"com.mattjakeman.ExtensionManager"
|
displayManager = {
|
||||||
"dev.geopjr.Tuba"
|
gdm.enable = true;
|
||||||
"org.bluesabre.MenuLibre"
|
};
|
||||||
"org.gnome.baobab"
|
|
||||||
"org.gnome.Calculator"
|
|
||||||
"org.gnome.Characters"
|
|
||||||
"org.gnome.Calendar"
|
|
||||||
"org.gnome.Evince"
|
|
||||||
"org.gnome.Evolution"
|
|
||||||
"org.gnome.FileRoller"
|
|
||||||
"org.gnome.Firmware"
|
|
||||||
"org.gnome.gitg"
|
|
||||||
"org.gnome.Loupe" # Gnome's fancy new image viewer
|
|
||||||
"org.gnome.Music"
|
|
||||||
"org.gnome.seahorse.Application"
|
|
||||||
"org.gnome.TextEditor"
|
|
||||||
"org.gnome.World.Secrets"
|
|
||||||
"org.gtk.Gtk3theme.Adwaita-dark"
|
|
||||||
];
|
|
||||||
|
|
||||||
# Disable CUPS - not needed
|
# Remove default packages that came with the install
|
||||||
services.printing.enable = false;
|
excludePackages = with pkgs; [
|
||||||
|
xterm
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
# Install Flatpaks
|
||||||
|
flatpak.packages = [
|
||||||
|
"com.mattjakeman.ExtensionManager"
|
||||||
|
"dev.geopjr.Tuba"
|
||||||
|
"org.bluesabre.MenuLibre"
|
||||||
|
"org.gnome.baobab"
|
||||||
|
"org.gnome.Calculator"
|
||||||
|
"org.gnome.Characters"
|
||||||
|
"org.gnome.Calendar"
|
||||||
|
"org.gnome.Evince"
|
||||||
|
"org.gnome.Evolution"
|
||||||
|
"org.gnome.FileRoller"
|
||||||
|
"org.gnome.Firmware"
|
||||||
|
"org.gnome.gitg"
|
||||||
|
"org.gnome.Loupe" # Gnome's fancy new image viewer
|
||||||
|
"org.gnome.Music"
|
||||||
|
"org.gnome.seahorse.Application"
|
||||||
|
"org.gnome.TextEditor"
|
||||||
|
"org.gnome.World.Secrets"
|
||||||
|
"org.gtk.Gtk3theme.Adwaita-dark"
|
||||||
|
];
|
||||||
|
|
||||||
|
# Disable CUPS - not needed
|
||||||
|
printing.enable = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
environment = {
|
||||||
|
# Remove default Gnome packages that came with the install, then install the ones I actually use
|
||||||
|
gnome.excludePackages = (with pkgs; [
|
||||||
|
gnome-photos
|
||||||
|
gnome-tour
|
||||||
|
gnomeExtensions.extension-list
|
||||||
|
gedit # text editor
|
||||||
|
]) ++ (with pkgs.gnome; [
|
||||||
|
cheese # webcam tool
|
||||||
|
gnome-music
|
||||||
|
gnome-calendar
|
||||||
|
epiphany # web browser
|
||||||
|
geary # email reader
|
||||||
|
evince # document viewer
|
||||||
|
gnome-characters
|
||||||
|
totem # video player
|
||||||
|
tali # poker game
|
||||||
|
iagno # go game
|
||||||
|
hitori # sudoku game
|
||||||
|
atomix # puzzle game
|
||||||
|
]);
|
||||||
|
|
||||||
|
# Install additional Gnome packages
|
||||||
|
systemPackages = with pkgs; [
|
||||||
|
# Gnome tweak tools
|
||||||
|
gnome.gnome-tweaks
|
||||||
|
# Gnome extensions
|
||||||
|
gnomeExtensions.appindicator
|
||||||
|
gnomeExtensions.dash-to-panel
|
||||||
|
gnomeExtensions.gsconnect
|
||||||
|
gnomeExtensions.forge
|
||||||
|
# Themeing
|
||||||
|
gnome.gnome-themes-extra
|
||||||
|
papirus-icon-theme
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
# Manage fonts
|
# Manage fonts
|
||||||
fonts = {
|
fonts = {
|
||||||
|
|
|
||||||
|
|
@ -47,58 +47,62 @@ with lib;
|
||||||
../common/gnome.nix
|
../common/gnome.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# The state version is required and should stay at the version you originally installed.
|
home = {
|
||||||
home.stateVersion = "24.05";
|
# The state version is required and should stay at the version you originally installed.
|
||||||
|
stateVersion = "24.05";
|
||||||
|
|
||||||
# Let home Manager install and manage itself.
|
# Basic setup
|
||||||
programs.home-manager.enable = true;
|
username = "aires";
|
||||||
|
homeDirectory = "/home/aires";
|
||||||
|
|
||||||
# Basic setup
|
# Install extra packages, specifically gnome extensions
|
||||||
home.username = "aires";
|
packages = lib.mkIf config.host.ui.gnome.enable [
|
||||||
home.homeDirectory = "/home/aires";
|
pkgs.gnomeExtensions.wallpaper-slideshow
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
# Install extra packages, specifically gnome extensions
|
programs = {
|
||||||
home.packages = lib.mkIf config.host.ui.gnome.enable [
|
# Let home Manager install and manage itself.
|
||||||
pkgs.gnomeExtensions.wallpaper-slideshow
|
home-manager.enable = true;
|
||||||
];
|
|
||||||
|
|
||||||
# Set up git
|
# Set up git
|
||||||
programs.git = {
|
git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# Username and email set in nix-secrets
|
# Username and email set in nix-secrets
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
push.autoSetupRemote = "true";
|
push.autoSetupRemote = "true";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Set up Zsh
|
||||||
|
zsh = {
|
||||||
|
enable = true;
|
||||||
|
oh-my-zsh = {
|
||||||
|
enable = true;
|
||||||
|
plugins = [
|
||||||
|
"git"
|
||||||
|
];
|
||||||
|
theme = "gentoo";
|
||||||
|
};
|
||||||
|
autosuggestion.enable = true;
|
||||||
|
syntaxHighlighting.enable = true;
|
||||||
|
history.ignoreDups = true; # Do not enter command lines into the history list if they are duplicates of the previous event.
|
||||||
|
prezto = {
|
||||||
|
git.submoduleIgnore = "untracked"; # Ignore submodules when they are untracked.
|
||||||
|
};
|
||||||
|
shellAliases = {
|
||||||
|
dry-build = "cd ~/Development/nix-configuration && nix flake update && nixos-rebuild dry-build --flake .";
|
||||||
|
update = "cd ~/Development/nix-configuration && nix flake update && sudo nixos-rebuild switch --flake .";
|
||||||
|
upgrade = "update";
|
||||||
|
protontricks = "flatpak run com.github.Matoking.protontricks";
|
||||||
|
please = "sudo";
|
||||||
|
};
|
||||||
|
loginExtra = "fastfetch";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
# SSH set up in nix-secrets
|
# SSH set up in nix-secrets
|
||||||
|
|
||||||
# Set up Zsh
|
|
||||||
programs.zsh = {
|
|
||||||
enable = true;
|
|
||||||
oh-my-zsh = {
|
|
||||||
enable = true;
|
|
||||||
plugins = [
|
|
||||||
"git"
|
|
||||||
];
|
|
||||||
theme = "gentoo";
|
|
||||||
};
|
|
||||||
autosuggestion.enable = true;
|
|
||||||
syntaxHighlighting.enable = true;
|
|
||||||
history.ignoreDups = true; # Do not enter command lines into the history list if they are duplicates of the previous event.
|
|
||||||
prezto = {
|
|
||||||
git.submoduleIgnore = "untracked"; # Ignore submodules when they are untracked.
|
|
||||||
};
|
|
||||||
shellAliases = {
|
|
||||||
dry-build = "cd ~/Development/nix-configuration && nix flake update && nixos-rebuild dry-build --flake .";
|
|
||||||
update = "cd ~/Development/nix-configuration && nix flake update && sudo nixos-rebuild switch --flake .";
|
|
||||||
upgrade = "update";
|
|
||||||
protontricks = "flatpak run com.github.Matoking.protontricks";
|
|
||||||
please = "sudo";
|
|
||||||
};
|
|
||||||
loginExtra = "fastfetch";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Gnome settings specific to aires on Shura
|
# Gnome settings specific to aires on Shura
|
||||||
dconf.settings = lib.mkIf (config.networking.hostName == "Shura") {
|
dconf.settings = lib.mkIf (config.networking.hostName == "Shura") {
|
||||||
"org/gnome/desktop/interface" = {
|
"org/gnome/desktop/interface" = {
|
||||||
|
|
|
||||||
|
|
@ -45,53 +45,57 @@ with lib;
|
||||||
imports = [
|
imports = [
|
||||||
../common/gnome.nix
|
../common/gnome.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# The state version is required and should stay at the version you originally installed.
|
|
||||||
home.stateVersion = "24.05";
|
|
||||||
|
|
||||||
# Let home Manager install and manage itself.
|
home = {
|
||||||
programs.home-manager.enable = true;
|
# Basic setup
|
||||||
|
username = "gremlin";
|
||||||
|
homeDirectory = "/home/gremlin";
|
||||||
|
|
||||||
# Basic setup
|
# The state version is required and should stay at the version you originally installed.
|
||||||
home.username = "gremlin";
|
stateVersion = "24.05";
|
||||||
home.homeDirectory = "/home/gremlin";
|
};
|
||||||
|
|
||||||
# Set up git
|
programs = {
|
||||||
programs.git = {
|
# Let home Manager install and manage itself.
|
||||||
# Name and email set in nix-secrets
|
home-manager.enable = true;
|
||||||
enable = true;
|
|
||||||
extraConfig = {
|
# Set up git
|
||||||
push.autoSetupRemote = "true";
|
git = {
|
||||||
};
|
# Name and email set in nix-secrets
|
||||||
};
|
enable = true;
|
||||||
|
extraConfig = {
|
||||||
|
push.autoSetupRemote = "true";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# Set up Zsh
|
||||||
|
zsh = {
|
||||||
|
enable = true;
|
||||||
|
# Install and source the p10k theme
|
||||||
|
plugins = [
|
||||||
|
{ name = "powerlevel10k"; src = pkgs.zsh-powerlevel10k; file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; }
|
||||||
|
{ name = "powerlevel10k-config"; src = ./p10k-config; file = "p10k.zsh"; }
|
||||||
|
];
|
||||||
|
autosuggestion.enable = true;
|
||||||
|
syntaxHighlighting.enable = true;
|
||||||
|
history.ignoreDups = true; # Do not enter command lines into the history list if they are duplicates of the previous event.
|
||||||
|
prezto = {
|
||||||
|
git.submoduleIgnore = "untracked"; # Ignore submodules when they are untracked.
|
||||||
|
};
|
||||||
|
shellAliases = {
|
||||||
|
please = "sudo";
|
||||||
|
};
|
||||||
|
|
||||||
|
oh-my-zsh = {
|
||||||
|
enable = true;
|
||||||
|
plugins = [
|
||||||
|
"git"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
# SSH entries set in nix-secrets
|
# SSH entries set in nix-secrets
|
||||||
|
|
||||||
# Set up Zsh
|
|
||||||
programs.zsh = {
|
|
||||||
enable = true;
|
|
||||||
# Install and source the p10k theme
|
|
||||||
plugins = [
|
|
||||||
{ name = "powerlevel10k"; src = pkgs.zsh-powerlevel10k; file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; }
|
|
||||||
{ name = "powerlevel10k-config"; src = ./p10k-config; file = "p10k.zsh"; }
|
|
||||||
];
|
|
||||||
autosuggestion.enable = true;
|
|
||||||
syntaxHighlighting.enable = true;
|
|
||||||
history.ignoreDups = true; # Do not enter command lines into the history list if they are duplicates of the previous event.
|
|
||||||
prezto = {
|
|
||||||
git.submoduleIgnore = "untracked"; # Ignore submodules when they are untracked.
|
|
||||||
};
|
|
||||||
shellAliases = {
|
|
||||||
please = "sudo";
|
|
||||||
};
|
|
||||||
|
|
||||||
oh-my-zsh = {
|
|
||||||
enable = true;
|
|
||||||
plugins = [
|
|
||||||
"git"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue