From dbebe275a8d27f9ff04b19e83022b5429ce1be10 Mon Sep 17 00:00:00 2001 From: Henry Hiles Date: Mon, 1 Jan 2024 09:01:06 -0500 Subject: [PATCH] New changes --- flake.lock | 51 +++++--------------------- flake.nix | 1 - home-manager/vscode.nix | 1 + quadraticpc/hardware-configuration.nix | 51 +++++++++++--------------- 4 files changed, 32 insertions(+), 72 deletions(-) mode change 100755 => 100644 quadraticpc/hardware-configuration.nix diff --git a/flake.lock b/flake.lock index 2bcabbd..35f01e0 100755 --- a/flake.lock +++ b/flake.lock @@ -240,11 +240,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1703553195, - "narHash": "sha256-4iOPcdDwGsiVhHM26a+uSkLmdlrZGCBUabpp4NuCEdU=", + "lastModified": 1701611132, + "narHash": "sha256-roFYOQhIrZ0DUlWbughOwHzx/PoEMrK0inJbFeuOySg=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "219145d5cba3b597de446fc0ee1d7213713aef43", + "rev": "6a885e460cf8596aa23d6f043aa10219494f1da8", "type": "github" }, "original": { @@ -287,44 +287,13 @@ "type": "github" } }, - "nixpkgs-local": { - "locked": { - "lastModified": 1698689470, - "narHash": "sha256-n9AU5+F66M9L+K+nuHd00I5ByGBUJIIJZKGj8L44+Kw=", - "ref": "refs/heads/init-monophony", - "rev": "14ff056b465b4591bd636d940cbca521acd710b3", - "revCount": 542334, - "type": "git", - "url": "file:/home/quadradical/Documents/Code/nixpkgs?branch=init-monophony" - }, - "original": { - "type": "git", - "url": "file:/home/quadradical/Documents/Code/nixpkgs?branch=init-monophony" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1703134684, - "narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d6863cbcbbb80e71cecfc03356db1cda38919523", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1703438236, - "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", + "lastModified": 1701436327, + "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", + "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", "type": "github" }, "original": { @@ -358,11 +327,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1703672123, - "narHash": "sha256-/xhobmb2Bqv6UqPAAVtvMsUw5sgPV2CURGllf22yLJY=", + "lastModified": 1701724946, + "narHash": "sha256-U5Q21HDFz3Ba31bqYhB/mfiJKOSD0s2Dc4aeNG6CcXo=", "owner": "wamserma", "repo": "flake-programs-sqlite", - "rev": "f484317325850491d0cd5ede2a7417c6c316e1c2", + "rev": "7d5f27049db2261da0b2da5a2fcc168ef9511ed2", "type": "github" }, "original": { @@ -376,7 +345,7 @@ "firefox-gnome-theme": "firefox-gnome-theme", "home-manager": "home-manager", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nixpkgs-local": "nixpkgs-local", "programsdb": "programsdb", "stylix": "stylix", diff --git a/flake.nix b/flake.nix index bf62d05..087f9b5 100755 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,6 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; stylix.url = "github:danth/stylix"; - nixpkgs-local.url = "git+file:/home/quadradical/Documents/Code/nixpkgs?branch=init-monophony"; firefox-gnome-theme = { url = "github:rafaelmardojai/firefox-gnome-theme"; flake = false; diff --git a/home-manager/vscode.nix b/home-manager/vscode.nix index 936b76d..12ccf89 100755 --- a/home-manager/vscode.nix +++ b/home-manager/vscode.nix @@ -9,6 +9,7 @@ extensions = with pkgs.vscode-extensions; [ mkhl.direnv eamodio.gitlens + dart-code.flutter jnoortheen.nix-ide timonwong.shellcheck usernamehw.errorlens diff --git a/quadraticpc/hardware-configuration.nix b/quadraticpc/hardware-configuration.nix old mode 100755 new mode 100644 index 41d5ea9..38df178 --- a/quadraticpc/hardware-configuration.nix +++ b/quadraticpc/hardware-configuration.nix @@ -1,47 +1,38 @@ # 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, ... }: + { - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot = { - initrd = { - availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod"]; - kernelModules = []; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/7d01741d-d58f-49d4-b3a2-4d37d953873d"; + fsType = "ext4"; }; - kernelModules = ["kvm-intel"]; - extraModulePackages = []; - }; - fileSystems."/" = { - device = "/dev/disk/by-uuid/f4b1301b-c329-4c3c-9f3a-5584bc22d0c1"; - fsType = "ext4"; - }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/E841-063C"; + fsType = "vfat"; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/3B50-5881"; - fsType = "vfat"; - }; - - swapDevices = []; + swapDevices = [ ]; # 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.enp3s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; + # networking.interfaces.enp14s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp15s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }