added aragon

This commit is contained in:
Adrian Gunnar Lauterer 2024-04-18 01:05:45 +02:00
parent 4a3718a806
commit 7643267a1a
10 changed files with 93 additions and 75 deletions

View File

@ -34,7 +34,7 @@
# aragon = nixpkgs.lib.nixosSystem { # aragon = nixpkgs.lib.nixosSystem {
# system = "x86_64-linux"; # system = "x83_64-linux";
# specialArgs = { # specialArgs = {
# inherit inputs; # inherit inputs;
# }; # };
@ -53,6 +53,19 @@
# }; # };
aragon = nixpkgs.lib.nixosSystem {
system = "x84_64-linux";
specialArgs = {
inherit inputs;
};
modules = [
# Overlays-module makes "pkgs.unstable" available in configuration.nix
({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
./machines/aragon/configuration.nix
sops-nix.nixosModules.sops
];
};
galadriel = nixpkgs.lib.nixosSystem { galadriel = nixpkgs.lib.nixosSystem {

View File

@ -1,8 +1,7 @@
{pkgs, lib, ...}: {pkgs, lib, ...}:
let
unstable = import <nixos-unstable> { config = { allowUnfree = true; }; };
in
{ {
unstable.config.allowUnfree = true;
home-manager.users.gunalx = { home-manager.users.gunalx = {
#vscode with home manager #vscode with home manager
programs.vscode = { programs.vscode = {

View File

@ -1,7 +1,4 @@
{ config, pkgs, ... }: { config, pkgs, home-manager, ... }:
let
home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz";
in
{ {
imports = [ imports = [
(import "${home-manager}/nixos") (import "${home-manager}/nixos")

View File

@ -15,6 +15,12 @@
environment.systemPackages = [ environment.systemPackages = [
pkgs.steam-run pkgs.steam-run
pkgs.unstable.alvr
pkgs.openvr
pkgs.openhmd
pkgs.sidequest
pkgs.mplayer
pkgs.appimage-run
]; ];

View File

@ -1,15 +0,0 @@
{pkgs, lib, ...}:
let
unstable = import <nixos-unstable> { config = { allowUnfree = true; }; };
in
{
home-manager.users.gunalx = {
#vscode with home manager
programs.vscode = {
enable = true;
enableUpdateCheck = false;
package = unstable.vscode-fhs;
};
};
}

View File

@ -3,18 +3,23 @@
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
{ {
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
#profiles
../../profiles/base.nix
#home manager #home manager
./home.nix #../../home/home.nix
#customised applications #customised applications
./steam.nix ../../home/steam.nix
./podman.nix ../../services/podman.nix
]; ];
# Bootloader. # Bootloader.
@ -69,7 +74,7 @@
xkbVariant = ""; xkbVariant = "";
}; };
fonts.fonts = with pkgs; [ fonts.packages = with pkgs; [
noto-fonts noto-fonts
noto-fonts-cjk noto-fonts-cjk
noto-fonts-emoji noto-fonts-emoji
@ -97,11 +102,12 @@ fonts.fonts = with pkgs; [
alsa.support32Bit = true; alsa.support32Bit = true;
pulse.enable = true; pulse.enable = true;
# If you want to use JACK applications, uncomment this # If you want to use JACK applications, uncomment this
#jack.enable = true; jack.enable = true;
# use the example session manager (no others are packaged yet so this is enabled by default, # 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) # no need to redefine it in your config for now)
#media-session.enable = true; #media-session.enable = true;
}; };
# Enable touchpad support (enabled default in most desktopManager). # Enable touchpad support (enabled default in most desktopManager).
@ -115,13 +121,13 @@ fonts.fonts = with pkgs; [
packages = with pkgs; [ packages = with pkgs; [
firefox firefox
kate kate
unstable.ollama
python310 python310
python310Packages.scipy python310Packages.scipy
python310Packages.sympy python310Packages.sympy
python310Packages.numpy python310Packages.numpy
python310Packages.matplotlib python310Packages.matplotlib
python310Packages.torch python310Packages.torchWithRocm
python310Packages.torchvision python310Packages.torchvision
gcc gcc
gpp gpp
@ -129,11 +135,24 @@ fonts.fonts = with pkgs; [
rustup rustup
rustc rustc
cargo cargo
etcher
rpi-imager
minecraft
prismlauncher
hmcl
appimage-run
#unstable.alvr
easyeffects
]; ];
}; };
#allow electron 19 becasue of etcher
nixpkgs.config.permittedInsecurePackages = [
"electron-19.1.9"
];
# Allow unfree packages # Allow unfree packages
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
@ -155,15 +174,19 @@ fonts.fonts = with pkgs; [
python310Packages.sympy python310Packages.sympy
python310Packages.numpy python310Packages.numpy
python310Packages.matplotlib python310Packages.matplotlib
python310Packages.torch #python310Packages.torch
python310Packages.torchvision python310Packages.torchvision
python310Packages.torchWithRocm
gcc gcc
gpp gpp
gdb
cmake cmake
rustup rustup
rustc rustc
cargo cargo
cura cura
prusa-slicer
openscad
htop htop
killall killall
docker-compose docker-compose
@ -195,6 +218,8 @@ fonts.fonts = with pkgs; [
services.udev.extraRules = '' services.udev.extraRules = ''
ACTION=="add", SUBSYSTEM=="pci", DRIVER=="pcieport", ATTR{power/wakeup}="disabled" ACTION=="add", SUBSYSTEM=="pci", DRIVER=="pcieport", ATTR{power/wakeup}="disabled"
''; '';
#comment out to enable sleep. Uncommented over vacations
# systemd.targets.sleep.enable = false; # systemd.targets.sleep.enable = false;
# systemd.targets.suspend.enable = false; # systemd.targets.suspend.enable = false;
# systemd.targets.hibernate.enable = false; # systemd.targets.hibernate.enable = false;
@ -218,7 +243,7 @@ fonts.fonts = with pkgs; [
# 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;
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions # settings for stateful data, like file locations and database versions

View File

@ -9,12 +9,30 @@
]; ];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
#boot.initrd.kernelModules = ["amdgou" ];
boot.initrd.kernelModules = ["amdgpu" ]; boot.initrd.kernelModules = ["amdgpu" ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
services.xserver.videoDrivers = [ "amdgpu" ];
systemd.tmpfiles.rules = [
"L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"
];
hardware.opengl.extraPackages = with pkgs; [
rocmPackages.clr.icd
#amdvlk
libva-utils
];
#hardware.opengl.extraPackages32 = with pkgs; [
# driversi686Linux.amdvlk
#];
hardware.opengl.driSupport = true; # This is already enabled by default
hardware.opengl.driSupport32Bit = true; # For 32 bit applications
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/8ab16ad5-08d2-44f9-a9e4-2e6240bfd8f8"; { device = "/dev/disk/by-uuid/8ab16ad5-08d2-44f9-a9e4-2e6240bfd8f8";
fsType = "ext4"; fsType = "ext4";

View File

@ -1,18 +0,0 @@
{ config, pkgs, ... }:
let
home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz";
in
{
imports = [
(import "${home-manager}/nixos")
./code.nix
];
home-manager.users.gunalx = {
/* The home.stateVersion option does not have a default and must be set */
home.stateVersion = "23.05";
/* Here goes the rest of your home-manager config, e.g. home.packages = [ pkgs.foo ]; */
};
}

View File

@ -1,11 +0,0 @@
{
virtualisation.podman = {
enable = true;
dockerCompat = true;
dockerSocket.enable = true ;
autoPrune.flags = ["--all"];
autoPrune.enable = true;
};
}

View File

@ -3,10 +3,14 @@
# Arion works with Docker, but for NixOS-based containers, you need Podman # Arion works with Docker, but for NixOS-based containers, you need Podman
# since NixOS 21.05. # since NixOS 21.05.
virtualisation.docker.enable = false; virtualisation.docker.enable = false;
virtualisation.podman.enable = true; virtualisation.podman = {
virtualisation.podman.dockerSocket.enable = true; enable = true;
virtualisation.podman.defaultNetwork.settings = { dns_enabled = true; }; dockerCompat = true;
dockerSocket.enable = true ;
autoPrune.flags = ["--all"];
autoPrune.enable = true;
defaultNetwork.settings = { dns_enabled = true; };
};
# Use your username instead of `myuser`
users.extraUsers.gunalx.extraGroups = ["podman"]; users.extraUsers.gunalx.extraGroups = ["podman"];
} }