diff --git a/flake.lock b/flake.lock index 0e255c3..5c04e0a 100644 --- a/flake.lock +++ b/flake.lock @@ -53,11 +53,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1696727917, - "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", + "lastModified": 1720809814, + "narHash": "sha256-numb3xigRGnr/deF7wdjBwVg7fpbTH7reFDkJ75AJkY=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", + "rev": "34f41987bec14c0f3f6b2155c19787b1f6489625", "type": "github" }, "original": { @@ -164,6 +164,27 @@ "type": "github" } }, + "flake-utils_2": { + "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": { @@ -204,11 +225,11 @@ ] }, "locked": { - "lastModified": 1720734513, - "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -276,11 +297,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1720542800, - "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", + "lastModified": 1724224976, + "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "feb2849fdeb70028c70d73b848214b00d324a497", + "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", "type": "github" }, "original": { @@ -324,16 +345,18 @@ "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_3", + "systems": "systems_2" }, "locked": { - "lastModified": 1719525570, - "narHash": "sha256-xSO/H67GAHEW0siD2PHoO/e97MbROL3r3s5SpF6A6Dc=", + "lastModified": 1724444244, + "narHash": "sha256-fH1lyJvJjUhZ8xMlmiI18EZNzodDSe74rFuwlZDL0aQ=", "owner": "danth", "repo": "stylix", - "rev": "1ff9d37d27377bfe8994c24a8d6c6c1734ffa116", + "rev": "d042af478ce87e188139480922a3085218194106", "type": "github" }, "original": { @@ -356,6 +379,21 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "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 187124a..8e313c0 100644 --- a/flake.nix +++ b/flake.nix @@ -26,6 +26,9 @@ # vps mups = utils.mkHost ./hosts/mups/configuration.nix; + + # vm + muvm = utils.mkHost ./hosts/muvm/configuration.nix; }; homeManagerModules.default = ./modules/home; diff --git a/hosts/muon/configuration.nix b/hosts/muon/configuration.nix index cc082b4..3cabb72 100644 --- a/hosts/muon/configuration.nix +++ b/hosts/muon/configuration.nix @@ -17,6 +17,7 @@ in { mods.desktop.enable = true; mods.desktop.wayland.enable = false; mods.desktop.gaming.enable = true; + mods.boot.enable = true; mods.theme.enable = true; mods.theme.scheme = "woodland"; @@ -25,10 +26,14 @@ in { mods.containers.steam.enable = false; mods.server.media.enable = true; mods.server.astral.enable = true; - mods.server.astral.memory = "6G"; + mods.server.astral.autoStart = false; + + mods.docker.media.enable = false; + mods.server.sync.enable = true; mods.tailscale.enable = true; mods.openvpn.enable = false; + mods.wireguard.enable = true; services.xserver.windowManager.i3.enable = true; @@ -40,7 +45,7 @@ in { # Hardware preferences ## Mouse - services.xserver.libinput.mouse.accelProfile = "flat"; + services.libinput.mouse.accelProfile = "flat"; ## Monitors mods.monitors = { diff --git a/hosts/muon/hardware-configuration.nix b/hosts/muon/hardware-configuration.nix index 4e54ee3..449f183 100644 --- a/hosts/muon/hardware-configuration.nix +++ b/hosts/muon/hardware-configuration.nix @@ -50,7 +50,7 @@ networking.useDHCP = lib.mkDefault true; # networking.interfaces.docker0.useDHCP = lib.mkDefault true; networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; - networking.interfaces.enp0s31f6.mtu = 1200; + networking.interfaces.enp0s31f6.mtu = 1500; # networking.interfaces.tun0.useDHCP = lib.mkDefault true; # networking.interfaces.vboxnet0.useDHCP = lib.mkDefault true; diff --git a/hosts/muvm/configuration.nix b/hosts/muvm/configuration.nix new file mode 100644 index 0000000..271b09e --- /dev/null +++ b/hosts/muvm/configuration.nix @@ -0,0 +1,54 @@ +{ config, lib, pkgs, inputs, system, ... }: +let + cfg = config.mods; + +in { + # Hardware + imports = [ + ./hardware-configuration.nix + ]; + + # System + mods.user.name = "muon"; + networking.hostName = "muvm"; + mods.home.file = ./home.nix; + + users.users.muon.initialPassword = "changeme"; + + boot.loader.grub = { + enable = true; + efiSupport = true; + device = "nodev"; + }; + + # Modules + mods.desktop.enable = true; + mods.boot.enable = false; + + mods.theme.enable = true; + mods.theme.scheme = "woodland"; + mods.theme.wallpaper = ./wallpaper.png; + + services.xserver.windowManager.i3.enable = true; + + # Proprietary