diff --git a/README.md b/README.md index 65ece77..8c19432 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,8 @@ > ⚠ WARNING! Make sure to change home paths for config files in [user](./user/config). +> ⚠ WARNING! This configuration uses Podman as opposed to Docker, if you want to use dokcer make according changes in [virtualisation](./system/modules/virtualisation.nix). + > ⚠ WARNING! There might be some non-critical bugs in configuration as I'm still working on it. ## Table Of Contents diff --git a/home/config/hypr/bind.conf b/home/config/hypr/bind.conf index 93f3268..4942844 100644 --- a/home/config/hypr/bind.conf +++ b/home/config/hypr/bind.conf @@ -43,6 +43,9 @@ bind = $mainMod CTRL, h, resizeactive, -10 0 bind = $mainMod CTRL, k, resizeactive, 0 -10 bind = $mainMod CTRL, j, resizeactive, 0 10 +bind = $mainMod, b, exec, firefox +bind = $mainMod, c, exec, telegram-desktop + # Move/resize windows with mainMod + LMB/RMB and dragging bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow diff --git a/home/config/hypr/monitor.conf b/home/config/hypr/monitor.conf index 7517176..9bccf3d 100644 --- a/home/config/hypr/monitor.conf +++ b/home/config/hypr/monitor.conf @@ -1 +1 @@ -monitor=DP-2,2560x1440@164.835999,auto,auto +monitor=DP-2,2560x1440@164.835999, 0x0, 1 diff --git a/home/user/packages.nix b/home/user/packages.nix index 0418a40..fdef260 100644 --- a/home/user/packages.nix +++ b/home/user/packages.nix @@ -51,6 +51,7 @@ pkgs.winetricks ]; }) + pkgs.yuzu-mainline # Downloads pkgs.qbittorrent diff --git a/home/user/programs.nix b/home/user/programs.nix index accdf18..69071b0 100644 --- a/home/user/programs.nix +++ b/home/user/programs.nix @@ -12,6 +12,7 @@ proton-pass to-google-translate view-image + ublock-origin youtube-shorts-block ]; }; diff --git a/system/modules/boot.nix b/system/modules/boot.nix index 64d10d7..cda7b77 100644 --- a/system/modules/boot.nix +++ b/system/modules/boot.nix @@ -23,6 +23,7 @@ # }; boot.loader.systemd-boot.enable = lib.mkForce false; + boot.initrd.kernelModules = [ "amdgpu" ]; boot.lanzaboote = { enable = true; diff --git a/system/modules/services.nix b/system/modules/services.nix index 06336e8..83c861c 100644 --- a/system/modules/services.nix +++ b/system/modules/services.nix @@ -5,6 +5,7 @@ dbus.enable = true; picom.enable = true; openssh.enable = true; + spice-vdagentd.enable = true; xserver = { enable = true; @@ -14,7 +15,7 @@ displayManager = { sddm.enable = true; }; + videoDrivers = [ "amdgpu" ]; }; - }; } diff --git a/system/modules/virtualisation.nix b/system/modules/virtualisation.nix index d7cb2ef..304b301 100644 --- a/system/modules/virtualisation.nix +++ b/system/modules/virtualisation.nix @@ -1,30 +1,29 @@ { pkgs, ... }: { - virtualisation.libvirtd = { - enable = true; + virtualisation = { + spiceUSBRedirection.enable = true; - qemu = { + libvirtd = { + enable = true; + + qemu = { swtpm.enable = true; ovmf.enable = true; ovmf.packages = [ pkgs.OVMFFull.fd ]; + }; + }; + + podman = { + enable = true; + + dockerCompat = true; + defaultNetwork.settings.dns_enabled = true; }; }; - virtualisation.spiceUSBRedirection.enable = true; - services.spice-vdagentd.enable = true; - - virtualisation.docker = { - enable = true; - enableOnBoot = true; - rootless = { - enable = true; - setSocketVariable = true; - }; - }; - environment.systemPackages = with pkgs; [ - docker-compose + podman-compose qemu spice spice-gtk