diff --git a/flake.lock b/flake.lock index 4676669..2946d8b 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1758653744, - "narHash": "sha256-y0B40QQ//4fpTAUfhZjoDEiUejhb2hXl5LcpNenRpYM=", + "lastModified": 1758895124, + "narHash": "sha256-qCQPdEX0F7ved/a2ydjA2vyFBhiKPuDJq9tZPlpEVYQ=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "f97518cc100599186846282457be520fda11f467", + "rev": "7749b46463cfe39501110998d6adbfa121b04adb", "type": "github" }, "original": { @@ -100,11 +100,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1758727127, - "narHash": "sha256-FdeiMlPVyu6tANl/EQatvVOEyX8d6rNMD31Emiaz8UQ=", + "lastModified": 1758768962, + "narHash": "sha256-Ht+nzVFro1TwGnoe2v/vvs/CyP2CFWUyGMdo63OBCzA=", "ref": "refs/heads/master", - "rev": "d8d1da400e3835dfc211bfa67fb359e06bfff130", - "revCount": 4, + "rev": "cac19deaf828c9d28a0813c7dda3b171c047cf0d", + "revCount": 5, "type": "git", "url": "ssh://git@github.com/alsaiduq-lab/Hu-Tao-Animated-Cursor" }, @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1758678659, - "narHash": "sha256-Ff5IFCEABf3CStKvf8MqJe7jwrHk2J8swdYTrwOj9dk=", + "lastModified": 1758851551, + "narHash": "sha256-7tKDTarLl/WSktFUDBRwLEOE0UV/OV0r3nEMzKXI8jY=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "6418c314274a8ce27078402ab1fbac7c06da7a36", + "rev": "b08fc1a88b61430a48761e5e6d3e977886391a54", "type": "github" }, "original": { @@ -209,11 +209,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1758589230, - "narHash": "sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k=", + "lastModified": 1758791193, + "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d1d883129b193f0b495d75c148c2c3a7d95789a0", + "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01", "type": "github" }, "original": { @@ -251,11 +251,11 @@ }, "unstable": { "locked": { - "lastModified": 1758446476, - "narHash": "sha256-5rdAi7CTvM/kSs6fHe1bREIva5W3TbImsto+dxG4mBo=", + "lastModified": 1758763312, + "narHash": "sha256-puBMviZhYlqOdUUgEmMVJpXqC/ToEqSvkyZ30qQ09xM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0", + "rev": "e57b3b16ad8758fd681511a078f35c416a8cc939", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 13a99c2..99026a1 100644 --- a/flake.nix +++ b/flake.nix @@ -27,6 +27,10 @@ hu-tao-cursor = { url = "git+ssh://git@github.com/alsaiduq-lab/Hu-Tao-Animated-Cursor"; }; + # TODO: sops-nix = { + # url = "github:Mic92/sops-nix"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; }; outputs = { @@ -37,6 +41,7 @@ unstable, ghostty, hu-tao-cursor, + #sops-nix, ... } @ inputs: let system = "x86_64-linux"; diff --git a/hosts/hardware-configuration.nix b/hosts/hardware-configuration.nix deleted file mode 120000 index 4dde6be..0000000 --- a/hosts/hardware-configuration.nix +++ /dev/null @@ -1 +0,0 @@ -/etc/nixos/hardware-configuration.nix \ No newline at end of file diff --git a/hosts/hardware-configuration.nix b/hosts/hardware-configuration.nix new file mode 100644 index 0000000..36e368b --- /dev/null +++ b/hosts/hardware-configuration.nix @@ -0,0 +1,41 @@ +# 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" "usbhid" "uas" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/042fab51-5d9c-454f-bd8f-315af4060a7d"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/5830-C7C5"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/68153c66-e234-49a8-9ec3-7e9af73efd1c"; } + ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/modules/core.nix b/hosts/modules/core.nix index 4575002..53235b9 100644 --- a/hosts/modules/core.nix +++ b/hosts/modules/core.nix @@ -27,5 +27,6 @@ icu libclang argc + appimage-run ]; }