Changes

4 files changed, 24 insertions, 69 deletions

diff --git a/flake.lock b/flake.lock
index bf78e5a..90501df 100644
--- a/flake.lock
+++ b/flake.lock
@@ -29,11 +29,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1692800322,
-        "narHash": "sha256-v3Q5JUQK9CCKWkKvtDAWhN+XZGtC7wKVFtItxkiTlsA=",
+        "lastModified": 1694631477,
+        "narHash": "sha256-35SgWnBkWTyyRwVPyUKoShjzXfX0H1+HDdEEjZ/LsXc=",
         "owner": "famedly",
         "repo": "conduit",
-        "rev": "90fea00dc78a50e50aa0ebc4f4d23d9324066922",
+        "rev": "3bfdae795d4d9ec9aeaac7465e7535ac88e47756",
         "type": "gitlab"
       },
       "original": {
@@ -130,11 +130,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1694134858,
-        "narHash": "sha256-fG/ESauOGmiojKlpJG8gB62dJa5Wd+ZIuiDMKK/HD3g=",
+        "lastModified": 1694643239,
+        "narHash": "sha256-pv2k/5FvyirDE8g4TNehzwZ0T4UOMMmqWSQnM/luRtE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "19c6a4081b14443420358262f8416149bd79561a",
+        "rev": "d9b88b43524db1591fb3d9410a21428198d75d49",
         "type": "github"
       },
       "original": {
@@ -162,11 +162,11 @@
     },
     "nixpkgs-RoryNix": {
       "locked": {
-        "lastModified": 1694048570,
-        "narHash": "sha256-PEQptwFCVaJ+jLFJgrZll2shQ9VI/7xVhrCYkJo8iIw=",
+        "lastModified": 1694499547,
+        "narHash": "sha256-R7xMz1Iia6JthWRHDn36s/E248WB1/je62ovC/dUVKI=",
         "owner": "NixOs",
         "repo": "nixpkgs",
-        "rev": "4f77ea639305f1de0a14d9d41eef83313360638c",
+        "rev": "e5f018cf150e29aac26c61dac0790ea023c46b24",
         "type": "github"
       },
       "original": {
@@ -178,27 +178,23 @@
     },
     "nixpkgs-rory": {
       "locked": {
-        "lastModified": 1694129307,
-        "narHash": "sha256-7B2tQzG3Nuj9tDJEem93SGsUl5fBq7c2wiEFZ1sdaFo=",
-        "owner": "TheArcaneBrony",
-        "repo": "nixpkgs",
-        "rev": "eea848e901b685afa7d209dd25f1c7b9c691bf21",
-        "type": "github"
+        "lastModified": 0,
+        "narHash": "sha256-7bD3zk/UkVeI7R4ztsCiFOfvOaZUb9FiHhcUARbDB4k=",
+        "path": "/Rory-Open-Architecture/nixpkgs",
+        "type": "path"
       },
       "original": {
-        "owner": "TheArcaneBrony",
-        "ref": "master",
-        "repo": "nixpkgs",
-        "type": "github"
+        "path": "/Rory-Open-Architecture/nixpkgs",
+        "type": "path"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1693663421,
-        "narHash": "sha256-ImMIlWE/idjcZAfxKK8sQA7A1Gi/O58u5/CJA+mxvl8=",
+        "lastModified": 1694422566,
+        "narHash": "sha256-lHJ+A9esOz9vln/3CJG23FV6Wd2OoOFbDeEs4cMGMqc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e56990880811a451abd32515698c712788be5720",
+        "rev": "3a2786eea085f040a66ecde1bc3ddc7099f6dbeb",
         "type": "github"
       },
       "original": {
@@ -210,11 +206,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1693985761,
-        "narHash": "sha256-K5b+7j7Tt3+AqbWkcw+wMeqOAWyCD1MH26FPZyWXpdo=",
+        "lastModified": 1694422566,
+        "narHash": "sha256-lHJ+A9esOz9vln/3CJG23FV6Wd2OoOFbDeEs4cMGMqc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0bffda19b8af722f8069d09d8b6a24594c80b352",
+        "rev": "3a2786eea085f040a66ecde1bc3ddc7099f6dbeb",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 205251b..965913c 100755
--- a/flake.nix
+++ b/flake.nix
@@ -7,8 +7,8 @@
       #url="path:/Rory-Open-Architecture/nixpkgs";
     };
     nixpkgs-rory = {
-      #url = "path:/Rory-Open-Architecture/nixpkgs";
-      url = "github:TheArcaneBrony/nixpkgs/master";
+      url = "path:/Rory-Open-Architecture/nixpkgs";
+      #url = "github:TheArcaneBrony/nixpkgs/master";
     };
     nixpkgs-RoryNix = {
       url = "github:NixOs/nixpkgs/nixos-23.05";
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
deleted file mode 100644
index db87408..0000000
--- a/hardware-configuration.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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 = [ "uhci_hcd" "ehci_pci" "ata_piix" "ahci" "sd_mod" "sr_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/0b4aa781-1cbe-4e15-844b-2e90432106a6";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/7b5b60f1-38f6-482a-a17c-5bacda9ee7d5";
-      fsType = "ext4";
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/de97c09e-fbe1-4e55-94bf-77ab880517b5"; }
-    ];
-
-  # 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.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp2s8.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp16s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "i686-linux";
-  networking.enableIntel3945ABGFirmware = true;
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
diff --git a/modules/base.nix b/modules/base.nix
index 6a10a84..7124b54 100755
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -15,7 +15,7 @@
       "net.core.default_qdisc=fq"
       "net.ipv4.tcp_congestion_control=bbr"
     ];
-  }
+  };
 
   networking = {
     hostName = lib.mkDefault "Rory-nix-base";