From 4375c27ab19190ebe6332d8fe86acfc18e5cd314 Mon Sep 17 00:00:00 2001 From: Markus Heurung Date: Wed, 6 Mar 2024 12:10:11 +0100 Subject: [PATCH] back to a workable state on muhhStar --- configuration.nix | 6 ++++-- flake.lock | 6 +++--- hardware-configuration.nix | 5 +++-- home.nix | 5 ++++- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/configuration.nix b/configuration.nix index e2896ef..9b34ba3 100644 --- a/configuration.nix +++ b/configuration.nix @@ -15,7 +15,7 @@ # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - boot.loader.efi.efiSysMountPoint = "/boot/efi"; + #boot.loader.efi.efiSysMountPoint = "/boot/efi"; networking.hostName = "muhhStar"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. @@ -98,8 +98,10 @@ # $ nix search wget environment.systemPackages = with pkgs; [ git + home-manager toolbox vim + wget ]; fonts.packages = with pkgs; [ @@ -142,5 +144,5 @@ # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "22.05"; # Did you read the comment? + system.stateVersion = "23.11"; # Did you read the comment? } diff --git a/flake.lock b/flake.lock index ee625cc..2fc05b4 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709128929, - "narHash": "sha256-GWrv9a+AgGhG4/eI/CyVVIIygia7cEy68Huv3P8oyaw=", + "lastModified": 1709569716, + "narHash": "sha256-iOR44RU4jQ+YPGrn+uQeYAp7Xo7Z/+gT+wXJoGxxLTY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8e74c2f83fe12b4e5a8bd1abbc090575b0f7611", + "rev": "617579a787259b9a6419492eaac670a5f7663917", "type": "github" }, "original": { diff --git a/hardware-configuration.nix b/hardware-configuration.nix index f080810..6602c96 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -14,11 +14,11 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/59c47e7c-6e36-46ff-ab6a-bb736b334259"; + { device = "/dev/disk/by-uuid/ae5faad5-eccd-4c01-9a08-aa908febbbae"; fsType = "ext4"; }; - fileSystems."/boot/efi" = + fileSystems."/boot" = { device = "/dev/disk/by-uuid/FC9C-F3E7"; fsType = "vfat"; }; @@ -32,5 +32,6 @@ networking.useDHCP = lib.mkDefault true; # networking.interfaces.wlo2.useDHCP = lib.mkDefault true; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/home.nix b/home.nix index f05a8a8..6a18f6c 100644 --- a/home.nix +++ b/home.nix @@ -71,7 +71,7 @@ userName = "markus@heurung.net"; passwordCommand = "op read op://personal/mailbox.org/password"; imap.host = "imap.mailbox.org"; - neomutt.enable = true; + #neomutt.enable = true; #mbsync.enable = true; }; }; @@ -152,6 +152,9 @@ keychain = { enable = true; enableFishIntegration = true; + keys = [ + "id_ed25519" + ]; }; kitty = { enable = true;