From 4a86e9b073634129721fc8930c10f7a1604d335c Mon Sep 17 00:00:00 2001 From: kB01 Date: Sat, 28 Dec 2024 21:14:52 +0100 Subject: [PATCH] Modifyed LANA9Z to match real Installation --- flake.lock | 24 +++++++++--------- systems/x86_64-linux/LANA9Z/default.nix | 30 ++++++++--------------- systems/x86_64-linux/LANA9Z/hardware.nix | 31 ++++++++++++------------ 3 files changed, 38 insertions(+), 47 deletions(-) diff --git a/flake.lock b/flake.lock index 2ded55f..aa4a8b8 100644 --- a/flake.lock +++ b/flake.lock @@ -127,11 +127,11 @@ ] }, "locked": { - "lastModified": 1734992499, - "narHash": "sha256-f9UyHMTb+BwF6RDZ8eO9HOkSlKeeSPBlcYhMmV1UNIk=", + "lastModified": 1735381016, + "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", "owner": "nix-community", "repo": "home-manager", - "rev": "f1b1786ea77739dcd181b920d430e30fb1608b8a", + "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", "type": "github" }, "original": { @@ -184,11 +184,11 @@ ] }, "locked": { - "lastModified": 1735004788, - "narHash": "sha256-4fR1BPM2IJWbCaoAQqkVr+DhDzpgGhbfLcl7V2fd0ME=", + "lastModified": 1735350237, + "narHash": "sha256-1X7y7aHH2nEm9OQE2O77/VDwvaeboBZk4RpjZTLdJPg=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "cc5f59e353d94a907cd9e06919aaecb093b59d46", + "rev": "1ea4cbc1f160175bea2c45a74c4bba048cf071ef", "type": "github" }, "original": { @@ -235,11 +235,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1734954597, - "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=", + "lastModified": 1735388221, + "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "def1d472c832d77885f174089b0d34854b007198", + "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", "type": "github" }, "original": { @@ -251,11 +251,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1735291276, + "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "type": "github" }, "original": { diff --git a/systems/x86_64-linux/LANA9Z/default.nix b/systems/x86_64-linux/LANA9Z/default.nix index 575e7a7..a38f285 100644 --- a/systems/x86_64-linux/LANA9Z/default.nix +++ b/systems/x86_64-linux/LANA9Z/default.nix @@ -2,7 +2,7 @@ { imports = - [ # Include the results of the hardware scan. + [ ./hardware.nix ]; @@ -11,14 +11,14 @@ nix.settings = { experimental-features = [ "nix-command" "flakes" ]; substituters = [ "https://cache.games01.kb-one.de" ]; - trusted-users = [ "remotebuild" ]; trusted-public-keys = [ "cache.game01.kb-one.de:JF++7CgrasYciQeB5jlziqT5BTjaknEk9cMeh4lQf30=" ]; }; - nixpkgs.config.allowUnfree = false; - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) + [ "b43-firmware" + "broadcom-sta" "veracrypt" ]; nixpkgs.config.permittedInsecurePackages = [ @@ -29,7 +29,7 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - networking.hostName = "LANA9Z"; + networking.hostName = "LANA9Z"; # Define your hostname. # Enable networking networking.networkmanager.enable = true; @@ -52,7 +52,6 @@ LC_TIME = "de_DE.UTF-8"; }; - # Enable the X11 windowing system. services.xserver.enable = true; # Enable the KDE Plasma Desktop Environment. @@ -81,29 +80,20 @@ pulse.enable = true; }; - users.users.kb = { # Managed by Homemanager + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.kb = { isNormalUser = true; description = "kB"; extraGroups = [ "networkmanager" "wheel" ]; }; - # Enable automatic login for the user. - # services.xserver.displayManager.autoLogin.enable = true; - # services.xserver.displayManager.autoLogin.user = "kb"; - - # services.gpg-agent.enable = true; - programs.ssh.startAgent = true; - # List packages installed in system profile. To search, run: $ nix search wget environment.systemPackages = with pkgs; [ vim + wget + tree git - mosh - internal.numen - internal.dotool - internal.vosk-model-small-en-us ]; - system.stateVersion = "24.05"; # NEVER Change this! - + system.stateVersion = "24.11"; # NEVER Change this } diff --git a/systems/x86_64-linux/LANA9Z/hardware.nix b/systems/x86_64-linux/LANA9Z/hardware.nix index b7b5b5c..720ecad 100644 --- a/systems/x86_64-linux/LANA9Z/hardware.nix +++ b/systems/x86_64-linux/LANA9Z/hardware.nix @@ -2,35 +2,36 @@ inherit (inputs) nixos-hardware; in { imports = - [ - (modulesPath + "/installer/scan/not-detected.nix") - # add your model from this list: https://github.com/NixOS/nixos-hardware/blob/master/flake.nix - nixos-hardware.nixosModules.apple-macbook-pro-8-1 + [ (modulesPath + "/installer/scan/not-detected.nix") + nixos-hardware.nixosModules.apple-macbook-pro-8-1 ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ "cryptd" ]; - - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "firewire_ohci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" "wl" ]; + boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/3a434206-fcdc-40d9-a4db-ae31dc1b9896"; + { device = "/dev/disk/by-uuid/33872d2c-3008-47ad-a7cf-fed7b259dfb0"; fsType = "ext4"; }; - boot.initrd.luks.devices."luks-e06e84c8-4934-4cb5-8d84-8889d1a19275".device = "/dev/disk/by-uuid/e06e84c8-4934-4cb5-8d84-8889d1a19275"; + boot.initrd.luks.devices."luks-732125b8-36af-43ea-b684-db71b4c20406".device = "/dev/disk/by-uuid/732125b8-36af-43ea-b684-db71b4c20406"; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/CD65-0F67"; + { device = "/dev/disk/by-uuid/3C84-DD6D"; fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; + options = [ "fmask=0077" "dmask=0077" ]; }; - swapDevices = [ { device = "/swapfile"; size = 8 * 1024; } ]; + swapDevices = [ + { + device = "/swapfile"; + size = 16*1024; + } + ]; networking.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;