added emacs and direnv

flake.lock

@@ -130,6 +130,27 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "inputs": {
+        "systems": [
+          "stylix",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "fromYaml": {
       "flake": false,
       "locked": {
@@ -170,11 +191,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719827439,
+        "lastModified": 1725180166,
-        "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=",
+        "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d",
+        "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb",
         "type": "github"
       },
       "original": {
@@ -191,11 +212,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715930644,
+        "lastModified": 1724435763,
-        "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=",
+        "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d",
+        "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
         "type": "github"
       },
       "original": {
@@ -206,11 +227,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1719895800,
+        "lastModified": 1725477728,
-        "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=",
+        "narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "6e253f12b1009053eff5344be5e835f604bb64cd",
+        "rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce",
         "type": "github"
       },
       "original": {
@@ -222,11 +243,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1719848872,
+        "lastModified": 1725432240,
-        "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
+        "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
+        "rev": "ad416d066ca1222956472ab7d0555a6946746a80",
         "type": "github"
       },
       "original": {
@@ -238,11 +259,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1714912032,
+        "lastModified": 1725194671,
-        "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=",
+        "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d",
+        "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c",
         "type": "github"
       },
       "original": {
@@ -270,16 +291,18 @@
         "base16-tmux": "base16-tmux",
         "base16-vim": "base16-vim",
         "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils",
         "gnome-shell": "gnome-shell",
         "home-manager": "home-manager_2",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_2",
+        "systems": "systems"
       },
       "locked": {
-        "lastModified": 1724260414,
+        "lastModified": 1725290973,
-        "narHash": "sha256-EP1yFDEm/f7+j+fE3TI7KZb5xJH6KNMtmlZciktC71c=",
+        "narHash": "sha256-+jwXF9KI0HfvDgpsoJGvOdfOGGSKOrID1wQB79zjUbo=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "c5f8f06543b70248a076f888177c7362a24d5dcc",
+        "rev": "ef81ad9e85e60420cc83d4642619c14b57139d33",
         "type": "github"
       },
       "original": {
@@ -287,6 +310,21 @@
         "repo": "stylix",
         "type": "github"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -34,6 +34,7 @@
       modules = [
         ./hosts/server/configuration.nix
 	inputs.home-manager.nixosModules.default
+	nixos-hardware.nixosModules.system76
       ];
     };
 

hosts/laptop/configuration.nix

@@ -18,7 +18,7 @@
     image = ./wallpaper.png;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine-dawn.yaml";
     cursor = {
-      package = pkgs.gnome.adwaita-icon-theme;
+      package = pkgs.adwaita-icon-theme;
       name = "Adwaita";
       size = 28;
     };
@@ -58,7 +58,6 @@
     gnome-photos
     gnome-tour
     xterm
-  ]) ++ (with pkgs.gnome; [
     cheese # webcam tool
     gnome-music
     gnome-weather
@@ -66,7 +65,6 @@
     gnome-contacts
     gnome-clocks
     gnome-maps
-    gnome-terminal
     epiphany # web browser
     geary # email reader
     evince # document viewer
@@ -76,8 +74,10 @@
     iagno # go game
     hitori # sudoku game
     atomix # puzzle game
+
   ]);
 
+
   hardware.sensor.iio.enable = true;
 
   networking.hostName = "laptop"; # Define your hostname.
@@ -96,7 +96,6 @@
   };
 
   # Enable sound with pipewire.
-  sound.enable = true;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {

hosts/laptop/home.nix

@@ -15,13 +15,15 @@
     pkgs.syncthing
     pkgs.thunderbird
     pkgs.blender
-    pkgs.discord
+    pkgs.vesktop
     pkgs.btop
     pkgs.zip
     pkgs.spotify
     pkgs.distrobox
 
     pkgs.modrinth-app
+    pkgs.emacs
+    pkgs.direnv
   ];
 
   programs.git = {

hosts/server/configuration.nix

@@ -49,10 +49,10 @@
   services.xserver.desktopManager.gnome.enable = false;
  
  # Enable CUPS to print documents.
- # services.auto-cpufreq.enable = true;
+  services.auto-cpufreq.enable = true;
- # services.thermald.enable = true;
+  services.thermald.enable = true;
- # powerManagement.powertop.enable = true;
+  powerManagement.powertop.enable = true;
- # powerManagement.enable = true;
+  powerManagement.enable = true;
 
   # Enable sound with pipewire.
   sound.enable = false;
@@ -68,7 +68,7 @@
   users.users.k = {
     isNormalUser = true;
     description = "k";
-    extraGroups = [ "networkmanager" "wheel" "libvirtd"];
+    extraGroups = [ "networkmanager" "wheel" "libvirtd" ];
     packages = with pkgs; [zsh];
     shell = pkgs.zsh;
   };
@@ -78,34 +78,6 @@
     };
   };
 
-  services.udev.extraRules = ''
-  # Allows Wolf to acces /dev/uinput
-KERNEL=="uinput", SUBSYSTEM=="misc", MODE="0660", GROUP="input", OPTIONS+="static_node=uinput"
-
-# Allows Wolf to access /dev/uhid
-KERNEL=="uhid", TAG+="uaccess"
-
-# Move virtual keyboard and mouse into a different seat
-SUBSYSTEMS=="input", ATTRS{id/vendor}=="ab00", MODE="0660", GROUP="input", ENV{ID_SEAT}="seat9"
-
-# Joypads
-SUBSYSTEMS=="input", ATTRS{name}=="Wolf X-Box One (virtual) pad", MODE="0660", GROUP="input"
-SUBSYSTEMS=="input", ATTRS{name}=="Wolf PS5 (virtual) pad", MODE="0660", GROUP="input"
-SUBSYSTEMS=="input", ATTRS{name}=="Wolf gamepad (virtual) motion sensors", MODE="0660", GROUP="input"
-SUBSYSTEMS=="input", ATTRS{name}=="Wolf Nintendo (virtual) pad", MODE="0660", GROUP="input"
-  '';
-
-users.users.game = {
-  isNormalUser = true;
-  extraGroups = ["docker" "input"];
-  packages = with pkgs; [docker-compose];
-};
-
-users.users.media = {
-  isNormalUser = true;
-  packages = with pkgs; [mpv ffmpeg handbrake makemkv];
-};
-
   system.autoUpgrade.enable = true;
   nix.gc.automatic = true;
 

hosts/server/service.nix

@@ -28,6 +28,15 @@
     labels = ["ubuntu-latest:docker://node:16-bullseye" "ubuntu-22.04:docker://node:16-bullseye" "ubuntu-20.04:docker://node:16-bullseye" "ubuntu-18.04:docker://node:16-buster" "native:host"];
   };
 
+  services.pufferpanel = {
+    enable = true;
+    extraGroups =["docker"];
+    extraPackages = [pkgs.jre];
+    environment = {
+      PUFFER_WEB_HOST = ":8002";
+      PUFFER_PANEL_REGISTRATIONENABLED = "false";
+    };
+  };
 
   services.home-assistant = {
     enable = true;
@@ -85,7 +94,7 @@
   };
 
   services.fail2ban = {
-    enable=true;
+    enable=false;
   };
 
   virtualisation.docker = {
@@ -133,6 +142,14 @@
 	};
      };
 
+    "puf.dhilton.xyz" = {
+        addSSL = true;
+        enableACME = true;
+	locations."/" = {
+          proxyPass = "http://127.0.0.1:8002";
+	  proxyWebsockets = true;
+	};
+     };
 
     "srx.dhilton.xyz" = {
         addSSL = true;