diff --git a/flake.lock b/flake.lock index 2d935c9..1310d2a 100644 --- a/flake.lock +++ b/flake.lock @@ -130,27 +130,6 @@ "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": { @@ -191,11 +170,11 @@ ] }, "locked": { - "lastModified": 1725180166, - "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=", + "lastModified": 1719827439, + "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", "owner": "nix-community", "repo": "home-manager", - "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb", + "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", "type": "github" }, "original": { @@ -212,11 +191,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1715930644, + "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "type": "github" }, "original": { @@ -227,11 +206,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1725477728, - "narHash": "sha256-ahej1VRqKmWbG7gewty+GlrSBEeGY/J2Zy8Nt8+3fdg=", + "lastModified": 1719895800, + "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "880be1ab837e1e9fe0449dae41ac4d034694d4ce", + "rev": "6e253f12b1009053eff5344be5e835f604bb64cd", "type": "github" }, "original": { @@ -243,11 +222,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725432240, - "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", + "lastModified": 1719848872, + "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad416d066ca1222956472ab7d0555a6946746a80", + "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", "type": "github" }, "original": { @@ -259,11 +238,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1725194671, - "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", + "lastModified": 1714912032, + "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", + "rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d", "type": "github" }, "original": { @@ -291,18 +270,16 @@ "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", - "systems": "systems" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1725290973, - "narHash": "sha256-+jwXF9KI0HfvDgpsoJGvOdfOGGSKOrID1wQB79zjUbo=", + "lastModified": 1724260414, + "narHash": "sha256-EP1yFDEm/f7+j+fE3TI7KZb5xJH6KNMtmlZciktC71c=", "owner": "danth", "repo": "stylix", - "rev": "ef81ad9e85e60420cc83d4642619c14b57139d33", + "rev": "c5f8f06543b70248a076f888177c7362a24d5dcc", "type": "github" }, "original": { @@ -310,21 +287,6 @@ "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", diff --git a/flake.nix b/flake.nix index 7f71bf8..aa2f77b 100644 --- a/flake.nix +++ b/flake.nix @@ -34,7 +34,6 @@ modules = [ ./hosts/server/configuration.nix inputs.home-manager.nixosModules.default - nixos-hardware.nixosModules.system76 ]; }; diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index 0c6466e..302c1a6 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -18,7 +18,7 @@ image = ./wallpaper.png; base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine-dawn.yaml"; cursor = { - package = pkgs.adwaita-icon-theme; + package = pkgs.gnome.adwaita-icon-theme; name = "Adwaita"; size = 28; }; @@ -58,6 +58,7 @@ gnome-photos gnome-tour xterm + ]) ++ (with pkgs.gnome; [ cheese # webcam tool gnome-music gnome-weather @@ -65,6 +66,7 @@ gnome-contacts gnome-clocks gnome-maps + gnome-terminal epiphany # web browser geary # email reader evince # document viewer @@ -74,10 +76,8 @@ iagno # go game hitori # sudoku game atomix # puzzle game - ]); - hardware.sensor.iio.enable = true; networking.hostName = "laptop"; # Define your hostname. @@ -96,6 +96,7 @@ }; # Enable sound with pipewire. + sound.enable = true; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index 4f64534..dc9b1f4 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -15,15 +15,13 @@ pkgs.syncthing pkgs.thunderbird pkgs.blender - pkgs.vesktop + pkgs.discord pkgs.btop pkgs.zip pkgs.spotify pkgs.distrobox pkgs.modrinth-app - pkgs.emacs - pkgs.direnv ]; programs.git = { diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix index c9c4cd4..884fb86 100644 --- a/hosts/server/configuration.nix +++ b/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.thermald.enable = true; - powerManagement.powertop.enable = true; - powerManagement.enable = true; + # services.auto-cpufreq.enable = true; + # services.thermald.enable = true; + # powerManagement.powertop.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,6 +78,34 @@ }; }; + 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; diff --git a/hosts/server/service.nix b/hosts/server/service.nix index 8419039..5135cd6 100644 --- a/hosts/server/service.nix +++ b/hosts/server/service.nix @@ -28,15 +28,6 @@ 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; @@ -94,7 +85,7 @@ }; services.fail2ban = { - enable=false; + enable=true; }; virtualisation.docker = { @@ -142,14 +133,6 @@ }; }; - "puf.dhilton.xyz" = { - addSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://127.0.0.1:8002"; - proxyWebsockets = true; - }; - }; "srx.dhilton.xyz" = { addSSL = true;