Merge branch 'master' of ssh://bosco:/srv/git/.flake

4 files changed, 56 insertions, 14 deletions

diff --git a/home-manager/gaming.nix b/home-manager/gaming.nix
new file mode 100644
index 0000000..ffd4182
--- /dev/null
+++ b/home-manager/gaming.nix
@@ -0,0 +1,42 @@
+{ config, pkgs, ... }:
+# let
+#   home-manager = builtins.fetchTarball "https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz";
+#   unstable = import <nixpkgs-unstable>{};
+# in
+{
+  imports = [
+    ./home.nix
+  ];
+
+  # home-manager.users.defin= {
+    home = {
+      # Home Manager needs a bit of information about you and the paths it should
+      # manage.
+      username = "defin";
+      homeDirectory = "/home/defin";
+
+      # The home.packages option allows you to install Nix packages into your
+      # environment.
+      packages = with pkgs; [
+        # # It is sometimes useful to fine-tune packages, for example, by applying
+        # # overrides. You can do that directly here, just don't forget the
+        # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
+        # # fonts?
+        # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
+
+        r2modman
+        marble-marcher-ce
+        prismlauncher
+        luanti
+        lutris
+        heroic
+        wineWowPackages.waylandFull
+
+        element-desktop
+        signal
+      ];
+
+      # Let Home Manager install and manage itself.
+      # home-manager.enable = true;
+    };
+}
diff --git a/home-manager/home.nix b/home-manager/home.nix
index a13e62c..313148e 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -44,10 +44,6 @@
         passExtensions.pass-audit
         passExtensions.pass-otp
         passExtensions.pass-update
-        r2modman
-        marble-marcher-ce
-        prismlauncher
-        luanti
         firefox
         libreoffice
         # google-chrome
@@ -66,19 +62,12 @@
         kdePackages.filelight
         easyeffects
         mpv
-        lutris
-        # wine
-        wineWowPackages.waylandFull
         # unstable.yt-dlp
         yt-dlp
         # telegram-desktop
         obsidian
         zettlr
-        element-desktop
-        discord
         signal-desktop
-        lutris
-        heroic
         # texlive-combined-full
         obs-studio # for recording or streaming
         waybar
diff --git a/home-manager/tiling-wm.nix b/home-manager/tiling-wm.nix
index be64d08..e2053fe 100644
--- a/home-manager/tiling-wm.nix
+++ b/home-manager/tiling-wm.nix
@@ -1,6 +1,7 @@
 { pkgs, hyprland-plugins, ... }: {
   imports = [
     ./home.nix
+    ./gaming.nix
     ../modules/home-manager/waybar.nix
     ../modules/home-manager/swaylock.nix
     ../modules/home-manager/swayidle.nix
diff --git a/machines/betsy/default.nix b/machines/betsy/default.nix
index 5627b72..8bede1d 100644
--- a/machines/betsy/default.nix
+++ b/machines/betsy/default.nix
@@ -29,6 +29,8 @@
 
   services.fwupd.enable = true;
 
+  # services.atftpd.enable = true;
+
   nix.settings = {
     substituters = ["https://hyprland.cachix.org"];
     trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
@@ -51,7 +53,12 @@
   networking.hostName = "betsy"; # Define your hostname.
   # Pick only one of the below networking options.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-  networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
+  networking.networkmanager = { # Easiest to use and most distros use this by default.
+    enable = true;
+    settings = {
+      connectivity.enabled = false;
+    };
+  };
 
   # Set your time zone.
   time.timeZone = lib.mkDefault "US/Mountain";
@@ -109,6 +116,9 @@
       firefox
       tree
       epsonscan2
+      speedtest-cli
+      orca-slicer
+      # networkmanager
     ];
   };
 
@@ -139,8 +149,8 @@
   services.openssh.enable = true;
 
   # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
+  # networking.firewall.allowedTCPPorts = [ 69 76 ];
+  # networking.firewall.allowedUDPPorts = [ 69 76 ];
   # Or disable the firewall altogether.
   # networking.firewall.enable = false;