diff --git a/configs/common.nix b/configs/common.nix index b8e5b95..cb8b30c 100755 --- a/configs/common.nix +++ b/configs/common.nix @@ -12,6 +12,7 @@ }; consoleLogLevel = 0; kernel.sysctl = {"vm.max_map_count" = 262144;}; + supportedFilesystems = ["ntfs"]; }; # Work around for https://github.com/NixOS/nixpkgs/issues/124215 @@ -24,19 +25,15 @@ shells = with pkgs; [bashInteractive zsh]; systemPackages = with pkgs; [ - ack borgbackup - borgmatic - - btrfs-progs - exfatprogs - + btrfs-progs # utils for btrfs doggo # DNS Resolver - du-dust ncdu duf # dfc alternative lsd # eza alternative + bat # cat alternative + pstree # age key encryption ssh-to-age @@ -52,47 +49,44 @@ nmap nmon bandwhich + lsof + lm_sensors gnupg - gocryptfs - graphviz hdparm - inxi - lm_sensors - lsof - man-pages - man-pages-posix + inxi # hardware list kitty.terminfo tre-command - nil - nix-du - - nix-tree - nixd - alejandra + # nix + nil # nix language server + nix-tree # like ncdu for nix store + nixd # nix diff + alejandra # nix formating parallel pciutils progress unixtools.xxd - unzip usbutils wget broot - ffmpeg git-secret - kubectl neofetch - pstree - ranger - sshfs - tealdeer + ranger # terminal filemanager + unrar - yt-dlp - nix-output-monitor + unzip + + ffmpeg + yt-dlp # to download youtube stuff + gocryptfs # file encryption + sshfs + tealdeer # shorter man pages + man-pages + man-pages-posix ]; }; diff --git a/machine/desktop/configuration.nix b/machine/desktop/configuration.nix index 3ea301a..85b6276 100755 --- a/machine/desktop/configuration.nix +++ b/machine/desktop/configuration.nix @@ -89,10 +89,26 @@ in { tmp.useTmpfs = false; supportedFilesystems = ["btrfs"]; kernelPackages = pkgs.linuxPackages_cachyos; - kernelParams = ["clearcpuid=514"]; + kernelParams = ["clearcpuid=514" "ip=dhcp"]; kernelModules = ["nct6775"]; extraModulePackages = with pkgs.linuxPackages_cachyos; [ryzen-smu]; initrd = { + availableKernelModules = ["r8169"]; + systemd.users.root.shell = "/bin/cryptsetup-askpass"; + network = { + enable = true; + ssh = { + enable = true; + port = 22; + authorizedKeys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOYEaT0gH9yJM2Al0B+VGXdZB/b2qjZK7n01Weq0TcmQ alex@framework" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN99h5reZdz9+DOyTRh8bPYWO+Dtv7TbkLbMdvi+Beio alex@desktop" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIkURF5v9vRyEPhsK80kUgYh1vsS0APL4XyH4F3Fpyic alex@macbook" + ]; + hostKeys = ["/persist/pre_boot_ssh_host_rsa_key"]; + }; + }; + luks.devices = { root = { device = "/dev/disk/by-uuid/cc43f1eb-49c3-41a6-9279-6766de3659e7"; @@ -305,6 +321,5 @@ in { }; }; - system.stateVersion = "24.11"; } diff --git a/machine/desktop/hardware-configuration.nix b/machine/desktop/hardware-configuration.nix index cbf7287..e098121 100644 --- a/machine/desktop/hardware-configuration.nix +++ b/machine/desktop/hardware-configuration.nix @@ -1,6 +1,3 @@ -# 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, @@ -12,11 +9,6 @@ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "uas" "usb_storage" "usbhid" "sd_mod"]; - boot.initrd.kernelModules = ["dm-snapshot"]; - boot.kernelModules = ["kvm-amd"]; - boot.extraModulePackages = []; - fileSystems = { "/" = { device = "/dev/disk/by-uuid/87c6b0fb-b921-47d5-a3a1-4b4c0a4f02ad";