Compare commits
3 Commits
af861165e5
...
f8aa53b026
| Author | SHA1 | Date | |
|---|---|---|---|
| f8aa53b026 | |||
| a66da8ced2 | |||
| f74622d058 |
@@ -143,6 +143,7 @@
|
||||
xdotool
|
||||
xmodmap
|
||||
nixfmt
|
||||
units
|
||||
];
|
||||
|
||||
services.usbmuxd = {
|
||||
|
||||
@@ -2,21 +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, ... }:
|
||||
{
|
||||
imports =
|
||||
[
|
||||
./hardware-configuration.nix
|
||||
../../global/default.nix
|
||||
../../modules/communication/default.nix
|
||||
../../modules/creative/default.nix
|
||||
../../modules/development/default.nix
|
||||
../../modules/fabrication/default.nix
|
||||
../../modules/gaming/default.nix
|
||||
../../modules/kde/default.nix
|
||||
../../modules/virtualization/default.nix
|
||||
../../modules/vr/default.nix
|
||||
];
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
../../global/default.nix
|
||||
../../modules/communication/default.nix
|
||||
../../modules/creative/default.nix
|
||||
../../modules/development/default.nix
|
||||
../../modules/fabrication/default.nix
|
||||
../../modules/gaming/default.nix
|
||||
../../modules/kde/default.nix
|
||||
../../modules/virtualization/default.nix
|
||||
../../modules/vr/default.nix
|
||||
];
|
||||
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
@@ -56,9 +60,6 @@
|
||||
|
||||
services.xserver.enable = true; # On anything else modern this should be false.
|
||||
|
||||
|
||||
|
||||
|
||||
# Configure keymap in X11
|
||||
# services.xserver.xkb.layout = "us";
|
||||
# services.xserver.xkb.options = "eurosign:e,caps:escape";
|
||||
@@ -139,4 +140,3 @@
|
||||
system.stateVersion = "24.11"; # Did you read the comment?
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -20,40 +20,14 @@
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.supportedFileSystems = [ "btrfs" ];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/3c89fa92-1d43-4c48-b228-e2725fa70ee9";
|
||||
fsType = "btrfs";
|
||||
options = [ "compress=zstd" ];
|
||||
};
|
||||
|
||||
fileSystems."/home" = {
|
||||
device = "/dev/disk/by-uuid/3c89fa92-1d43-4c48-b228-e2725fa70ee9";
|
||||
fsType = "btrfs";
|
||||
options = [ "compress=zstd" ];
|
||||
};
|
||||
|
||||
fileSystems."/nix" = {
|
||||
device = "/dev/disk/by-uuid/3c89fa92-1d43-4c48-b228-e2725fa70ee9";
|
||||
fsType = "btrfs";
|
||||
options = [ "compress=zstd" "noatime" ];
|
||||
};
|
||||
|
||||
fileSystems."/swap" = {
|
||||
device = "/dev/disk/by-uuid/3c89fa92-1d43-4c48-b228-e2725fa70ee9";
|
||||
fsType = "btrfs";
|
||||
options = [ "noatime" ];
|
||||
};
|
||||
|
||||
fileSystems."/persist" = {
|
||||
device = "/dev/disk/by-uuid/3c89fa92-1d43-4c48-b228-e2725fa70ee9";
|
||||
fsType = "btrfs";
|
||||
options = [ "compress=zstd" ];
|
||||
device = "/dev/disk/by-uuid/2849654b-6c3c-4db7-9603-5fa96ce561aa";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/2260-4302";
|
||||
device = "/dev/disk/by-uuid/90C0-8767";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
"fmask=0077"
|
||||
@@ -62,7 +36,7 @@
|
||||
};
|
||||
|
||||
swapDevices = [
|
||||
{ device = "/swap/swapfile"; }
|
||||
{ device = "/dev/disk/by-uuid/7762478c-1123-4a1f-9402-1bba3723e53d"; }
|
||||
];
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
|
||||
@@ -1,12 +1,15 @@
|
||||
{pkgs, ...}:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
# Should be determined by machine config
|
||||
# services.xserver.enable = true;
|
||||
services.displayManager.sddm.enable = true;
|
||||
services.desktopManager.plasma6.enable = true;
|
||||
|
||||
programs.kdeconnect.enable = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
firefox # Odd spot, but my choice of browser is determined by environment.
|
||||
kdePackages.kate
|
||||
# kdePackages.kdeconnect-kde
|
||||
];
|
||||
}
|
||||
Reference in New Issue
Block a user