formatted everything with nixfmt
This commit is contained in:
parent
3675fbdcc1
commit
b42a379322
20 changed files with 343 additions and 240 deletions
|
|
@ -2,17 +2,25 @@
|
|||
# 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`).
|
||||
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
./disk-config.nix
|
||||
];
|
||||
imports = [
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
./disk-config.nix
|
||||
];
|
||||
|
||||
# Enable flakes
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
nix.settings.experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
|
|
@ -33,7 +41,7 @@
|
|||
|
||||
users.users.jellyfin.uid = null;
|
||||
users.users.jellyfin.group = "media";
|
||||
users.users.jellyfin.isSystemUser = true;
|
||||
users.users.jellyfin.isSystemUser = true;
|
||||
|
||||
services.jellyfin = {
|
||||
enable = true;
|
||||
|
|
@ -45,21 +53,21 @@
|
|||
};
|
||||
|
||||
# Define a user account. Don't forget to set a password with ‘passwd’. Please change the initialHashedPassword for each deployment to avoid a brute force attack on this password allowing login to the system before an actual password is set.
|
||||
users.users.blue = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
|
||||
initialHashedPassword = "$y$j9T$TbW09JXLRpNJ924xc5JEf1$YNroqf2T7AUnVzKi933eLRUp/0Bez8itOeMYsLw9g3A";
|
||||
# packages = with pkgs; [
|
||||
# neovim
|
||||
# tree
|
||||
# ];
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBqczzd/CZJMg+jmxqhl0NS7GTNymsddrxDXyTtoG9zo blue@gabbielaptop"
|
||||
];
|
||||
};
|
||||
users.users.blue = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
|
||||
initialHashedPassword = "$y$j9T$TbW09JXLRpNJ924xc5JEf1$YNroqf2T7AUnVzKi933eLRUp/0Bez8itOeMYsLw9g3A";
|
||||
# packages = with pkgs; [
|
||||
# neovim
|
||||
# tree
|
||||
# ];
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBqczzd/CZJMg+jmxqhl0NS7GTNymsddrxDXyTtoG9zo blue@gabbielaptop"
|
||||
];
|
||||
};
|
||||
|
||||
# List packages installed in system profile. To search, run:
|
||||
# $ nix search wget
|
||||
# List packages installed in system profile. To search, run:
|
||||
# $ nix search wget
|
||||
environment.systemPackages = with pkgs; [
|
||||
wget
|
||||
neovim
|
||||
|
|
@ -89,4 +97,3 @@
|
|||
system.stateVersion = "24.05"; # Did you read the comment?
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,26 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"nvme"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
|
|
|||
|
|
@ -2,17 +2,22 @@
|
|||
# your system. Help is available in the configuration.nix(5) man page
|
||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||
|
||||
{ config, lib, pkgs, inputs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
|
||||
imports =
|
||||
[
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
# Bootloader.
|
||||
# boot.loader.efi.canTouchEfiVariables = true;
|
||||
# boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
boot = {
|
||||
initrd.systemd.enable = true;
|
||||
|
|
@ -25,10 +30,13 @@
|
|||
};
|
||||
};
|
||||
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
nix.settings.experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
|
||||
# default kernel causes issues with wpa_supplicant meaning shutdown times are > 10 mins updating to kernel 69+ fixes this
|
||||
# boot.kernelPackages = pkgs.linuxKernel.packages.linux_zen;
|
||||
# boot.kernelPackages = pkgs.linuxKernel.packages.linux_zen;
|
||||
|
||||
# I was told that adding these helps but it doesnt seemt to work as monitors are still buggy at 144hz, may as well keep them
|
||||
boot.kernelParams = [
|
||||
|
|
@ -75,16 +83,16 @@
|
|||
|
||||
# Enable the X11 windowing system.
|
||||
# You can disable this if you're only using the Wayland session.
|
||||
# services.xserver.enable = true;
|
||||
# services.xserver.enable = true;
|
||||
|
||||
# Enable the KDE Plasma Desktop Environment.
|
||||
services.displayManager.sddm.enable = true;
|
||||
services.displayManager.sddm.wayland.enable = true;
|
||||
# services.desktopManager.plasma6.enable = true;
|
||||
# services.desktopManager.plasma6.enable = true;
|
||||
|
||||
# Enable the Hyprland WM functionality for NixOS (xdg portals etc.)
|
||||
programs.hyprland.enable = true;
|
||||
# programs.waybar.enable = true;
|
||||
programs.hyprland.enable = true;
|
||||
# programs.waybar.enable = true;
|
||||
|
||||
# Configure keymap in X11
|
||||
services.xserver.xkb.layout = "gb";
|
||||
|
|
@ -116,43 +124,50 @@
|
|||
# no need to redefine it in your config for now)
|
||||
#media-session.enable = true;
|
||||
};
|
||||
|
||||
|
||||
musnix.enable = true;
|
||||
|
||||
|
||||
# pam.services = [
|
||||
# { name = "gnome_keyring"
|
||||
# text = ''
|
||||
# auth optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
|
||||
# session optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
|
||||
#
|
||||
# password optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
|
||||
# '';
|
||||
# }
|
||||
# ];
|
||||
# pam.services = [
|
||||
# { name = "gnome_keyring"
|
||||
# text = ''
|
||||
# auth optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
|
||||
# session optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
|
||||
#
|
||||
# password optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
|
||||
# '';
|
||||
# }
|
||||
# ];
|
||||
|
||||
services.gnome.gnome-keyring.enable = true;
|
||||
|
||||
nix.settings.trusted-users = [ "root" "blue" ];
|
||||
nix.settings.trusted-users = [
|
||||
"root"
|
||||
"blue"
|
||||
];
|
||||
|
||||
programs.zsh.enable = true;
|
||||
users.users.blue = {
|
||||
isNormalUser = true;
|
||||
description = "Gabriella Bere";
|
||||
extraGroups = [ "networkmanager" "wheel" "dialout" "audio" ];
|
||||
extraGroups = [
|
||||
"networkmanager"
|
||||
"wheel"
|
||||
"dialout"
|
||||
"audio"
|
||||
];
|
||||
shell = pkgs.zsh;
|
||||
};
|
||||
|
||||
# home-manager = {
|
||||
# extraSpecialArgs = { inherit inputs; };
|
||||
# users = {
|
||||
# "blue" = import ../../home-manager/home.nix;
|
||||
# };
|
||||
# };
|
||||
# home-manager = {
|
||||
# extraSpecialArgs = { inherit inputs; };
|
||||
# users = {
|
||||
# "blue" = import ../../home-manager/home.nix;
|
||||
# };
|
||||
# };
|
||||
|
||||
# Enable fingerprint daemon
|
||||
services.fprintd.enable = true;
|
||||
# services.fprintd.tod.enable = true;
|
||||
# services.fprintd.tod.enable = true;
|
||||
|
||||
# Enable bluetooth and blueman
|
||||
hardware.bluetooth = {
|
||||
|
|
@ -179,10 +194,10 @@
|
|||
|
||||
# Enable steam and enable steam remoteplay
|
||||
programs.steam.enable = true;
|
||||
programs.steam.remotePlay.openFirewall = true;
|
||||
programs.steam.remotePlay.openFirewall = true;
|
||||
|
||||
# This desperately needs moving to home.nix but the home-manager module is not yet available
|
||||
|
||||
|
||||
services.protonmail-bridge = {
|
||||
enable = true;
|
||||
path = [ pkgs.gnome-keyring ];
|
||||
|
|
@ -190,15 +205,15 @@
|
|||
};
|
||||
|
||||
# protonmail daemon config
|
||||
# systemd.user.services.protonmail-bridge = {
|
||||
# enable = true;
|
||||
# wantedBy = [ "default.target" ];
|
||||
# description = "autostart protonmail-bridge on login as a daemon";
|
||||
# serviceConfig = {
|
||||
# Type = "simple";
|
||||
# ExecStart = "${lib.getExe pkgs.protonmail-bridge} --noninteractive --no-window";
|
||||
# };
|
||||
# };
|
||||
# systemd.user.services.protonmail-bridge = {
|
||||
# enable = true;
|
||||
# wantedBy = [ "default.target" ];
|
||||
# description = "autostart protonmail-bridge on login as a daemon";
|
||||
# serviceConfig = {
|
||||
# Type = "simple";
|
||||
# ExecStart = "${lib.getExe pkgs.protonmail-bridge} --noninteractive --no-window";
|
||||
# };
|
||||
# };
|
||||
|
||||
# Some programs need SUID wrappers, can be configured further or are
|
||||
# started in user sessions.
|
||||
|
|
@ -214,7 +229,7 @@
|
|||
# services.openssh.enable = true;
|
||||
|
||||
# Open ports in the firewall.
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
43391 # used to forward minecraft traffic to minecraft.gabbie.blue:33991
|
||||
4455 # used for OBS websocket
|
||||
7777 # used for Satisfactory Server
|
||||
|
|
|
|||
|
|
@ -1,33 +1,49 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "usbhid" "sd_mod" ];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"nvme"
|
||||
"xhci_pci"
|
||||
"thunderbolt"
|
||||
"usb_storage"
|
||||
"usbhid"
|
||||
"sd_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/c5c7a251-2bd1-4c10-99fa-17069bc66161";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/c5c7a251-2bd1-4c10-99fa-17069bc66161";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/3650-CF80";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/3650-CF80";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
"fmask=0077"
|
||||
"dmask=0077"
|
||||
];
|
||||
};
|
||||
|
||||
fileSystems."/home" =
|
||||
{ device = "/dev/disk/by-uuid/7b70ea86-8c19-4089-ac1c-0fdcf24bfa8e";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/home" = {
|
||||
device = "/dev/disk/by-uuid/7b70ea86-8c19-4089-ac1c-0fdcf24bfa8e";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue