Zonsopkomst
/
flake
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

frija testing

This commit is contained in:
Zonsopkomst 2023-02-07 11:08:47 -06:00
parent ec5779e820
commit 813e34a49e
11 changed files with 111 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
common/TODO/hyperland.nix
View File

8
common/hyperland.nix Normal file
View File

@ -0,0 +1,8 @@
{ config, pkgs, ... }:
{
modules = [
hyprland.nixosModules.default
{programs.hyprland.enable = true;}
];
}

7
common/networking.nix Normal file
View File

@ -0,0 +1,7 @@
{ config, pkgs, ... }:
{
# Enable networking
networking.networkmanager.enable = true;
}

8
common/packages.nix Normal file
View File

@ -0,0 +1,8 @@
{ config, pkgs, ... }:
{
environment.systemPackages = with pkgs; [
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
# wget
];
}

8
common/TODO/ssh.nix → common/ssh.nix
View File

@ -1,6 +1,14 @@
{ config, pkgs, ... }:
{
# 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 the OpenSSH daemon.
# services.openssh.enable = true;

2
common/TODO/unfree.nix → common/unfree.nix
View File

@ -1,6 +1,6 @@
{ config, pkgs, ... }:
{
{
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
}

13
common/x11.nix Normal file
View File

@ -0,0 +1,13 @@
{ config, pkgs, ... }:
{
# Enable the X11 windowing system.
services.xserver.enable = true;
# Configure keymap in X11
services.xserver = {
layout = "us";
xkbVariant = "";
};
}

31
flake.nix
View File

@ -35,14 +35,29 @@
frija = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
#TODO see if I can move the imports section from configuration.nix successfully
./common/amd.nix #comment out amd.nix in configuration file to start
#./common/CUPS.nix
#./common/gnome.nix
#./common/pipewire.nix
#./common/time.nix
#TODO change the configuration.nix to a default.nix file (see discourse bookmark)
./hosts/local/frija/configuration.nix
./common/amd.nix
./common/CUPS.nix
./common/gnome.nix
./common/pipewire.nix
./common/time.nix
#./common/docker.nix
./common/flakeinit.nix
#./common/flatpak.nix
#./common/gaming.nix
#./common/hyperland.nix
#./common/insecure.nix
./common/networking.nix
#./common/waydroid.nix
./common/x11.nix
# Host Specific
./hosts/local/frija/default.nix
./hosts/local/frija/hardware-configuration.nix
./hosts/local/frija/packages.nix
./users/aspire/home-manager.nix
# User Specific
#./users/aspire/syncthing.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;

82
hosts/local/frija/configuration.nix → hosts/local/frija/default.nix
View File

@ -7,17 +7,17 @@
{
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
./packages.nix
#./hardware-configuration.nix
#./packages.nix
#../../../common/amd.nix
#../../../common/docker.nix
../../../common/flakeinit.nix
#../../../common/flakeinit.nix
#../../../common/flatpak.nix
#../../../common/gaming.nix
#../../../common/hyperland.nix
#../../../common/insecure.nix
#../../../common/waydroid.nix
../../../users/aspire/home-manager.nix
#../../../users/aspire/home-manager.nix
#../../../users/aspire/syncthing.nix
];
@ -47,58 +47,58 @@
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Enable networking
networking.networkmanager.enable = true;
#networking.networkmanager.enable = true;
# Set your time zone.
time.timeZone = "America/Chicago";
#time.timeZone = "America/Chicago";
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
#i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "en_US.UTF-8";
LC_IDENTIFICATION = "en_US.UTF-8";
LC_MEASUREMENT = "en_US.UTF-8";
LC_MONETARY = "en_US.UTF-8";
LC_NAME = "en_US.UTF-8";
LC_NUMERIC = "en_US.UTF-8";
LC_PAPER = "en_US.UTF-8";
LC_TELEPHONE = "en_US.UTF-8";
LC_TIME = "en_US.UTF-8";
};
#i18n.extraLocaleSettings = {
#LC_ADDRESS = "en_US.UTF-8";
#LC_IDENTIFICATION = "en_US.UTF-8";
#LC_MEASUREMENT = "en_US.UTF-8";
#LC_MONETARY = "en_US.UTF-8";
#LC_NAME = "en_US.UTF-8";
#LC_NUMERIC = "en_US.UTF-8";
#LC_PAPER = "en_US.UTF-8";
#LC_TELEPHONE = "en_US.UTF-8";
#LC_TIME = "en_US.UTF-8";
#};
# Enable the X11 windowing system.
services.xserver.enable = true;
#services.xserver.enable = true;
# Enable the GNOME Desktop Environment.
services.xserver.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome.enable = true;
#services.xserver.displayManager.gdm.enable = true;
#services.xserver.desktopManager.gnome.enable = true;
# Configure keymap in X11
services.xserver = {
layout = "us";
xkbVariant = "";
};
#services.xserver = {
#layout = "us";
#xkbVariant = "";
#};
# Enable CUPS to print documents.
services.printing.enable = true;
#services.printing.enable = true;
# Enable sound with pipewire.
sound.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
#sound.enable = true;
#hardware.pulseaudio.enable = false;
#security.rtkit.enable = true;
#services.pipewire = {
#enable = true;
#alsa.enable = true;
#alsa.support32Bit = true;
#pulse.enable = true;
# If you want to use JACK applications, uncomment this
#jack.enable = true;
# use the example session manager (no others are packaged yet so this is enabled by default,
# no need to redefine it in your config for now)
#media-session.enable = true;
};
#};
# Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true;
@ -108,10 +108,8 @@
isNormalUser = true;
description = "Aspire";
extraGroups = [ "docker" "networkmanager" "wheel" ];
packages = with pkgs; [
# firefox
# thunderbird
];
#packages = with pkgs; [
# ];
};
# Enable automatic login for the user.
@ -123,14 +121,14 @@
systemd.services."autovt@tty1".enable = false;
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
#nixpkgs.config.allowUnfree = true;
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
#environment.systemPackages = with pkgs; [
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
# wget
];
#];
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.

0
hosts/local/frija/home-manager.nix → hosts/local/frija/home-manager.nix.delete
View File

4
users/aspire/home-manager.nix
View File

@ -10,7 +10,9 @@
home-manager.users.aspire = { pkgs, ... }: {
home.packages = with pkgs; [
# Begin packages and options
alacritty
alacritty
# Moved btop from hosts/local/frija/packages.nix to test, if successful, move other packages
btop
];
# Need to enable home.stateVersion for it to work correctly:
home.stateVersion = "22.11";