Refactor hosts folder

This commit is contained in:
2025-11-29 22:51:38 +01:00
parent 4e32e95eab
commit df731b0703
30 changed files with 214 additions and 1080 deletions

View File

@@ -1,27 +0,0 @@
{ config, ... }:
{
imports = [
# Mostly system related configuration
../../modules/nixos/audio.nix
../../modules/nixos/bluetooth.nix
../../modules/nixos/fonts.nix
../../modules/nixos/home-manager.nix
../../modules/nixos/nix.nix
../../modules/nixos/systemd-boot.nix
../../modules/nixos/sddm.nix
../../modules/nixos/users.nix
../../modules/nixos/utils.nix
#../../modules/nixos/tailscale.nix
../../modules/nixos/hyprland.nix
#../../modules/nixos/docker.nix
# You should let those lines as is
./hardware-configuration.nix
./variables.nix
];
home-manager.users."${config.var.username}" = import ./home.nix;
# Don't touch this
system.stateVersion = "24.05";
}

View File

@@ -1,6 +1,6 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
# to /etc/nixos/system.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{

View File

@@ -6,100 +6,14 @@
}:
{
imports = [
# Mostly user-specific configuration
../../modules/home-manager/desktop.nix
./variables.nix
../../secrets
# Programs
../../modules/home-manager/accounts
../../modules/home-manager/nixCats
../../modules/home-manager/shell
../../modules/home-manager/aerc.nix
../../modules/home-manager/bitwarden.nix
../../modules/home-manager/direnv.nix
../../modules/home-manager/discord.nix
../../modules/home-manager/ghostty.nix
../../modules/home-manager/git.nix
../../modules/home-manager/gpg.nix
../../modules/home-manager/khal.nix
../../modules/home-manager/kitty.nix
../../modules/home-manager/lazygit.nix
../../modules/home-manager/nh.nix
../../modules/home-manager/rclone.nix
../../modules/home-manager/spicetify.nix
../../modules/home-manager/ssh.nix
../../modules/home-manager/thunar.nix
../../modules/home-manager/thunderbird.nix
../../modules/home-manager/todoman.nix
../../modules/home-manager/vicinae.nix
../../modules/home-manager/zathura.nix
# Scripts
../../modules/home-manager/scripts
# System (Desktop environment like stuff)
../../modules/home-manager/hyprland
../../modules/home-manager/hyprpanel.nix
../../modules/home-manager/hyprpaper.nix
../../modules/home-manager/mime.nix
../../modules/home-manager/udiskie.nix
];
home = {
inherit (config.var) username;
homeDirectory = "/home/" + config.var.username;
packages = with pkgs; [
dotnet-runtime
dafny
gemini-cli
# Apps
bitwarden-desktop # Password manager
vlc # Video player
blanket # White-noise app
obsidian # Note taking app
planify # Todolists
textpieces # Manipulate texts
curtail # Compress images
resources # Ressource monitor
gnome-clocks # Clocks app
gnome-text-editor # Basic graphic text editor
mpv # Video player
brave # Web browser
# Privacy
session-desktop # Session app, private messages
signal-desktop # Signal app, private messages
protonvpn-gui
proton-pass
proton-authenticator
# ticktick # Privacy friendly todo app
# Utils
zip
unzip
optipng
jpegoptim
pfetch
btop
fastfetch
# Just cool
peaclock
cbonsai
pipes
cmatrix
# Backup
vscode
libreoffice-qt6-fresh
];
# Don't touch this
stateVersion = "24.05";
};

13
hosts/polaris/system.nix Normal file
View File

@@ -0,0 +1,13 @@
{ config, ... }:
{
imports = [
../../modules/nixos/desktop.nix
./hardware-configuration.nix
./variables.nix
];
home-manager.users."${config.var.username}" = import ./home.nix;
system.stateVersion = "24.05";
}

View File

@@ -1,41 +1,9 @@
{ config, ... }:
{
config,
lib,
...
}:
{
imports = [
# Choose your theme here:
../../modules/themes/catppuccin.nix
];
config.var = {
hostname = "polaris";
username = "kiri";
configDirectory = "/home/" + config.var.username + "/.config/nixos"; # The path of the nixos configuration directory
keyboardLayout = "us";
location = "Meterik";
timeZone = "Europe/Amsterdam";
defaultLocale = "en_US.UTF-8";
timeLocale = "en_DK.UTF-8";
numericLocale = "en_IE.UTF-8";
otherLocale = "nl_NL.UTF-8";
git = {
username = "kiri";
email = "mail@jelles.net";
};
preferred = {
editor = "nvim";
terminal = "kitty";
browser = "brave";
};
autoUpgrade = false;
autoGarbageCollector = true;
hyprsunset.temperature = 3500;
hyprland = {
workspace = [
@@ -54,12 +22,4 @@
];
};
};
# Let this here
options = {
var = lib.mkOption {
type = lib.types.attrs;
default = { };
};
};
}