flake.nix

@@ -103,8 +103,8 @@
         modules = [
           self.overlaysModule
           home-manager.nixosModules.home-manager
-          ./modules/common.nix
+          # ./modules/common.nix
-          ./modules/containers.nix
+          # ./modules/containers.nix
           {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;

machines/kitchen/configuration.nix

@@ -1,4 +1,11 @@
-{pkgs, ...}: {
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+{
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix

machines/thinkcentre/configuration.nix

@@ -1,10 +1,28 @@
-{pkgs, ...}: {
+# Edit this configuration file to define what should be installed on
-  imports = [
+# your system.  Help is available in the configuration.nix(5) man page
-    # Include the results of the hardware scan.
+# and in the NixOS manual (accessible by running ‘nixos-help’).
-    ./hardware-configuration.nix
-  ];
 
-  networking.hostName = "venus"; # Define your hostname.
+{ config, pkgs, ... }:
+
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+    ];
+
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  networking.hostName = "nixos"; # Define your hostname.
+  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+
+  # Configure network proxy if necessary
+  # networking.proxy.default = "http://user:password@proxy:port/";
+  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+  # Enable networking
+  networking.networkmanager.enable = true;
 
   # Set your time zone.
   time.timeZone = "America/New_York";
@@ -24,30 +42,82 @@
     LC_TIME = "en_US.UTF-8";
   };
 
+  # Enable the X11 windowing system.
+  services.xserver.enable = true;
+
+  # Enable the GNOME Desktop Environment.
+  services.xserver.displayManager.gdm.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
+
   # Configure keymap in X11
   services.xserver = {
     layout = "us";
     xkbVariant = "";
   };
 
-  swapDevices = [
+  # Enable CUPS to print documents.
-    {
+  services.printing.enable = true;
-      device = "/swapfile";
-      priority = 0;
-      size = 16384;
-    }
-  ];
 
-  programs.zsh.enable = true;
+  # Enable sound with pipewire.
+  sound.enable = true;
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    # If you want to use JACK applications, uncomment this
+    #jack.enable = true;
+
+    # use the example session manager (no others are packaged yet so this is enabled by default,
+    # no need to redefine it in your config for now)
+    #media-session.enable = true;
+  };
+
+  # Enable touchpad support (enabled default in most desktopManager).
+  # services.xserver.libinput.enable = true;
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.michael = {
     isNormalUser = true;
     description = "Michael Thomas";
-    extraGroups = ["wheel" "docker" "podman" "adbusers" "dialout"];
+    extraGroups = [ "networkmanager" "wheel" ];
-    shell = pkgs.zsh;
+    packages = with pkgs; [
+      firefox
+    #  thunderbird
+    ];
   };
 
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = true;
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs; [
+  #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+  #  wget
+  ];
+
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  # programs.gnupg.agent = {
+  #   enable = true;
+  #   enableSSHSupport = true;
+  # };
+
+  # List services that you want to enable:
+
+  # Enable the OpenSSH daemon.
+  # services.openssh.enable = true;
+
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
@@ -55,4 +125,5 @@
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "23.11"; # Did you read the comment?
+
 }

modules/bootloader.nix

@@ -4,5 +4,4 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = false;
   boot.plymouth.enable = true;
-  boot.kernelParams = ["quiet"];
 }

modules/sound.nix

@@ -1,20 +1,5 @@
 {
   # Enable sound.
   sound.enable = true;
-  hardware.pulseaudio.enable = false;
+  hardware.pulseaudio.enable = true;
-  security.rtkit.enable = true;
-
-  # Enable pipewire
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    #jack.enable = true;
-
-    # use the example session manager (no others are packaged yet so this is enabled by default,
-    # no need to redefine it in your config for now)
-    #media-session.enable = true;
-  };
 }

user/modules/git_nixos.nix

@@ -1,12 +1,9 @@
 {pkgs, ...}: {
+  # Use pkgs.gitAndTools.gitFull in order to get libsecret support
   programs.git = {
     package = pkgs.gitAndTools.gitFull;
     extraConfig = {
-      credential.helper = "oauth";
+      credential.helper = "libsecret";
     };
   };
-
-  home.packages = with pkgs; [
-    git-credential-oauth
-  ];
 }