Refactor nix config
This commit is contained in:
Martin Pander
19
newnix/hosts/home/darwin/configuration.nix
Normal file
19
newnix/hosts/home/darwin/configuration.nix
Normal file
@@ -0,0 +1,19 @@
|
||||
{ config, pkgs, self, ... }:
|
||||
|
||||
{
|
||||
# Minimal system configuration
|
||||
environment.systemPackages = [ pkgs.vim ];
|
||||
|
||||
services.nix-daemon.enable = true;
|
||||
|
||||
nix.settings.experimental-features = "nix-command flakes";
|
||||
|
||||
programs.zsh.enable = true;
|
||||
|
||||
# Set Git commit hash for darwin-version.
|
||||
system.configurationRevision = self.rev or self.dirtyRev or null;
|
||||
|
||||
system.stateVersion = 4;
|
||||
|
||||
nixpkgs.hostPlatform = "aarch64-darwin";
|
||||
}
|
||||
@@ -1,13 +1,22 @@
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
../../../modules/home/common.nix
|
||||
];
|
||||
|
||||
home.username = "martin";
|
||||
home.homeDirectory = "/Users/martin";
|
||||
|
||||
home.stateVersion = "24.05"; # Please read the comment before changing.
|
||||
home.stateVersion = "24.05";
|
||||
|
||||
programs.git = {
|
||||
userName = "Martin";
|
||||
userEmail = "git@pander-on.de";
|
||||
programs.git.settings.user = {
|
||||
name = "Martin Pander";
|
||||
email = "git@pander-on.de";
|
||||
};
|
||||
|
||||
programs.jujutsu.settings.user = {
|
||||
name = "Martin Pander";
|
||||
email = "git@pander-on.de";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,71 +1,33 @@
|
||||
# Edit this configuration file to define what should be installed on
|
||||
# your system. Help is available in the configuration.nix(5) man page, on
|
||||
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
|
||||
|
||||
# NixOS-WSL specific options are documented on the NixOS-WSL repository:
|
||||
# https://github.com/nix-community/NixOS-WSL
|
||||
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
wsl.enable = true;
|
||||
wsl.defaultUser = "pan";
|
||||
wsl.interop.register = true;
|
||||
imports = [
|
||||
../../../modules/nixos/common.nix
|
||||
];
|
||||
|
||||
# This value determines the NixOS release from which the default
|
||||
# settings for stateful data, like file locations and database versions
|
||||
# on your system were taken. It's perfectly fine and recommended to leave
|
||||
# this value at the release version of the first install of this system.
|
||||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "25.05"; # Did you read the comment?
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
networking.hostName = "nix";
|
||||
#networking.networkmanager.enable = true;
|
||||
|
||||
time.timeZone = "Europe/Berlin"; # Adjust to your timezone
|
||||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
|
||||
i18n.extraLocaleSettings = {
|
||||
LC_ADDRESS = "de_DE.UTF-8";
|
||||
LC_IDENTIFICATION = "de_DE.UTF-8";
|
||||
LC_MEASUREMENT = "de_DE.UTF-8";
|
||||
LC_MONETARY = "de_DE.UTF-8";
|
||||
LC_NAME = "de_DE.UTF-8";
|
||||
LC_NUMERIC = "de_DE.UTF-8";
|
||||
LC_PAPER = "de_DE.UTF-8";
|
||||
LC_TELEPHONE = "de_DE.UTF-8";
|
||||
LC_TIME = "de_DE.UTF-8";
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-label/nixos";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
users.users.pan = {
|
||||
networking.hostName = "macnix";
|
||||
|
||||
users.users.martin = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "networkmanager" "wheel" ];
|
||||
uid = 1000;
|
||||
shell = pkgs.zsh;
|
||||
};
|
||||
|
||||
programs.zsh.enable = true;
|
||||
services.spice-vdagentd.enable = true;
|
||||
services.qemuGuest.enable = true;
|
||||
|
||||
nix.settings = {
|
||||
experimental-features = [ "nix-command" "flakes" ];
|
||||
};
|
||||
services.xserver.videoDrivers = [ "virtio" ];
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
hardware.graphics.enable = true;
|
||||
|
||||
nix.gc = {
|
||||
automatic = true;
|
||||
dates = "weekly";
|
||||
options = "--delete-older-than 7d";
|
||||
};
|
||||
|
||||
# Automatic Store Optimization
|
||||
nix.settings.auto-optimise-store = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
git
|
||||
wget
|
||||
curl
|
||||
vim
|
||||
];
|
||||
system.stateVersion = "25.11";
|
||||
}
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
{
|
||||
description = "NixOS-WSL configuration for pan";
|
||||
|
||||
inputs = {
|
||||
# Use nixos-unstable for latest packages
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
|
||||
# NixOS-WSL for WSL-specific functionality
|
||||
nixos-wsl = {
|
||||
url = "github:nix-community/NixOS-WSL";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
# Home Manager for user configuration
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, nixos-wsl, home-manager, ... }:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
in
|
||||
{
|
||||
nixosConfigurations = {
|
||||
# Use your hostname: "nix"
|
||||
nix = nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
modules = [
|
||||
# NixOS-WSL module
|
||||
nixos-wsl.nixosModules.wsl
|
||||
|
||||
# System configuration
|
||||
./configuration.nix
|
||||
|
||||
# Home Manager as NixOS module
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.pan = import ./home.nix;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
13
newnix/hosts/home/nixos/home.nix
Normal file
13
newnix/hosts/home/nixos/home.nix
Normal file
@@ -0,0 +1,13 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
../../../modules/home/common.nix
|
||||
];
|
||||
|
||||
# User details
|
||||
home.username = "martin";
|
||||
home.homeDirectory = "/home/martin";
|
||||
|
||||
home.stateVersion = "25.11";
|
||||
}
|
||||
Reference in New Issue
Block a user