Compare commits

...

10 Commits

7 changed files with 39 additions and 8 deletions

View File

@@ -30,6 +30,7 @@
SUBSYSTEM=="block", ENV{ID_FS_UUID}=="A09C8D5E9C8D2FB8", ENV{UDISKS_IGNORE}="1" SUBSYSTEM=="block", ENV{ID_FS_UUID}=="A09C8D5E9C8D2FB8", ENV{UDISKS_IGNORE}="1"
''; '';
# TODO: Make all your working systems go to ext4 on the full disk for ease of use and storage # TODO: Make all your working systems go to ext4 on the full disk for ease of use and storage
virtualisation.docker.storageDriver = "btrfs"; virtualisation.docker.storageDriver = "btrfs";

View File

@@ -9,7 +9,7 @@
boot.initrd.availableKernelModules = boot.initrd.availableKernelModules =
[ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" "sr_mod" ]; [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" "ecryptfs" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/shared" = { fileSystems."/shared" = {

View File

@@ -9,7 +9,7 @@
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_usb_sdmmc" ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" "ecryptfs" ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/881615c5-5c12-46c5-8bd2-1959f9347980"; { device = "/dev/disk/by-uuid/881615c5-5c12-46c5-8bd2-1959f9347980";

View File

@@ -28,5 +28,11 @@
size = 4096; size = 4096;
}]; }];
services.xserver.xkb = {
layout = "us"; # or "us" or whatever base
variant = "neo"; # for Neo2
};
console.useXkbConfig = true; # to make it apply on TTY too
system.stateVersion = "24.11"; # Dont change this system.stateVersion = "24.11"; # Dont change this
} }

View File

@@ -8,6 +8,7 @@
[ (modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
#boot.kernelModules = [ "ecryptfs" ];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" ];
fileSystems = { fileSystems = {

View File

@@ -15,6 +15,16 @@
security.polkit.enable = true; security.polkit.enable = true;
security.pam.services.login.enableGnomeKeyring = true; security.pam.services.login.enableGnomeKeyring = true;
services.gnome.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
#security.pam.enableEcryptfs = true;
security.polkit.extraConfig = ''
polkit.addRule(function(action, subject) {
if (action.id == "org.freedesktop.udisks2.filesystem-mount-system" &&
subject.isInGroup("wheel")) {
return polkit.Result.YES;
}
});
'';
# Nix fun # Nix fun
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
@@ -34,7 +44,7 @@
services.avahi.nssmdns4 = true; services.avahi.nssmdns4 = true;
environment = { environment = {
systemPackages = with pkgs; [ yazi tmux git starship zoxide rsync rclone neovim alacritty gtk4.dev ]; systemPackages = with pkgs; [ yazi tmux git starship zoxide rsync xorg.libX11.dev rclone neovim alacritty gtk4.dev ];
}; };
nix.optimise.automatic = true; nix.optimise.automatic = true;
@@ -42,16 +52,16 @@
nix.gc = { nix.gc = {
automatic = true; automatic = true;
dates = "weekly"; dates = "weekly";
options = "--delete-older-than 7d"; # Two weeks cache then forget options = "--delete-older-than 14d"; # Two weeks cache then forget
}; };
networking = { networkmanager = { enable = true; }; }; networking = { networkmanager = { enable = true; }; };
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
console = { #console = {
font = "Lat2-Terminus16"; # font = "Lat2-Terminus16";
keyMap = "us"; # keyMap = "us";
}; #};
programs.zsh = { programs.zsh = {
enable = true; enable = true;
@@ -62,4 +72,6 @@
[ "history-substring-search" "git" "zoxide" "vi-mode" "systemadmin" ]; [ "history-substring-search" "git" "zoxide" "vi-mode" "systemadmin" ];
}; };
}; };
programs.ydotool.enable = true;
} }

View File

@@ -67,6 +67,7 @@
bat bat
vim vim
unstable.neovim unstable.neovim
emacs
inotify-tools inotify-tools
stow stow
wl-clipboard wl-clipboard
@@ -80,6 +81,7 @@
# --- System & Network --- # --- System & Network ---
btop btop
iotop
fastfetch fastfetch
acpi acpi
brightnessctl brightnessctl
@@ -93,6 +95,7 @@
curl curl
wget wget
libinput libinput
mtr
gdu gdu
timer timer
@@ -107,10 +110,17 @@
imagemagick imagemagick
immich-cli immich-cli
parted parted
lsof
tt
bitwarden-cli bitwarden-cli
lazydocker lazydocker
poppler_utils
prismlauncher
entr
yq
lazygit lazygit
gitui gitui
tokei
dig dig
unstable.yazi unstable.yazi
@@ -138,6 +148,7 @@
git-lfs git-lfs
sops sops
age age
ecryptfs
ansible ansible
android-tools android-tools
sdkmanager sdkmanager