Cleanup

hosts/muon/configuration.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, inputs, system, ... }:
 let
   cfg = config.mods;
-  res = "2560x1440";
+
 in {
   # Hardware
   imports = [
@@ -10,19 +10,7 @@ in {
 
   # System
   mods.user.name = "muon";
-  networking.hostName = cfg.user.name;
-
-  # Home
-  home-manager = {
-    extraSpecialArgs = { inherit system pkgs inputs; };
-    users."${cfg.user.name}" = {
-      imports = [
-        ./home.nix
-        inputs.self.outputs.homeManagerModules.default
-      ];
-    };
-    backupFileExtension = "bak";
-  };
+  mods.home.file = ./home.nix;
 
   # Modules
   mods.desktop.enable = true;
@@ -42,7 +30,7 @@ in {
   mods.unfree.nvidia.enable = true;
   mods.unfree.minecraft.enable = true;
 
-  # Host specific
+  # Hardware preferences
 
   ## Mouse
   services.xserver.libinput.mouse.accelProfile = "flat";
@@ -53,7 +41,7 @@ in {
       name = "DP-2";
       config = {
         enable = true;
-        mode = res;
+        mode = "2560x1440";
         position = "0x480";
         primary = true;
         rate = "144.00";
@@ -71,13 +59,6 @@ in {
     };
   };
 
-  environment.systemPackages = with pkgs; [
-    arandr
-  ];
- 
-  # Backup environment
-  services.xserver.windowManager.qtile.enable = true;
-
   # Version of first install
   system.stateVersion = "23.05";
 }

hosts/muon/home.nix

@@ -1,9 +1,5 @@
 { pkgs, lib, osConfig,... }:
 let cfg = osConfig.mods; in {
-  # Home
-  home.username = cfg.user.name;
-  home.homeDirectory = "/home/${cfg.user.name}";
-
   # Modules
   mods.xdg.enable = true;
   mods.social.enable = true;
@@ -16,7 +12,7 @@ let cfg = osConfig.mods; in {
   mods.desktop.productivity.enable = true;
   mods.desktop.media.enable = true;
 
-  # Host specific
+  # Hardware preferences
 
   ## Monitors
   xsession.windowManager.i3.config.workspaceOutputAssign = [{

modules/home/default.nix

@@ -1,4 +1,7 @@
-{ pkgs, lib, config, osConfig, ... }: {
+{ pkgs, lib, config, osConfig, ... }: let
+  cfg = osConfig.mods;
+
+in {
   imports = [
     ./terminal
     ./desktop
@@ -8,4 +11,6 @@
 
   # Let Home Manager install and manage itself
   programs.home-manager.enable = true;
+  home.username = cfg.user.name;
+  home.homeDirectory = "/home/${cfg.user.name}";
 }

modules/home/desktop/social.nix

@@ -11,9 +11,6 @@
 
       # Video
       freetube
-
-      # Gaming
-      prismlauncher
     ];
   };
 }

modules/nixos/core/boot.nix

@@ -1,9 +1,5 @@
 { pkgs, lib, config, ... }: {
-  # boot.loader.systemd-boot.enable = true;
-  # boot.plymouth.enable = true;
-  # boot.initrd.systemd.enable = true;
-  # boot.kernelParams = [ "quiet" ];
-  boot.loader = {
+  boot.loader = lib.mkIf config.mods.xorg.enable {
     timeout = 0;
     efi.canTouchEfiVariables = true;
     grub = {

modules/nixos/core/default.nix

@@ -4,5 +4,6 @@
     ./network.nix
     ./user.nix
     ./nix.nix
+    ./home.nix
   ];
 }

modules/nixos/core/home.nix

@@ -0,0 +1,21 @@
+{ pkgs, lib, config, inputs, system, ... }: let 
+  cfg = config.mods;
+
+in {
+  options.mods.home.file = lib.mkOption {
+    description = "home-manager configuration file";
+  };
+
+  config = {
+    home-manager = {
+      extraSpecialArgs = { inherit system pkgs inputs; };
+      users."${cfg.user.name}" = {
+        imports = [
+          cfg.home.file
+          inputs.self.outputs.homeManagerModules.default
+        ];
+      };
+      backupFileExtension = "bak";
+    };
+  };
+}

modules/nixos/core/network.nix

@@ -12,6 +12,8 @@
   };
 
   config = {
+    networking.hostName = config.mods.user.name;
+
     networking.networkmanager.enable = true;
     services.tailscale.enable = true;
 

modules/nixos/core/user.nix

@@ -7,7 +7,7 @@
   config = {
     users.users.${config.mods.user.name} = {
       isNormalUser = true;
-      extraGroups = [ "wheel" "docker" ];
+      extraGroups = [ "wheel" ];
       initialPassword = "changeme";
       shell = if config.programs.zsh.enable
         then pkgs.zsh

modules/nixos/server/containers/steam.nix

@@ -1,6 +1,4 @@
 { pkgs, lib, config, ... }: let 
-  # smoop = pkgs.callPackage ./smoop.nix {};
-
   steam-xinit = pkgs.writeShellScriptBin "steam-xinit" ''
     ${lib.getExe pkgs.steam} &       
     exec ${lib.getExe pkgs.openbox} &
@@ -69,34 +67,11 @@ in {
 
           openbox
           steam-xinit
-          # smoop
           novnc
-          tigervnc
           xorg.xinit
     
-          
-          # python3
-          # python3Packages.pip
-          # python3Packages.virtualenv
-          # python3Packages.tkinter
-          # python3Packages.xlib
-          # python3Packages.pillow
-          # python3Packages.python-dotenv
-          # python3Packages.pyautogui
-          # python3Packages.aiohttp
-          # python3Packages.discordpy
-          # python3Packages.opencv4
-          # stdenv.cc.cc.lib
-          # glib
-          # libglvnd
         ];
 
-        # environment.sessionVariables = rec {
-        #   LD_LIBRARY_PATH = 
-        #     "${pkgs.lib.makeLibraryPath config.environment.systemPackages}:\
-        #     ${pkgs.stdenv.cc.cc.lib.outPath}/lib:$LD_LIBRARY_PATH";
-        # };
-
         services.xserver.enable = true;
 
         networking.firewall.allowedTCPPorts = [ 6080 ];

modules/nixos/unfree/steam.nix

@@ -20,9 +20,5 @@
       enable = true;
       remotePlay.openFirewall = true;
     };
-
-    services.flatpak.enable = true;
-    xdg.portal.enable = true;
-    xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
   };
 }