finalizing galandor
This commit is contained in:
parent
d2fe60c8e8
commit
d2e9ea7bb9
4 changed files with 54 additions and 97 deletions
|
|
@ -123,12 +123,8 @@
|
|||
inherit inputs;
|
||||
};
|
||||
modules = [
|
||||
(nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
|
||||
./systems/galandor/configuration.nix
|
||||
nixos-hardware.nixosModules.common-cpu-intel
|
||||
nixos-hardware.nixosModules.common-cpu-intel
|
||||
nixos-hardware.nixosModules.common-gpu-nvidia-prime
|
||||
nixos-hardware.nixosModules.common-gpu-nvidia-ada-lovelace
|
||||
nixos-hardware.nixosModules.common-hidpi
|
||||
nixos-hardware.nixosModules.common-pc-laptop
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,25 +2,14 @@
|
|||
|
||||
{
|
||||
imports = [
|
||||
# ./hardware-configuration.nix
|
||||
./hardware-configuration.nix
|
||||
# ../../pkgs/base-packages.nix
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
./pkgs.nix
|
||||
../../modules/base.nix
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" "acpi_call" ];
|
||||
boot.extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
|
||||
|
||||
networking.hostName = "nixbook";
|
||||
isoImage.squashfsCompression = "gzip -Xcompression-level 1";
|
||||
# boot.initrd.kernelModules = [ "i915" ];
|
||||
hardware.cpu.amd.updateMicrocode =
|
||||
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
# hardware.cpu.intel.updateMicrocode =
|
||||
# lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
networking.hostName = "galandor";
|
||||
|
||||
hardware.acpilight.enable = lib.mkDefault true;
|
||||
# networking.interfaces.wlp170s0.useDHCP = true;
|
||||
|
|
@ -39,44 +28,21 @@
|
|||
desktopManager.cosmic.enable = true;
|
||||
};
|
||||
|
||||
# services.displayManager.cosmic-greeter.enable = true;
|
||||
|
||||
services.desktopManager.plasma6.enable = true;
|
||||
services.displayManager.sddm = {
|
||||
enable = true;
|
||||
enableHidpi = true;
|
||||
wayland.enable = true;
|
||||
settings = {
|
||||
Autologin = {
|
||||
Session = "cosmic.desktop";
|
||||
User = "abbie";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services.displayManager.cosmic-greeter.enable = true;
|
||||
programs.nix-ld.enable = true;
|
||||
# security.pam.services.kwallet = {
|
||||
# name = "kwallet";
|
||||
# enableKwallet = true;
|
||||
# };
|
||||
fonts.fontconfig.useEmbeddedBitmaps = true;
|
||||
fonts.fontDir.enable = true;
|
||||
fonts.packages = with pkgs; [
|
||||
nerd-fonts.victor-mono
|
||||
noto-fonts
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-emoji
|
||||
noto-fonts-color-emoji
|
||||
liberation_ttf
|
||||
mplus-outline-fonts.githubRelease
|
||||
dina-font
|
||||
proggyfonts
|
||||
];
|
||||
|
||||
security.pam.services = {
|
||||
sddm.enableKwallet = true;
|
||||
greetd.enableKwallet = true;
|
||||
};
|
||||
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ];
|
||||
|
|
@ -137,7 +103,6 @@
|
|||
|
||||
# Configure keymap in X11
|
||||
services.xserver.xkb.layout = "us";
|
||||
services.xserver.videoDrivers = lib.mkDefault [ "modesetting" ];
|
||||
|
||||
# Enable CUPS to print documents.
|
||||
services.printing.enable = true;
|
||||
|
|
@ -147,73 +112,29 @@
|
|||
services.usbmuxd.enable = true;
|
||||
services.fstrim.enable = true;
|
||||
|
||||
# virtualisation.libvirtd = {
|
||||
# enable = true;
|
||||
# qemu = {
|
||||
# runAsRoot = false;
|
||||
# ovmf = {
|
||||
# enable = true;
|
||||
# packages = [
|
||||
# pkgs.OVMFFull.fd
|
||||
# pkgs.pkgsCross.aarch64-multiplatform.OVMF.fd
|
||||
# ];
|
||||
# };
|
||||
# swtpm.enable = true;
|
||||
# };
|
||||
# };
|
||||
# services.samba-wsdd.enable = true;
|
||||
# services.samba = {
|
||||
# enable = true;
|
||||
# shares = {
|
||||
# public = {
|
||||
# path = "/home/abbie";
|
||||
# "read only" = false;
|
||||
# browsable = true;
|
||||
# "guest ok" = true;
|
||||
# comment = "Share";
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
|
||||
# nixpkgs.config.packageOverrides = pkgs: {
|
||||
# vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
|
||||
# };
|
||||
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
hardware.nvidia.open = true; # see the note above
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
enable32Bit = true;
|
||||
extraPackages = with pkgs; [
|
||||
libvdpau-va-gl
|
||||
vaapiVdpau
|
||||
libva1
|
||||
libva-vdpau-driver
|
||||
# libva1
|
||||
mesa
|
||||
intel-media-driver # LIBVA_DRIVER_NAME=iHD
|
||||
vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
|
||||
intel-vaapi-driver
|
||||
];
|
||||
};
|
||||
hardware.amdgpu.initrd.enable = lib.mkDefault true;
|
||||
|
||||
# systemd.services.display-manager = {
|
||||
# wants = [
|
||||
# "systemd-user-sessions.service"
|
||||
# "multi-user.target"
|
||||
# "network-online.target"
|
||||
# ];
|
||||
# after = [
|
||||
# "systemd-user-sessions.service"
|
||||
# "multi-user.target"
|
||||
# "network-online.target"
|
||||
# ];
|
||||
# };
|
||||
|
||||
# Enable touchpad support (enabled default in most desktopManager).
|
||||
services.libinput.enable = true;
|
||||
services.xserver.dpi = 144;
|
||||
|
||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
||||
users.users.abbie = {
|
||||
users.users.home = {
|
||||
isNormalUser = true;
|
||||
initialPassword = "abbie";
|
||||
initialPassword = "Cochrun784";
|
||||
extraGroups = [ "adbusers" "wheel" "networkmanager" "input" "uinput" "dialout" ];
|
||||
};
|
||||
|
||||
|
|
|
|||
41
systems/galandor/hardware-configuration.nix
Normal file
41
systems/galandor/hardware-configuration.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
# 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, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/0a46f007-773d-4244-b869-7a5775351373";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/793D-C09E";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/7aa6a392-9018-4fea-b284-daebea3207ae"; }
|
||||
];
|
||||
|
||||
# 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
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp7s0.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
|
@ -36,7 +36,6 @@
|
|||
procs
|
||||
pandoc
|
||||
samba
|
||||
pinentry
|
||||
pinentry-qt
|
||||
# caffeine-ng
|
||||
hunspell
|
||||
|
|
@ -46,12 +45,12 @@
|
|||
xdg-utils
|
||||
hardinfo2
|
||||
brightnessctl
|
||||
mpc-cli
|
||||
mpc
|
||||
brave
|
||||
kdePackages.kwallet-pam
|
||||
aria2
|
||||
kdePackages.kwallet
|
||||
glxinfo
|
||||
mesa-demos
|
||||
vulkan-tools
|
||||
wayland-utils
|
||||
nextcloud-client
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue