diff --git a/flake.nix b/flake.nix
index 0cb85218..28b7210d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -64,7 +64,7 @@
# User Machines
nixos-desktop = libx.mkHost { hostname = "nixos-desktop"; unfree = true; desktop = "plasma6"; };
framework13 = libx.mkHost { hostname = "framework13"; unfree = true; desktop = "gnome"; };
- framework16 = libx.mkHost { hostname = "framework16"; unfree = true; desktop = "gnome"; };
+ framework16 = libx.mkHost { hostname = "framework16"; unfree = true; desktop = "plasma6"; };
steamdeck = libx.mkDeck { hostname = "steamdeck"; desktop = "plasma6"; };
# Raspberry Pi's
@@ -87,7 +87,7 @@
# User Machines
"albert@nixos-desktop" = libx.mkHome { hostname = "nixos-desktop"; desktop = "plasma6"; };
"albert@framework13" = libx.mkHome { hostname = "framework13"; desktop = "gnome"; };
- "albert@framework16" = libx.mkHome { hostname = "framework16"; desktop = "gnome"; };
+ "albert@framework16" = libx.mkHome { hostname = "framework16"; desktop = "plasma6"; };
"albert@steamdeck" = libx.mkHome { hostname = "steamdeck"; desktop = "plasma6"; };
# Raspberry Pi's
diff --git a/home-manager/common/desktops/hyprland/components/hyprland.nix b/home-manager/common/desktops/hyprland/components/hyprland.nix
index b21522de..f5342877 100644
--- a/home-manager/common/desktops/hyprland/components/hyprland.nix
+++ b/home-manager/common/desktops/hyprland/components/hyprland.nix
@@ -85,9 +85,11 @@
active_opacity = 0.75;
inactive_opacity = 0.6;
fullscreen_opacity = 1.0;
- drop_shadow = true;
- shadow_range = 4;
- shadow_render_power = 3;
+ shadow = {
+ enabled = true;
+ range = 4;
+ render_power = 3;
+ };
blur = {
size = 6;
passes = 3;
@@ -110,7 +112,6 @@
# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
pseudotile = true; # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
preserve_split = true;# you probably want this
- no_gaps_when_only = 1; # If it's the only window int he layout, 1=don't show gaps
};
windowrule = [
"noblur,^(firefox)$" # disables blur for firefox
diff --git a/home-manager/common/desktops/hyprland/components/swaylock.nix b/home-manager/common/desktops/hyprland/components/swaylock.nix
index bb6fd12f..c18be159 100644
--- a/home-manager/common/desktops/hyprland/components/swaylock.nix
+++ b/home-manager/common/desktops/hyprland/components/swaylock.nix
@@ -1,6 +1,6 @@
{ pkgs, ... }: {
programs.swaylock = {
- enable = true;
+ enable = false;
package = pkgs.swaylock-effects;
settings = {
# All <color> options are of the form <rrggbb[aa]>.
diff --git a/home-manager/common/desktops/hyprland/default.nix b/home-manager/common/desktops/hyprland/default.nix
index 1e211a99..4c636ad6 100644
--- a/home-manager/common/desktops/hyprland/default.nix
+++ b/home-manager/common/desktops/hyprland/default.nix
@@ -1,14 +1,15 @@
-{ pkgs, ... }: {
+{ lib, pkgs, ... }: {
imports = [
./components
./assets/waybar/scripts.nix
];
- # TODO Update this when I move
+ # FIX: Make sure this works with geoclue2
services.gammastep = {
enable = true;
- latitude = "52.23";
- longitude = "21.01";
+ provider = "geoclue2";
+ # latitude = "52.23";
+ # longitude = "21.01";
};
gtk.enable = true;
@@ -19,7 +20,7 @@
stylix = {
enable = true;
- autoEnable = true;
+ autoEnable = lib.mkForce false;
opacity = {
desktop = 0.7;
popups = 0.7;
diff --git a/home-manager/common/desktops/plasma6/plasma-manager.nix b/home-manager/common/desktops/plasma6/plasma-manager.nix
index 44c22761..ac56e398 100644
--- a/home-manager/common/desktops/plasma6/plasma-manager.nix
+++ b/home-manager/common/desktops/plasma6/plasma-manager.nix
@@ -68,8 +68,8 @@
{
name = "org.kde.plasma.kicker";
config = {
- General.icon = "draw-circle";
- # General.icon = "nix-snowflake-white";
+ # General.icon = "draw-circle";
+ General.icon = "nix-snowflake-white";
};
}
{
@@ -100,6 +100,7 @@
"org.kde.plasma.notifications"
"org.kde.plasma.microphone"
"org.kde.plasma.mediaplayer"
+ "org.kde.plasma.media-player"
"org.kde.plasma.manage-inputmethod"
"org.kde.plasma.keyboardindicator"
"org.kde.plasma.keyboardlayout"
@@ -117,6 +118,8 @@
"remmina"
"vlc"
"Battle.net"
+ "battle.net"
+ ""
];
};
};
diff --git a/home-manager/common/software/cli/nixvim/base.nix b/home-manager/common/software/cli/nixvim/base.nix
index 4a16135b..8e78a010 100644
--- a/home-manager/common/software/cli/nixvim/base.nix
+++ b/home-manager/common/software/cli/nixvim/base.nix
@@ -77,7 +77,7 @@
};
notify = {
enable = true;
- topDown = true;
+ topDown = false;
fps = 60;
stages = "slide";
};
diff --git a/home-manager/common/software/gui/firefox.nix b/home-manager/common/software/gui/firefox.nix
index 7cbc422f..ce5993eb 100644
--- a/home-manager/common/software/gui/firefox.nix
+++ b/home-manager/common/software/gui/firefox.nix
@@ -34,7 +34,7 @@
kagi-search
consent-o-matic
bitwarden
- markdownload
+ copy-selection-as-markdown
];
containersForce = true;
diff --git a/home-manager/hosts/framework16/desktops/hyprland/default.nix b/home-manager/hosts/framework16/desktops/hyprland/default.nix
index 2b78186b..df26dac2 100644
--- a/home-manager/hosts/framework16/desktops/hyprland/default.nix
+++ b/home-manager/hosts/framework16/desktops/hyprland/default.nix
@@ -1,7 +1,7 @@
{ theme, ... }: {
wayland.windowManager.hyprland = {
settings = {
- monitor = ",highrr,auto,1.175";
+ monitor = ",highrr,auto,1";
bind = [
'', XF86AudioMute, exec, swayosd --output-volume=mute-toggle''
'', XF86AudioPrev, exec, playerctl previous''
diff --git a/lib/packages.nix b/lib/packages.nix
index 2b7f3b8a..e2a4f9cb 100644
--- a/lib/packages.nix
+++ b/lib/packages.nix
@@ -6,9 +6,9 @@
allowUnfree = unfree;
permittedInsecurePackages = [
"electron-27.3.11" # Logseq
- # "olm-3.2.16" # Unknown
"dotnet-runtime-wrapped-7.0.20"
"dotnet-runtime-7.0.20"
+ "olm-3.2.16" # Something in hyprland
];
};
hostPlatform = system;
@@ -20,9 +20,9 @@
allowUnfree = unfree;
permittedInsecurePackages = [
"electron-27.3.11" # Logseq
- # "olm-3.2.16" # Unknown
"dotnet-runtime-wrapped-7.0.20"
"dotnet-runtime-7.0.20"
+ "olm-3.2.16" # Something in hyprland
];
};
hostPlatform = system;
diff --git a/nixos/common/desktops/hyprland/default.nix b/nixos/common/desktops/hyprland/default.nix
index 45c9fd12..936baa40 100644
--- a/nixos/common/desktops/hyprland/default.nix
+++ b/nixos/common/desktops/hyprland/default.nix
@@ -143,7 +143,6 @@
];
# Enable sound with pipewire.
- sound.enable = true;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
diff --git a/nixos/hosts/framework16/default.nix b/nixos/hosts/framework16/default.nix
index 6a20a81f..6dd3a615 100644
--- a/nixos/hosts/framework16/default.nix
+++ b/nixos/hosts/framework16/default.nix
@@ -3,7 +3,7 @@
inputs.nixos-hardware.nixosModules.framework-16-7040-amd
(modulesPath + "/installer/scan/not-detected.nix")
./disks.nix
- ./vm-gpu.nix
+ # ./vm-gpu.nix
../../common/services/tailscale-autoconnect.nix
../../common/modules/secureboot.nix
# ../../common/modules/boot.nix
diff --git a/nixos/hosts/framework16/vm-gpu.nix b/nixos/hosts/framework16/vm-gpu.nix
index 69fdd6ce..f247808c 100644
--- a/nixos/hosts/framework16/vm-gpu.nix
+++ b/nixos/hosts/framework16/vm-gpu.nix
@@ -1,8 +1,8 @@
-{ pkgs, lib, ... }: # https://olai.dev/blog/nvidia-vm-passthrough/
+{ pkgs, lib, pkgs-unstable, ... }: # https://olai.dev/blog/nvidia-vm-passthrough/
let
devices = [
"1002:7480" # Video
- "1002:1640" # Audio
+ "1002:ab30" # Audio
];
in {
virtualisation.libvirtd = {
@@ -10,17 +10,22 @@ in {
qemu.ovmf.enable = true;
onBoot = "ignore";
onShutdown = "shutdown";
-};
-
+ };
programs.virt-manager.enable = true;
users.users.albert.extraGroups = [ "libvirtd" ];
- environment.systemPackages = [ pkgs.virt-manager ];
+ environment.systemPackages = [
+ pkgs.virt-manager
+ pkgs.looking-glass-client
+ ];
+
+ systemd.tmpfiles.rules = [
+ "f /dev/shm/looking-glass 0660 albert libvirtd -"
+];
boot.kernelParams = [
"vfio-pci.ids=${lib.concatStringsSep "," devices}"
- "intel_iommu=on"
- "iommu=pt"
+ "amd_iommu=on"
];
# Make the devices bind to VFIO
diff --git a/wallpapers b/wallpapers
index 8ed82c9a..26552d8b 160000
--- a/wallpapers
+++ b/wallpapers
@@ -1 +1 @@
-Subproject commit 8ed82c9afaac6359cf4603196f7a5bd4b399a4b5
+Subproject commit 26552d8bade6fa39188ebf68e9ffa1a8dcd75108