Merge pull request 'Added GCC' (#9 ) from add-gcc into master

Reviewed-on: #9
Added GCC
2023-07-01 20:55:18 +00:00 · 2023-07-01 16:53:42 -04:00 · 2023-06-30 16:52:14 +00:00 · 2023-06-30 12:49:20 -04:00 · 2023-06-30 01:04:59 +00:00 · 2023-06-29 20:59:07 -04:00
9 changed files with 35 additions and 36 deletions
--- a/configs/desktop.nix
+++ b/configs/desktop.nix
@@ -104,6 +104,17 @@
    '';
  };

+  # Enable automatic optimization of the nix store
+  nix.settings.auto-optimise-store = true;
+
+  # Enable automatic garbage collection on anything
+  # stale and older than 2 weeks
+  nix.gc = {
+    automatic = true;
+    dates = "weekly";
+    options = "--delete-older-than 14d";
+  };
+
  # Setup our ZSH shell.
  # First let's absolutely make sure the shell is enabled
  programs.zsh.enable = true;
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1687555006,
-        "narHash": "sha256-GD2Kqb/DXQBRJcHqkM2qFZqbVenyO7Co/80JHRMg2U0=",
+        "lastModified": 1687829761,
+        "narHash": "sha256-QRe1Y8SS3M4GeC58F/6ajz6V0ZLUVWX3ZAMgov2N3/g=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "33223d479ffde3d05ac16c6dff04ae43cc27e577",
+        "rev": "9790f3242da2152d5aa1976e3e4b8b414f4dd206",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -14,7 +14,6 @@
        modules = [
          ./hardware/nixos-bootstrap.nix
          ./configs/desktop.nix
-          ./hosts/nixos-bootstrap.nix
          ./users/wesley.nix
          home-manager.nixosModules.home-manager
          {
@@ -22,7 +21,6 @@
            home-manager.useUserPackages = true;
            home-manager.users.wesley = import ./home/wesley.nix;
          }
-          ./updates/no-restart.nix
        ];
      };
      "steiner" = nixpkgs.lib.nixosSystem {
@@ -30,15 +28,13 @@
        modules = [
          ./hardware/steiner.nix
          ./configs/desktop.nix
-          ./hosts/steiner.nix
          ./users/wesley.nix
          home-manager.nixosModules.home-manager
          {
            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages=true;
+            home-manager.useUserPackages = true;
            home-manager.users.wesley = import ./home/wesley-steiner.nix;
          }
-          ./updates/no-restart.nix
        ];
      };
    };
--- a/hardware/nixos-bootstrap.nix
+++ b/hardware/nixos-bootstrap.nix
@@ -5,7 +5,8 @@

 {
  imports =
-    [ (modulesPath + "/profiles/qemu-guest.nix")
+    [
+      (modulesPath + "/profiles/qemu-guest.nix")
    ];

  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
@@ -14,12 +15,14 @@
  boot.extraModulePackages = [ ];

  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/544f57e2-71e0-433b-8afe-305610bb4a6b";
+    {
+      device = "/dev/disk/by-uuid/544f57e2-71e0-433b-8afe-305610bb4a6b";
      fsType = "ext4";
    };

  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/DE9E-321B";
+    {
+      device = "/dev/disk/by-uuid/DE9E-321B";
      fsType = "vfat";
    };

@@ -32,5 +35,7 @@
  networking.useDHCP = lib.mkDefault true;
  # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;

+  networking.hostName = "nixos-bootstrap"; # Define your hostname.
+
  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }
--- a/hardware/steiner.nix
+++ b/hardware/steiner.nix
@@ -5,7 +5,8 @@

 {
  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    [
+      (modulesPath + "/installer/scan/not-detected.nix")
    ];

  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
@@ -14,25 +15,27 @@
  boot.extraModulePackages = [ ];

  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/e6e56cd8-a5ee-45d6-bc88-0edc03bfc004";
+    {
+      device = "/dev/disk/by-uuid/e6e56cd8-a5ee-45d6-bc88-0edc03bfc004";
      fsType = "btrfs";
      options = [ "subvol=@" ];
    };

  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/8357-3C1B";
+    {
+      device = "/dev/disk/by-uuid/8357-3C1B";
      fsType = "vfat";
    };

  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/e6e56cd8-a5ee-45d6-bc88-0edc03bfc004";
+    {
+      device = "/dev/disk/by-uuid/e6e56cd8-a5ee-45d6-bc88-0edc03bfc004";
      fsType = "btrfs";
      options = [ "subvol=@home" ];
    };

  swapDevices =
-    [ { device = "/dev/disk/by-uuid/fb41410e-80cd-427b-8040-e9acb57b3ce5"; }
-    ];
+    [{ device = "/dev/disk/by-uuid/fb41410e-80cd-427b-8040-e9acb57b3ce5"; }];

  # 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
@@ -42,6 +45,8 @@
  # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
  # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true;

+  networking.hostName = "steiner"; # Define your hostname.
+
  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
--- a/hosts/nixos-bootstrap.nix
+++ b/hosts/nixos-bootstrap.nix
@@ -1,5 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  networking.hostName = "nixos-bootstrap"; # Define your hostname.
-}
--- a/hosts/steiner.nix
+++ b/hosts/steiner.nix
@@ -1,5 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  networking.hostName = "steiner"; # Define your hostname.
-}
--- a/updates/no-restart.nix
+++ b/updates/no-restart.nix
@@ -1,9 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  # Enable automatic updates
-  system.autoUpgrade.enable = true;
-  # Automatically restart after update
-  #system.autoUpgrade.allowReboot = true;
-}
-
--- a/users/wesley.nix
+++ b/users/wesley.nix
@@ -12,6 +12,7 @@
      bottom
      brave
      element-desktop
+      gcc
      jamesdsp
      keepassxc
      neofetch
Author	SHA1	Message	Date
Wesley Irvin	1c26ea369f	Merge pull request 'Added GCC' (#9 ) from add-gcc into master Reviewed-on: #9	2023-07-01 20:55:18 +00:00
Wesley Irvin	5e0beeda0b	Added GCC Added in GCC for user wesley.	2023-07-01 16:53:42 -04:00
Wesley Irvin	27e2d62ba7	Merge pull request 'Cleanup Automation' (#8 ) from auto-cleanup into master Reviewed-on: #8	2023-06-30 16:52:14 +00:00
Wesley Irvin	9b1e7d405a	Cleanup Automation Added in configuration options to automatically optimize the nix-store and automatically garbage collect stale references in the store after 2 weeks.	2023-06-30 12:49:20 -04:00
Wesley Irvin	b0f44ab39f	Merge pull request 'Update 6-29-23' (#7 ) from update-6-29-23 into master Reviewed-on: #7	2023-06-30 01:04:59 +00:00
Wesley Irvin	54c7367a06	Update 6-29-23 Updated to latest updates for nixpkgs and home-manager as of 6-29-23. Also cleaned up the directory structure and moved some redundant data to locations that make a lot more sense. E.g. we moved the hostname definitions into the hardware configurations as there is other networking configuration done there. I feel this is a much more logical place to stick it. Also got rid of update directory as we are now using flakes and not channels, so our updates are limited to what our flake.lock is set to.	2023-06-29 20:59:07 -04:00