Refactored nix config to make it slightly more modular
This commit is contained in:
10
flake.nix
10
flake.nix
@@ -12,10 +12,16 @@
|
||||
|
||||
outputs = { self, nixpkgs, ... }@inputs: {
|
||||
nixosConfigurations = {
|
||||
kyren-laptop = nixpkgs.lib.nixosSystem {
|
||||
laptop = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {inherit inputs;};
|
||||
modules = [
|
||||
./hosts/kyren-laptop/configuration.nix
|
||||
./hosts/laptop.nix
|
||||
];
|
||||
};
|
||||
lapsktop = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {inherit inputs;};
|
||||
modules = [
|
||||
./hosts/lapsktop.nix
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -1,15 +1,9 @@
|
||||
{ config, pkgs, inputs, ... }: {
|
||||
|
||||
home.username = "kyren";
|
||||
home.homeDirectory = "/home/kyren";
|
||||
|
||||
# This value determines the Home Manager release that your configuration is
|
||||
# compatible with. This helps avoid breakage when a new Home Manager release
|
||||
# introduces backwards incompatible changes.
|
||||
#
|
||||
# You should not change this value, even if you update Home Manager. If you do
|
||||
# want to update the value, then make sure to first check the Home Manager
|
||||
# release notes.
|
||||
home.stateVersion = "24.05"; # Please read the comment before changing.
|
||||
home.stateVersion = "24.05"; # DO NOT CHANGE
|
||||
|
||||
home.packages = with pkgs; [
|
||||
nerd-fonts.jetbrains-mono
|
||||
22
hosts/lapsktop.nix
Normal file
22
hosts/lapsktop.nix
Normal file
@@ -0,0 +1,22 @@
|
||||
{ config, pkgs, inputs, ... }: {
|
||||
|
||||
imports = [
|
||||
./hardware-configuration-laptop.nix
|
||||
../modules/common.nix
|
||||
../modules/kde.nix
|
||||
../modules/networking.nix
|
||||
../modules/laptop.nix
|
||||
inputs.home-manager.nixosModules.default
|
||||
];
|
||||
|
||||
networking.hostName = "kyren-laptop";
|
||||
|
||||
home-manager = {
|
||||
extraSpecialArgs = { inherit inputs pkgs; };
|
||||
useUserPackages = true;
|
||||
useGlobalPkgs = true;
|
||||
users = {
|
||||
"kyren" = import ./home.nix;
|
||||
};
|
||||
};
|
||||
}
|
||||
22
hosts/laptop.nix
Normal file
22
hosts/laptop.nix
Normal file
@@ -0,0 +1,22 @@
|
||||
{ config, pkgs, inputs, ... }: {
|
||||
|
||||
imports = [
|
||||
./hardware-configuration-laptop.nix
|
||||
../modules/common.nix
|
||||
../modules/kde.nix
|
||||
../modules/networking.nix
|
||||
../modules/laptop.nix
|
||||
inputs.home-manager.nixosModules.default
|
||||
];
|
||||
|
||||
networking.hostName = "kyren-laptop";
|
||||
|
||||
home-manager = {
|
||||
extraSpecialArgs = { inherit inputs pkgs; };
|
||||
useUserPackages = true;
|
||||
useGlobalPkgs = true;
|
||||
users = {
|
||||
"kyren" = import ./home.nix;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,28 +1,34 @@
|
||||
{ config, pkgs, inputs, ... }: {
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
inputs.home-manager.nixosModules.default
|
||||
#--------------------------------------#
|
||||
# #
|
||||
# Common Config/Packages for system #
|
||||
# #
|
||||
#--------------------------------------#
|
||||
|
||||
{config, pkgs, ...}:
|
||||
|
||||
{
|
||||
# User
|
||||
users.users.kyren = {
|
||||
isNormalUser = true;
|
||||
description = "Kyren";
|
||||
extraGroups = [ "networkmanager" "wheel" ];
|
||||
shell = pkgs.zsh;
|
||||
};
|
||||
|
||||
programs.zsh.enable = true;
|
||||
|
||||
# List packages installed in system profile
|
||||
# Use for apps that need sudo (or have issues thru home-manager)
|
||||
environment.systemPackages = with pkgs; [
|
||||
glib-networking
|
||||
openssl
|
||||
clang
|
||||
clang-tools
|
||||
ghostty
|
||||
glibcLocales
|
||||
];
|
||||
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
networking.hostName = "kyren-laptop";
|
||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
|
||||
# Optimize nix store automatically
|
||||
nix.settings.auto-optimise-store=true;
|
||||
|
||||
# Configure network proxy if necessary
|
||||
# networking.proxy.default = "http://user:password@proxy:port/";
|
||||
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
||||
|
||||
# Enable networking
|
||||
networking.networkmanager.enable = true;
|
||||
|
||||
# Localization
|
||||
time.timeZone = "Asia/Hebron";
|
||||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
i18n.supportedLocales = [
|
||||
@@ -31,22 +37,43 @@
|
||||
"en_IL/UTF-8"
|
||||
];
|
||||
|
||||
# Enable the X11 windowing system.
|
||||
# You can disable this if you're only using the Wayland session.
|
||||
services.xserver.enable = true;
|
||||
# Allow sudo without a password if in "wheel" group.
|
||||
security.sudo.wheelNeedsPassword = false;
|
||||
|
||||
# Enable the KDE Plasma Desktop Environment.
|
||||
services.displayManager.sddm.enable = true;
|
||||
services.desktopManager.plasma6.enable = true;
|
||||
# Bootloader
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.supportedFilesystems = [ "ntfs" ];
|
||||
|
||||
# Configure keymap in X11
|
||||
services.xserver.xkb = {
|
||||
layout = "us";
|
||||
variant = "";
|
||||
# Nix Config
|
||||
system.stateVersion = "24.05"; # DO NOT CHANGE!
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
nix.settings.auto-optimise-store = true; # reduces nix store size
|
||||
|
||||
# Enable dynamic linking of apps that are not in nixpkgs
|
||||
# Fixes issues with neovim plugins not working
|
||||
programs.nix-ld.enable = true;
|
||||
programs.nix-ld.libraries = with pkgs; [
|
||||
stdenv.cc.cc
|
||||
];
|
||||
|
||||
programs.firefox.enable = true;
|
||||
|
||||
# Install Steam
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
|
||||
dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
|
||||
localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
|
||||
};
|
||||
|
||||
# Enable CUPS to print documents.
|
||||
services.printing.enable = false;
|
||||
# Install Docker (without using root access)
|
||||
#virtualisation.docker.enable = true;
|
||||
virtualisation.docker.rootless = {
|
||||
enable = true;
|
||||
setSocketVariable = true;
|
||||
};
|
||||
|
||||
# Enable sound with pipewire.
|
||||
services.pulseaudio.enable = false;
|
||||
@@ -64,74 +91,8 @@
|
||||
#media-session.enable = true;
|
||||
};
|
||||
|
||||
# Enable touchpad support (enabled default in most desktopManager).
|
||||
# services.xserver.libinput.enable = true;
|
||||
|
||||
# Allow sudo without a password if in "wheel" group.
|
||||
security.sudo.wheelNeedsPassword = false;
|
||||
|
||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
||||
users.users.kyren = {
|
||||
isNormalUser = true;
|
||||
description = "Kyren";
|
||||
extraGroups = [ "networkmanager" "wheel" ];
|
||||
shell = pkgs.zsh;
|
||||
};
|
||||
|
||||
home-manager = {
|
||||
extraSpecialArgs = { inherit inputs pkgs; };
|
||||
useUserPackages = true;
|
||||
useGlobalPkgs = true;
|
||||
users = {
|
||||
"kyren" = import ./home.nix;
|
||||
};
|
||||
};
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
# Install firefox.
|
||||
programs.firefox.enable = true;
|
||||
|
||||
programs.zsh.enable = true;
|
||||
|
||||
# Install Steam
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
|
||||
dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
|
||||
localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
|
||||
};
|
||||
|
||||
# Install Docker (without using root access)
|
||||
# virtualisation.docker.enable = true;
|
||||
virtualisation.docker.rootless = {
|
||||
enable = true;
|
||||
setSocketVariable = true;
|
||||
};
|
||||
|
||||
# List packages installed in system profile. Use for apps that need sudo.
|
||||
environment.systemPackages = with pkgs; [
|
||||
glib-networking
|
||||
openssl
|
||||
clang
|
||||
clang-tools
|
||||
ghostty
|
||||
glibcLocales
|
||||
];
|
||||
|
||||
# Enable dynamic linking of applications that are not in nixpkgs (for vim LSPs for example).
|
||||
programs.nix-ld.enable = true;
|
||||
programs.nix-ld.libraries = with pkgs; [
|
||||
stdenv.cc.cc
|
||||
];
|
||||
|
||||
# Some programs need SUID wrappers, can be configured further or are
|
||||
# started in user sessions.
|
||||
# programs.mtr.enable = true;
|
||||
# programs.gnupg.agent = {
|
||||
# enable = true;
|
||||
# enableSSHSupport = true;
|
||||
# };
|
||||
# ENable CUPS daemon for printing
|
||||
services.printing.enable = false;
|
||||
|
||||
# Install Flatpak and Flathub
|
||||
services.flatpak.enable = true;
|
||||
@@ -142,23 +103,26 @@
|
||||
# Mouse config service (used with piper)
|
||||
services.ratbagd.enable = true;
|
||||
|
||||
# battery levels notifier
|
||||
systemd.timers."battery-notifier" = {
|
||||
wantedBy = [ "timers.target" ];
|
||||
timerConfig = {
|
||||
OnBootSec = "3m";
|
||||
OnUnitActiveSec = "3m";
|
||||
Unit = "battery-notifier.service";
|
||||
};
|
||||
};
|
||||
# Enable KVM/QEMU virtualization
|
||||
programs.virt-manager.enable = true;
|
||||
users.groups.libvirtd.members = ["kyren"];
|
||||
virtualisation.libvirtd.enable = true;
|
||||
virtualisation.spiceUSBRedirection.enable = true;
|
||||
|
||||
systemd.services."battery-notifier" = {
|
||||
script = "$HOME/scripts/battery_notifier.sh";
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
User = "kyren";
|
||||
};
|
||||
services.syncthing.enable = true;
|
||||
services.syncthing = {
|
||||
group = "users";
|
||||
user = "kyren";
|
||||
dataDir = "/home/kyren";
|
||||
configDir = "/home/kyren/.config/syncthing";
|
||||
};
|
||||
systemd.tmpfiles.rules = [
|
||||
"d /home/kyren/.config/syncthing 0700 kyren users"
|
||||
];
|
||||
|
||||
# VPN for Vault Hunters to avoid connection issues
|
||||
# Note, will break discord, also tried proton VPN, still has conn issues
|
||||
services.cloudflare-warp.enable = true;
|
||||
|
||||
systemd.timers."git-auto-sync" = {
|
||||
wantedBy = [ "timers.target" ];
|
||||
@@ -193,38 +157,4 @@
|
||||
script = "$HOME/projects/k/bin/k tracker sleep";
|
||||
serviceConfig = { Type = "oneshot"; User = "kyren"; };
|
||||
};
|
||||
|
||||
# Enable KVM/QEMU virtualization
|
||||
programs.virt-manager.enable = true;
|
||||
users.groups.libvirtd.members = ["kyren"];
|
||||
virtualisation.libvirtd.enable = true;
|
||||
virtualisation.spiceUSBRedirection.enable = true;
|
||||
|
||||
services.syncthing.enable = true;
|
||||
services.syncthing = {
|
||||
group = "users";
|
||||
user = "kyren";
|
||||
dataDir = "/home/kyren";
|
||||
configDir = "/home/kyren/.config/syncthing";
|
||||
};
|
||||
systemd.tmpfiles.rules = [
|
||||
"d /home/kyren/.config/syncthing 0700 kyren users"
|
||||
];
|
||||
|
||||
services.cloudflare-warp.enable = true;
|
||||
|
||||
# Open ports in the firewall.
|
||||
# networking.firewall.allowedTCPPorts = [ ... ];
|
||||
# networking.firewall.allowedUDPPorts = [ ... ];
|
||||
# Or disable the firewall altogether.
|
||||
# networking.firewall.enable = false;
|
||||
|
||||
# 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 = "24.05"; # Did you read the comment?
|
||||
|
||||
}
|
||||
17
modules/kde.nix
Normal file
17
modules/kde.nix
Normal file
@@ -0,0 +1,17 @@
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
# Enable the KDE Plasma Desktop Environment.
|
||||
services.displayManager.sddm.enable = true;
|
||||
services.desktopManager.plasma6.enable = true;
|
||||
|
||||
# Enable the X11 windowing system.
|
||||
# You can disable this if you're only using the Wayland session.
|
||||
services.xserver.enable = true;
|
||||
|
||||
# Configure keymap in X11
|
||||
services.xserver.xkb = {
|
||||
layout = "us";
|
||||
variant = "";
|
||||
};
|
||||
}
|
||||
23
modules/laptop.nix
Normal file
23
modules/laptop.nix
Normal file
@@ -0,0 +1,23 @@
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
|
||||
# battery levels notifier
|
||||
systemd.timers."battery-notifier" = {
|
||||
wantedBy = [ "timers.target" ];
|
||||
timerConfig = {
|
||||
OnBootSec = "3m";
|
||||
OnUnitActiveSec = "3m";
|
||||
Unit = "battery-notifier.service";
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services."battery-notifier" = {
|
||||
script = "$HOME/scripts/battery_notifier.sh";
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
User = "kyren";
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
12
modules/networking.nix
Normal file
12
modules/networking.nix
Normal file
@@ -0,0 +1,12 @@
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
# Enable networking
|
||||
networking.networkmanager.enable = true;
|
||||
|
||||
# Configure network proxy if necessary
|
||||
# networking.proxy.default = "http://user:password@proxy:port/";
|
||||
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
||||
|
||||
#networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||
}
|
||||
Reference in New Issue
Block a user