updates
This commit is contained in:
parent
baca79adc7
commit
393bda608b
4 changed files with 184 additions and 85 deletions
|
@ -1,21 +1,25 @@
|
||||||
# Edit this configuration file to define what should be installed on
|
# Edit this configuration file to define what should be installed on
|
||||||
# your system. Help is available in the configuration.nix(5) man page, on
|
# 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`).
|
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
|
||||||
|
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
config,
|
||||||
[ # Include the results of the hardware scan.
|
lib,
|
||||||
./hardware-configuration.nix
|
pkgs,
|
||||||
];
|
...
|
||||||
|
}: {
|
||||||
|
imports = [
|
||||||
|
# Include the results of the hardware scan.
|
||||||
|
./hardware-configuration.nix
|
||||||
|
];
|
||||||
|
|
||||||
# nix = {
|
nix = {
|
||||||
# package = pkgs.nixFlakes;
|
package = pkgs.nixFlakes;
|
||||||
# extraOptions = ''
|
optimise.automatic = true;
|
||||||
# experimental-features = nix-command flakes
|
gc.automatic = true;
|
||||||
# '';
|
extraOptions = ''
|
||||||
# };
|
experimental-features = nix-command flakes
|
||||||
|
'';
|
||||||
|
};
|
||||||
# Use the systemd-boot EFI boot loader.
|
# Use the systemd-boot EFI boot loader.
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
@ -23,7 +27,7 @@
|
||||||
networking.hostName = "auxin"; # Define your hostname.
|
networking.hostName = "auxin"; # Define your hostname.
|
||||||
# Pick only one of the below networking options.
|
# Pick only one of the below networking options.
|
||||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||||
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
|
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
|
||||||
|
|
||||||
# Set your time zone.
|
# Set your time zone.
|
||||||
time.timeZone = "America/New_York";
|
time.timeZone = "America/New_York";
|
||||||
|
@ -44,18 +48,18 @@
|
||||||
services.xserver.enable = true;
|
services.xserver.enable = true;
|
||||||
|
|
||||||
services.xserver.displayManager.sddm = {
|
services.xserver.displayManager.sddm = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
Autologin = {
|
Autologin = {
|
||||||
Session = "kodi.desktop";
|
Session = "kodi.desktop";
|
||||||
User = "mira";
|
User = "mira";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
services.xserver.desktopManager.xfce.enable = true;
|
services.xserver.desktopManager.xfce.enable = true;
|
||||||
|
|
||||||
# Kodi
|
# Kodi
|
||||||
services.xserver.desktopManager.kodi.enable = true;
|
services.xserver.desktopManager.kodi.enable = true;
|
||||||
|
|
||||||
# smartd
|
# smartd
|
||||||
services.smartd.enable = true;
|
services.smartd.enable = true;
|
||||||
|
@ -63,6 +67,8 @@
|
||||||
# BTRFS scrub
|
# BTRFS scrub
|
||||||
services.btrfs.autoScrub.enable = true;
|
services.btrfs.autoScrub.enable = true;
|
||||||
|
|
||||||
|
services.avahi.enable = true;
|
||||||
|
|
||||||
# Configure keymap in X11
|
# Configure keymap in X11
|
||||||
# services.xserver.xkb.layout = "us";
|
# services.xserver.xkb.layout = "us";
|
||||||
# services.xserver.xkb.options = "eurosign:e,caps:escape";
|
# services.xserver.xkb.options = "eurosign:e,caps:escape";
|
||||||
|
@ -80,7 +86,7 @@
|
||||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
# Define a user account. Don't forget to set a password with ‘passwd’.
|
||||||
users.users.mira = {
|
users.users.mira = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
extraGroups = [ "wheel" "docker" ]; # Enable ‘sudo’ for the user.
|
extraGroups = ["wheel" "docker"]; # Enable ‘sudo’ for the user.
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
firefox
|
firefox
|
||||||
tree
|
tree
|
||||||
|
@ -105,29 +111,42 @@
|
||||||
# List packages installed in system profile. To search, run:
|
# List packages installed in system profile. To search, run:
|
||||||
# $ nix search wget
|
# $ nix search wget
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
go
|
||||||
|
alejandra
|
||||||
alacritty
|
alacritty
|
||||||
bat
|
bat
|
||||||
btdu
|
btdu
|
||||||
|
chezmoi
|
||||||
btop
|
btop
|
||||||
btrbk
|
btrbk
|
||||||
|
cargo
|
||||||
czkawka
|
czkawka
|
||||||
docker
|
docker
|
||||||
|
file
|
||||||
fzf
|
fzf
|
||||||
|
gcc
|
||||||
|
git
|
||||||
|
fastfetch
|
||||||
hyfetch
|
hyfetch
|
||||||
hyperfine
|
hyperfine
|
||||||
jellyfin-media-player
|
jellyfin-media-player
|
||||||
lazydocker
|
lazydocker
|
||||||
lazygit
|
lazygit
|
||||||
git
|
|
||||||
lsd
|
lsd
|
||||||
mcfly
|
mcfly
|
||||||
neovim
|
neovim
|
||||||
|
nodePackages.pnpm
|
||||||
|
nodePackages.nodejs
|
||||||
|
kodiPackages.jellyfin
|
||||||
|
kodiPackages.steam-controller
|
||||||
sheldon
|
sheldon
|
||||||
starship
|
starship
|
||||||
tmux
|
tmux
|
||||||
viddy
|
viddy
|
||||||
wget
|
wget
|
||||||
|
zoxide
|
||||||
zsh
|
zsh
|
||||||
|
nil
|
||||||
];
|
];
|
||||||
|
|
||||||
# Some programs need SUID wrappers, can be configured further or are
|
# Some programs need SUID wrappers, can be configured further or are
|
||||||
|
@ -140,26 +159,36 @@
|
||||||
|
|
||||||
programs.zsh.enable = true;
|
programs.zsh.enable = true;
|
||||||
|
|
||||||
# programs.zoxide = {
|
programs.neovim = {
|
||||||
# enable = true;
|
enable = true;
|
||||||
# enableBashIntegration = true;
|
configure = {
|
||||||
# enableFishIntegration = true;
|
customRC = ''
|
||||||
# enableZshIntegration = true;
|
set number relativenumber
|
||||||
# };
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
# programs.fzf = {
|
defaultEditor = true;
|
||||||
# enable = true;
|
};
|
||||||
# enableBashIntegration = true;
|
# programs.zoxide = {
|
||||||
# enableFishIntegration = true;
|
# enable = true;
|
||||||
# enableZshIntegration = true;
|
# enableBashIntegration = true;
|
||||||
# };
|
# enableFishIntegration = true;
|
||||||
|
# enableZshIntegration = true;
|
||||||
|
# };
|
||||||
|
|
||||||
# programs.mcfly = {
|
# programs.fzf = {
|
||||||
# enable = true;
|
# enable = true;
|
||||||
# enableBashIntegration = true;
|
# enableBashIntegration = true;
|
||||||
# enableZshIntegration = true;
|
# enableFishIntegration = true;
|
||||||
# enableFishIntegration = true;
|
# enableZshIntegration = true;
|
||||||
# };
|
# };
|
||||||
|
|
||||||
|
# programs.mcfly = {
|
||||||
|
# enable = true;
|
||||||
|
# enableBashIntegration = true;
|
||||||
|
# enableZshIntegration = true;
|
||||||
|
# enableFishIntegration = true;
|
||||||
|
# };
|
||||||
|
|
||||||
# List services that you want to enable:
|
# List services that you want to enable:
|
||||||
|
|
||||||
|
@ -170,7 +199,6 @@
|
||||||
PermitRootLogin = "prohibit-password";
|
PermitRootLogin = "prohibit-password";
|
||||||
PasswordAuthentication = false;
|
PasswordAuthentication = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
virtualisation.docker = {
|
virtualisation.docker = {
|
||||||
|
@ -184,12 +212,30 @@
|
||||||
# networking.firewall.allowedTCPPorts = [ ... ];
|
# networking.firewall.allowedTCPPorts = [ ... ];
|
||||||
# networking.firewall.allowedUDPPorts = [ ... ];
|
# networking.firewall.allowedUDPPorts = [ ... ];
|
||||||
# Or disable the firewall altogether.
|
# Or disable the firewall altogether.
|
||||||
# networking.firewall.enable = false;
|
networking.firewall = {
|
||||||
|
enable = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.timers."qbittorrent-healthcheck" = {
|
||||||
|
wantedBy = ["timers.target"];
|
||||||
|
timerConfig = {
|
||||||
|
OnCalendar = "*/5 * * * *";
|
||||||
|
Unit = "qbittorrent-healthcheck";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
systemd.services."qbittorrent-healthcheck" = {
|
||||||
|
script = ''
|
||||||
|
${pkgs.docker} exec qbittorrent ping -c 1 -w 5 -I protonwire0 8.8.8.8 || ${pkgs.docker} restart qbittorrent
|
||||||
|
'';
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "oneshot";
|
||||||
|
User = "root";
|
||||||
|
};
|
||||||
|
};
|
||||||
# Copy the NixOS configuration file and link it from the resulting system
|
# Copy the NixOS configuration file and link it from the resulting system
|
||||||
# (/run/current-system/configuration.nix). This is useful in case you
|
# (/run/current-system/configuration.nix). This is useful in case you
|
||||||
# accidentally delete configuration.nix.
|
# accidentally delete configuration.nix.
|
||||||
system.copySystemConfiguration = true;
|
# system.copySystemConfiguration = true;
|
||||||
|
|
||||||
# This option defines the first version of NixOS you have installed on this particular machine,
|
# This option defines the first version of NixOS you have installed on this particular machine,
|
||||||
# and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
|
# and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
|
||||||
|
@ -208,6 +254,4 @@
|
||||||
#
|
#
|
||||||
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
|
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
|
||||||
system.stateVersion = "23.11"; # Did you read the comment?
|
system.stateVersion = "23.11"; # Did you read the comment?
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
27
flake.lock
generated
Normal file
27
flake.lock
generated
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
{
|
||||||
|
"nodes": {
|
||||||
|
"nixpkgs": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1710272261,
|
||||||
|
"narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": "nixpkgs"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": "root",
|
||||||
|
"version": 7
|
||||||
|
}
|
24
flake.nix
Normal file
24
flake.nix
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
# /etc/nixos/flake.nix
|
||||||
|
{
|
||||||
|
description = "flake for mira::auxin";
|
||||||
|
|
||||||
|
inputs = {
|
||||||
|
nixpkgs = {
|
||||||
|
url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
outputs = {
|
||||||
|
self,
|
||||||
|
nixpkgs,
|
||||||
|
}: {
|
||||||
|
nixosConfigurations = {
|
||||||
|
auxin = nixpkgs.lib.nixosSystem {
|
||||||
|
system = "x86_64-linux";
|
||||||
|
modules = [
|
||||||
|
./configuration.nix
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -1,53 +1,57 @@
|
||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||||
# and may be overwritten by future invocations. Please make changes
|
# and may be overwritten by future invocations. Please make changes
|
||||||
# to /etc/nixos/configuration.nix instead.
|
# to /etc/nixos/configuration.nix instead.
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
config,
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
lib,
|
||||||
];
|
pkgs,
|
||||||
|
modulesPath,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
imports = [
|
||||||
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
|
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod"];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = ["kvm-intel"];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" = {
|
||||||
{ device = "/dev/disk/by-uuid/b6931dc5-1ccb-4d81-abf6-38b6febc6176";
|
device = "/dev/disk/by-uuid/b6931dc5-1ccb-4d81-abf6-38b6febc6176";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [ "subvol=@nixos" "noatime" ];
|
options = ["subvol=@nixos" "noatime"];
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/nix" =
|
fileSystems."/nix" = {
|
||||||
{ device = "/dev/disk/by-uuid/b6931dc5-1ccb-4d81-abf6-38b6febc6176";
|
device = "/dev/disk/by-uuid/b6931dc5-1ccb-4d81-abf6-38b6febc6176";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [ "subvol=@nix" "noatime" ];
|
options = ["subvol=@nix" "noatime"];
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/home" =
|
fileSystems."/home" = {
|
||||||
{ device = "/dev/disk/by-uuid/b6931dc5-1ccb-4d81-abf6-38b6febc6176";
|
device = "/dev/disk/by-uuid/b6931dc5-1ccb-4d81-abf6-38b6febc6176";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [ "subvol=@home" "noatime" "compress=zstd" ];
|
options = ["subvol=@home" "noatime" "compress=zstd"];
|
||||||
};
|
};
|
||||||
fileSystems."/swap" =
|
fileSystems."/swap" = {
|
||||||
{ device = "/dev/disk/by-uuid/b6931dc5-1ccb-4d81-abf6-38b6febc6176";
|
device = "/dev/disk/by-uuid/b6931dc5-1ccb-4d81-abf6-38b6febc6176";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
options = [ "subvol=@swap" ];
|
options = ["subvol=@swap"];
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" = {
|
||||||
{ device = "/dev/disk/by-uuid/34E4-E112";
|
device = "/dev/disk/by-uuid/34E4-E112";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/raid" =
|
fileSystems."/raid" = {
|
||||||
{ device = "/dev/sdb1";
|
device = "/dev/sdb1";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
# options = [ "noatime" "noauto" "x-systemd.automount" "nofail" "space_cache=v2" "compress=zstd"];
|
options = ["noatime" "noauto" "x-systemd.automount" "nofail" "space_cache=v2" "compress=zstd"];
|
||||||
};
|
};
|
||||||
|
|
||||||
# swapDevices = [ "/swap/swapfile" ];
|
# swapDevices = [ "/swap/swapfile" ];
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||||
|
|
Loading…
Add table
Reference in a new issue