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