liv/nixos-config
1
0
Fork 0
mirror of https://github.com/Ahwxorg/nixos-config.git synced 2025-12-04 15:00:13 +01:00
Code Issues 1 Projects Releases Packages Wiki Activity Actions

chore: merge remote-tracking branch 'refs/remotes/origin/master'

Browse source
This commit is contained in:
Ahwx 2024-07-15 10:14:16 +02:00
commit 43d5f6bd0c
6 changed files with 28 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hosts/sakura/default.nix
View file

@ -5,6 +5,8 @@
./../../modules/core ./../../modules/core
]; ];
networking.hostName = "sakura";
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
acpi acpi
brightnessctl brightnessctl

3
hosts/violet/default.nix
View file

@ -3,7 +3,6 @@
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
./../../modules/core ./../../modules/core
./../../modules/core/sshd
]; ];
networking.hostName = "violet"; networking.hostName = "violet";
@ -19,7 +18,7 @@
services = { services = {
thermald.enable = true; thermald.enable = true;
cpupower-gui.enable = true; # cpupower-gui.enable = true;
# power-profiles-daemon.enable = true; # power-profiles-daemon.enable = true;
upower = { upower = {

19
modules/core/default.nix
View file

@ -1,18 +1,19 @@
{ ... }: { ... }:
{ {
imports = imports =
[(import ./bootloader.nix)] # [(import ./bootloader.nix)]
++ [(import ./hardware.nix)] [(import ./hardware.nix)]
++ [(import ./xserver.nix)] # ++ [(import ./xserver.nix)]
++ [(import ./network.nix)] ++ [(import ./network.nix)]
++ [(import ./pipewire.nix)] # ++ [(import ./pipewire.nix)]
++ [(import ./program.nix)] ++ [(import ./program.nix)]
++ [(import ./sshd.nix)]
++ [(import ./security.nix)] ++ [(import ./security.nix)]
++ [(import ./services.nix)] ++ [(import ./services.nix)]
++ [(import ./system.nix)] ++ [(import ./system.nix)]
++ [(import ./user.nix)] ++ [(import ./user.nix)];
++ [(import ./bluetooth.nix)] # ++ [(import ./bluetooth.nix)]
++ [(import ./yubikey.nix)] # ++ [(import ./yubikey.nix)]
++ [(import ./steam.nix)] # ++ [(import ./steam.nix)]
++ [(import ./wayland.nix)]; # ++ [(import ./wayland.nix)];
} }

7
modules/core/network.nix
View file

@ -1,7 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
networking = { networking = {
hostName = "sakura";
networkmanager.enable = true; networkmanager.enable = true;
nameservers = [ "9.9.9.9" ]; nameservers = [ "9.9.9.9" ];
firewall = { firewall = {
@ -15,7 +14,7 @@
}; };
}; };
environment.systemPackages = with pkgs; [ # environment.systemPackages = with pkgs; [
networkmanagerapplet # networkmanagerapplet
]; # ];
} }

2
modules/core/user.nix
View file

@ -9,6 +9,8 @@
imports = imports =
if (host == "desktop") then if (host == "desktop") then
[ ./../home/default.desktop.nix ] [ ./../home/default.desktop.nix ]
else if (host == "violet") then
[ ./../home/default.violet.nix ]
else [ ./../home ]; else [ ./../home ];
home = { home = {
username = "${username}"; username = "${username}";

10
modules/home/default.violet.nix Normal file
View file

@ -0,0 +1,10 @@
{ ...}: {
imports =
[(import ./bat.nix)] # better cat command
++ [(import ./git.nix)] # version control
++ [(import ./nvim.nix)] # neovim editor
++ [(import ./packages.nix)] # other packages
++ [(import ./scripts/scripts.nix)] # personal scripts
++ [(import ./zsh.nix)] # shell
++ [(import ./tmux.nix)]; # terminal multiplexer
}