mirror of
https://github.com/thilobillerbeck/dotfiles.git
synced 2025-06-15 08:44:37 +02:00
cleanup and format
This commit is contained in:
parent
1121201acd
commit
07a1841fda
37 changed files with 336 additions and 427 deletions
configs
|
|
@ -1,26 +1,29 @@
|
|||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
{ config, lib, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/2e1227f6-8725-43a3-aeb6-961df4ed9b25";
|
||||
fsType = "ext4";
|
||||
boot = {
|
||||
initrd = {
|
||||
availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
|
||||
kernelModules = [ ];
|
||||
};
|
||||
kernelModules = [ "kvm-amd" ];
|
||||
extraModulePackages = [ ];
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices."luks-6f077715-c436-4254-acb2-66d8be0a0c55".device = "/dev/disk/by-uuid/6f077715-c436-4254-acb2-66d8be0a0c55";
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/2e1227f6-8725-43a3-aeb6-961df4ed9b25";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/877C-C918";
|
||||
fsType = "vfat";
|
||||
};
|
||||
boot.initrd.luks.devices."luks-6f077715-c436-4254-acb2-66d8be0a0c55".device =
|
||||
"/dev/disk/by-uuid/6f077715-c436-4254-acb2-66d8be0a0c55";
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/877C-C918";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
|
|
@ -33,5 +36,6 @@
|
|||
# networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
hardware.cpu.amd.updateMicrocode =
|
||||
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,44 +1,43 @@
|
|||
{ inputs, pkgs, ... }:
|
||||
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = { inherit inputs; };
|
||||
home-manager.users.thilo = {
|
||||
imports = [
|
||||
./../../home-manager/modules/machine.nix
|
||||
];
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
extraSpecialArgs = { inherit inputs; };
|
||||
users.thilo = {
|
||||
imports = [ ./../../home-manager/modules/machine.nix ];
|
||||
|
||||
machine = {
|
||||
username = "thilo";
|
||||
isGeneric = false;
|
||||
isGnome = false;
|
||||
noiseSuppression.enable = true;
|
||||
isGraphical = true;
|
||||
};
|
||||
machine = {
|
||||
username = "thilo";
|
||||
isGeneric = false;
|
||||
isGnome = false;
|
||||
noiseSuppression.enable = true;
|
||||
isGraphical = true;
|
||||
};
|
||||
|
||||
xsession.pointerCursor = {
|
||||
name = "Bibata-Modern-Classic";
|
||||
package = pkgs.bibata-cursors;
|
||||
size = 128;
|
||||
};
|
||||
xsession.pointerCursor = {
|
||||
name = "Bibata-Modern-Classic";
|
||||
package = pkgs.bibata-cursors;
|
||||
size = 128;
|
||||
};
|
||||
|
||||
programs.obs-studio = {
|
||||
enable = true;
|
||||
/* plugins = with pkgs.obs-studio-plugins; [
|
||||
obs-vaapi
|
||||
obs-teleport
|
||||
droidcam-obs
|
||||
obs-gstreamer
|
||||
obs-shaderfilter
|
||||
obs-command-source
|
||||
obs-move-transition
|
||||
advanced-scene-switcher
|
||||
]; */
|
||||
};
|
||||
programs.obs-studio = {
|
||||
enable = true;
|
||||
/* plugins = with pkgs.obs-studio-plugins; [
|
||||
obs-vaapi
|
||||
obs-teleport
|
||||
droidcam-obs
|
||||
obs-gstreamer
|
||||
obs-shaderfilter
|
||||
obs-command-source
|
||||
obs-move-transition
|
||||
advanced-scene-switcher
|
||||
];
|
||||
*/
|
||||
};
|
||||
|
||||
home.sessionVariables = {
|
||||
LD_LIBRARY_PATH = "${pkgs.libGL}/lib";
|
||||
home.sessionVariables = { LD_LIBRARY_PATH = "${pkgs.libGL}/lib"; };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,35 +1,26 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
./../../nixos/common.nix
|
||||
];
|
||||
imports = [ # Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
./../../nixos/common.nix
|
||||
];
|
||||
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.loader = {
|
||||
systemd-boot.enable = true;
|
||||
efi.canTouchEfiVariables = true;
|
||||
};
|
||||
|
||||
# Setup keyfile
|
||||
boot.initrd.secrets = {
|
||||
"/crypto_keyfile.bin" = null;
|
||||
};
|
||||
boot.initrd.secrets = { "/crypto_keyfile.bin" = null; };
|
||||
|
||||
networking.hostName = "thilo-laptop"; # Define your hostname.
|
||||
|
||||
# Configure console keymap
|
||||
console.keyMap = "de";
|
||||
|
||||
environment.gnome.excludePackages = with pkgs; [
|
||||
tracker
|
||||
tracker-miners
|
||||
];
|
||||
environment.gnome.excludePackages = with pkgs; [ tracker tracker-miners ];
|
||||
|
||||
hardware.bluetooth.enable = true;
|
||||
|
||||
|
|
@ -50,10 +41,7 @@
|
|||
fwupd.enable = true;
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
brlaser
|
||||
brgenml1lpr
|
||||
];
|
||||
environment.systemPackages = with pkgs; [ brlaser brgenml1lpr ];
|
||||
|
||||
system.stateVersion = "23.05";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,34 +1,38 @@
|
|||
# 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, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "uas" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot = {
|
||||
initrd = {
|
||||
availableKernelModules =
|
||||
[ "nvme" "xhci_pci" "ahci" "usbhid" "uas" "usb_storage" "sd_mod" ];
|
||||
kernelModules = [ ];
|
||||
};
|
||||
kernelModules = [ "kvm-amd" ];
|
||||
extraModulePackages = [ ];
|
||||
};
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/34eb30d5-5faa-409f-81ee-7b996d37534a";
|
||||
fileSystems = {
|
||||
"/" = {
|
||||
device = "/dev/disk/by-uuid/34eb30d5-5faa-409f-81ee-7b996d37534a";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@" ];
|
||||
};
|
||||
|
||||
fileSystems."/data" =
|
||||
{
|
||||
"/data" = {
|
||||
device = "/dev/disk/by-uuid/91f64815-1d3c-4032-960f-0a53eb3b01ab";
|
||||
fsType = "btrfs";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/0EB3-BFB0";
|
||||
"/boot" = {
|
||||
device = "/dev/disk/by-uuid/0EB3-BFB0";
|
||||
fsType = "vfat";
|
||||
};
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
|
|
@ -40,5 +44,6 @@
|
|||
# networking.interfaces.enp8s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
hardware.cpu.amd.updateMicrocode =
|
||||
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,37 +1,33 @@
|
|||
{ inputs, pkgs, ... }:
|
||||
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = { inherit inputs; };
|
||||
home-manager.users.thilo = {
|
||||
imports = [
|
||||
./../../home-manager/modules/machine.nix
|
||||
];
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
extraSpecialArgs = { inherit inputs; };
|
||||
users.thilo = {
|
||||
imports = [ ./../../home-manager/modules/machine.nix ];
|
||||
|
||||
machine = {
|
||||
username = "thilo";
|
||||
isGeneric = false;
|
||||
isGnome = false;
|
||||
noiseSuppression.enable = true;
|
||||
isGraphical = true;
|
||||
machine = {
|
||||
username = "thilo";
|
||||
isGeneric = false;
|
||||
isGnome = false;
|
||||
noiseSuppression.enable = true;
|
||||
isGraphical = true;
|
||||
};
|
||||
|
||||
xsession.pointerCursor = {
|
||||
name = "Bibata-Modern-Classic";
|
||||
package = pkgs.bibata-cursors;
|
||||
size = 128;
|
||||
};
|
||||
|
||||
services.kdeconnect.enable = true;
|
||||
services.kdeconnect.indicator = true;
|
||||
|
||||
home.sessionVariables = { LD_LIBRARY_PATH = "${pkgs.libGL}/lib"; };
|
||||
|
||||
home.packages = with pkgs; [ libsForQt5.discover ];
|
||||
};
|
||||
|
||||
xsession.pointerCursor = {
|
||||
name = "Bibata-Modern-Classic";
|
||||
package = pkgs.bibata-cursors;
|
||||
size = 128;
|
||||
};
|
||||
|
||||
services.kdeconnect.enable = true;
|
||||
services.kdeconnect.indicator = true;
|
||||
|
||||
home.sessionVariables = {
|
||||
LD_LIBRARY_PATH = "${pkgs.libGL}/lib";
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
libsForQt5.discover
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,7 @@
|
|||
# Edit this configuration file to define what should be installed on
|
||||
# your system. Help is available in the configuration.nix(5) man page
|
||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||
{ config
|
||||
, pkgs
|
||||
, lib
|
||||
, ...
|
||||
}:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
|
|
@ -15,12 +11,18 @@
|
|||
];
|
||||
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.loader.systemd-boot.extraInstallCommands = ''
|
||||
${pkgs.gnused}/bin/sed -i "/default/c\default @saved" /boot/loader/loader.conf
|
||||
'';
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
boot = {
|
||||
loader = {
|
||||
systemd-boot = {
|
||||
enable = true;
|
||||
extraInstallCommands = ''
|
||||
${pkgs.gnused}/bin/sed -i "/default/c\default @saved" /boot/loader/loader.conf
|
||||
'';
|
||||
};
|
||||
efi.canTouchEfiVariables = true;
|
||||
};
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
};
|
||||
|
||||
networking.hostName = "thilo-pc";
|
||||
|
||||
|
|
@ -37,10 +39,7 @@
|
|||
};
|
||||
|
||||
hardware.opengl = {
|
||||
extraPackages = with pkgs; [
|
||||
vaapiVdpau
|
||||
libvdpau-va-gl
|
||||
];
|
||||
extraPackages = with pkgs; [ vaapiVdpau libvdpau-va-gl ];
|
||||
};
|
||||
|
||||
system.stateVersion = "23.05";
|
||||
|
|
|
|||
|
|
@ -1,15 +1,13 @@
|
|||
{ inputs, ... }:
|
||||
{ ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./../../home-manager/modules/machine.nix
|
||||
];
|
||||
{
|
||||
imports = [ ./../../home-manager/modules/machine.nix ];
|
||||
|
||||
machine = {
|
||||
username = "thilo";
|
||||
isGeneric = true;
|
||||
isGnome = false;
|
||||
noiseSuppression.enable = false;
|
||||
isGraphical = false;
|
||||
};
|
||||
}
|
||||
machine = {
|
||||
username = "thilo";
|
||||
isGeneric = true;
|
||||
isGnome = false;
|
||||
noiseSuppression.enable = false;
|
||||
isGraphical = false;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue