mirror of
https://github.com/Ahwxorg/nixos-config.git
synced 2025-12-04 15:00:13 +01:00
chore: merge remote-tracking branch 'refs/remotes/origin/master'
This commit is contained in:
commit
43d5f6bd0c
6 changed files with 28 additions and 15 deletions
|
|
@ -1,18 +1,19 @@
|
|||
{ ... }:
|
||||
{
|
||||
imports =
|
||||
[(import ./bootloader.nix)]
|
||||
++ [(import ./hardware.nix)]
|
||||
++ [(import ./xserver.nix)]
|
||||
# [(import ./bootloader.nix)]
|
||||
[(import ./hardware.nix)]
|
||||
# ++ [(import ./xserver.nix)]
|
||||
++ [(import ./network.nix)]
|
||||
++ [(import ./pipewire.nix)]
|
||||
# ++ [(import ./pipewire.nix)]
|
||||
++ [(import ./program.nix)]
|
||||
++ [(import ./sshd.nix)]
|
||||
++ [(import ./security.nix)]
|
||||
++ [(import ./services.nix)]
|
||||
++ [(import ./system.nix)]
|
||||
++ [(import ./user.nix)]
|
||||
++ [(import ./bluetooth.nix)]
|
||||
++ [(import ./yubikey.nix)]
|
||||
++ [(import ./steam.nix)]
|
||||
++ [(import ./wayland.nix)];
|
||||
++ [(import ./user.nix)];
|
||||
# ++ [(import ./bluetooth.nix)]
|
||||
# ++ [(import ./yubikey.nix)]
|
||||
# ++ [(import ./steam.nix)]
|
||||
# ++ [(import ./wayland.nix)];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
networking = {
|
||||
hostName = "sakura";
|
||||
networkmanager.enable = true;
|
||||
nameservers = [ "9.9.9.9" ];
|
||||
firewall = {
|
||||
|
|
@ -15,7 +14,7 @@
|
|||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
networkmanagerapplet
|
||||
];
|
||||
# environment.systemPackages = with pkgs; [
|
||||
# networkmanagerapplet
|
||||
# ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@
|
|||
imports =
|
||||
if (host == "desktop") then
|
||||
[ ./../home/default.desktop.nix ]
|
||||
else if (host == "violet") then
|
||||
[ ./../home/default.violet.nix ]
|
||||
else [ ./../home ];
|
||||
home = {
|
||||
username = "${username}";
|
||||
|
|
|
|||
10
modules/home/default.violet.nix
Normal file
10
modules/home/default.violet.nix
Normal 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
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue