From f0acd5c32d4e46cd3ad6fc1b848e9bf325a6d3f5 Mon Sep 17 00:00:00 2001 From: adikro Date: Sat, 20 Dec 2025 23:52:35 +0100 Subject: installed nixos on the laptop host, updated disko --- hm/shell/foot.nix | 10 +++++----- hosts/laptop/configuration.nix | 6 ++++-- hosts/laptop/disko.nix | 11 ++++++++--- hosts/laptop/hardware-configuration.nix | 18 ++++++++++++++++++ 4 files changed, 35 insertions(+), 10 deletions(-) create mode 100644 hosts/laptop/hardware-configuration.nix diff --git a/hm/shell/foot.nix b/hm/shell/foot.nix index ecd345a..257a474 100644 --- a/hm/shell/foot.nix +++ b/hm/shell/foot.nix @@ -2,10 +2,10 @@ let cfg = config.hm.shell.foot; - footTheme = pkgs.fetchurl { - url = "https://codeberg.org/dnkl/foot/raw/branch/master/themes/gruvbox-dark"; - sha256 = "sha256-ubvnLgDEPGvNrwQdZRNguftg2SF5qcO1iVK0Tb5ZveI="; - }; +# footTheme = pkgs.fetchurl { +# url = "https://codeberg.org/dnkl/foot/raw/branch/master/themes/gruvbox-dark"; +# sha256 = "sha256-ubvnLgDEPGvNrwQdZRNguftg2SF5qcO1iVK0Tb5ZveI="; +# }; in { options.hm.shell.foot = { @@ -23,7 +23,7 @@ in main = { font = "JetBrainsMonoNFM-Regular:size=${toString cfg.fontSize}"; box-drawings-uses-font-glyphs = "yes"; - include = "${footTheme}"; +# include = "${footTheme}"; }; scrollback = { lines = 10000; diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index c3f2d24..b77bbb3 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -1,10 +1,12 @@ -{ username, ... }: +{ username, inputs, ... }: { system.stateVersion = "25.05"; imports = [ - ./hardware-configuration.nix + inputs.disko.nixosModules.disko ./disko.nix + + ./hardware-configuration.nix ../../sys/default.nix ]; diff --git a/hosts/laptop/disko.nix b/hosts/laptop/disko.nix index 54b30a1..6b9951a 100644 --- a/hosts/laptop/disko.nix +++ b/hosts/laptop/disko.nix @@ -1,5 +1,6 @@ { disko.devices = { + disk = { main = { type = "disk"; device = "/dev/nvme0n1"; @@ -13,12 +14,12 @@ content = { type = "filesystem"; format = "vfat"; - mountpoint = "/boot/efi"; + mountpoint = "/boot"; mountOptions = [ "umask=0077" ]; }; }; - root = { - size = "100%"; + nixos = { + size = "200G"; content = { type = "btrfs"; extraArgs = [ "-f" ]; @@ -42,8 +43,12 @@ }; }; }; + fedora = { + size = "100%"; + }; }; }; }; }; + }; } diff --git a/hosts/laptop/hardware-configuration.nix b/hosts/laptop/hardware-configuration.nix new file mode 100644 index 0000000..5e029fd --- /dev/null +++ b/hosts/laptop/hardware-configuration.nix @@ -0,0 +1,18 @@ +# 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, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} -- cgit v1.3