Modifyed LANA9Z to match real Installation
Some checks failed
/ Check Nix Flake (push) Has been cancelled

This commit is contained in:
Kaybee 2024-12-28 21:14:52 +01:00
parent 1e78a09448
commit 4a86e9b073
No known key found for this signature in database
3 changed files with 38 additions and 47 deletions

24
flake.lock generated
View file

@ -127,11 +127,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734992499, "lastModified": 1735381016,
"narHash": "sha256-f9UyHMTb+BwF6RDZ8eO9HOkSlKeeSPBlcYhMmV1UNIk=", "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f1b1786ea77739dcd181b920d430e30fb1608b8a", "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -184,11 +184,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735004788, "lastModified": 1735350237,
"narHash": "sha256-4fR1BPM2IJWbCaoAQqkVr+DhDzpgGhbfLcl7V2fd0ME=", "narHash": "sha256-1X7y7aHH2nEm9OQE2O77/VDwvaeboBZk4RpjZTLdJPg=",
"owner": "Infinidoge", "owner": "Infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "cc5f59e353d94a907cd9e06919aaecb093b59d46", "rev": "1ea4cbc1f160175bea2c45a74c4bba048cf071ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -235,11 +235,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1734954597, "lastModified": 1735388221,
"narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=", "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "def1d472c832d77885f174089b0d34854b007198", "rev": "7c674c6734f61157e321db595dbfcd8523e04e19",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -251,11 +251,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1734649271, "lastModified": 1735291276,
"narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "rev": "634fd46801442d760e09493a794c4f15db2d0cbb",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -2,7 +2,7 @@
{ {
imports = imports =
[ # Include the results of the hardware scan. [
./hardware.nix ./hardware.nix
]; ];
@ -11,14 +11,14 @@
nix.settings = { nix.settings = {
experimental-features = [ "nix-command" "flakes" ]; experimental-features = [ "nix-command" "flakes" ];
substituters = [ "https://cache.games01.kb-one.de" ]; substituters = [ "https://cache.games01.kb-one.de" ];
trusted-users = [ "remotebuild" ];
trusted-public-keys = [ trusted-public-keys = [
"cache.game01.kb-one.de:JF++7CgrasYciQeB5jlziqT5BTjaknEk9cMeh4lQf30=" "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" "b43-firmware"
"broadcom-sta"
"veracrypt" "veracrypt"
]; ];
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [
@ -29,7 +29,7 @@
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
networking.hostName = "LANA9Z"; networking.hostName = "LANA9Z"; # Define your hostname.
# Enable networking # Enable networking
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
@ -52,7 +52,6 @@
LC_TIME = "de_DE.UTF-8"; LC_TIME = "de_DE.UTF-8";
}; };
# Enable the X11 windowing system.
services.xserver.enable = true; services.xserver.enable = true;
# Enable the KDE Plasma Desktop Environment. # Enable the KDE Plasma Desktop Environment.
@ -81,29 +80,20 @@
pulse.enable = true; 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; isNormalUser = true;
description = "kB"; description = "kB";
extraGroups = [ "networkmanager" "wheel" ]; 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 # List packages installed in system profile. To search, run: $ nix search wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
vim vim
wget
tree
git 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
} }

View file

@ -2,35 +2,36 @@
inherit (inputs) nixos-hardware; inherit (inputs) nixos-hardware;
in { in {
imports = imports =
[ [ (modulesPath + "/installer/scan/not-detected.nix")
(modulesPath + "/installer/scan/not-detected.nix") nixos-hardware.nixosModules.apple-macbook-pro-8-1
# add your model from this list: https://github.com/NixOS/nixos-hardware/blob/master/flake.nix
nixos-hardware.nixosModules.apple-macbook-pro-8-1
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "firewire_ohci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
boot.initrd.kernelModules = [ "cryptd" ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" "wl" ];
boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/3a434206-fcdc-40d9-a4db-ae31dc1b9896"; { device = "/dev/disk/by-uuid/33872d2c-3008-47ad-a7cf-fed7b259dfb0";
fsType = "ext4"; 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" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/CD65-0F67"; { device = "/dev/disk/by-uuid/3C84-DD6D";
fsType = "vfat"; 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.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;