diff --git a/flake.lock b/flake.lock index 38e88f5..46b6c12 100644 --- a/flake.lock +++ b/flake.lock @@ -162,6 +162,26 @@ "type": "github" } }, + "dgop": { + "inputs": { + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1771036606, + "narHash": "sha256-kYEFJvJApcgVgFu6QpSoNk2t0hv7AlmBARc5HPe/n+s=", + "owner": "AvengeMedia", + "repo": "dgop", + "rev": "d8fb09412f36d3e3f548362422b04645ad4c7f15", + "type": "github" + }, + "original": { + "owner": "AvengeMedia", + "repo": "dgop", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -1817,6 +1837,7 @@ "catppuccin": "catppuccin", "dankMaterialShell": "dankMaterialShell", "devenv": "devenv", + "dgop": "dgop", "disko": "disko", "flake-parts": "flake-parts_2", "git-hooks": "git-hooks_2", diff --git a/flake.nix b/flake.nix index 26c80e8..a03ada4 100644 --- a/flake.nix +++ b/flake.nix @@ -92,6 +92,13 @@ dankMaterialShell = { url = "github:AvengeMedia/DankMaterialShell/v1.2.3"; + inputs = { + nixpkgs.follows = "nixpkgs-unstable"; + }; + }; + + dgop = { + url = "github:AvengeMedia/dgop"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; diff --git a/modules/base/default.nix b/modules/base/default.nix index 260cbeb..3e8ea4e 100644 --- a/modules/base/default.nix +++ b/modules/base/default.nix @@ -63,7 +63,9 @@ defaultSopsFormat = "yaml"; age = { - sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; + sshKeyPaths = [ + "/etc/ssh/ssh_host_ed25519_key" + ]; keyFile = lib.mkIf ( config.networking.hostName == "yggdrasil" ) "/home/cholli/.config/sops/age/keys.txt"; diff --git a/modules/desktop/addons/dms/default.nix b/modules/desktop/addons/dms/default.nix index 0316653..43a3f67 100644 --- a/modules/desktop/addons/dms/default.nix +++ b/modules/desktop/addons/dms/default.nix @@ -4,11 +4,9 @@ inputs, lib, osConfig, + pkgs, ... }: - let - picture-path = "/home/cholli/Pictures/firewatch.jpg"; - in { imports = [ inputs.dankMaterialShell.homeModules.dank-material-shell @@ -34,6 +32,8 @@ includes.enable = false; }; + dgop.package = inputs.dgop.packages.${pkgs.stdenv.system}.default; + enableVPN = false; enableDynamicTheming = false; enableAudioWavelength = false; diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index fa78d9d..1d7ece4 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -64,7 +64,8 @@ hyprland = { enable = true; package = hyprland-package; - portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; + portalPackage = + inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; withUWSM = true; }; }; @@ -144,9 +145,9 @@ "[workspace 7 silent] obsidian" "[workspace 8 silent] discord" "[workspace 9 silent] ELECTRON_OZONE_PLATFORM_HINT=x11 1password" # fix for promts not showing up anymore - "${pkgs.xorg.xhost}/bin/xhost +" + "${pkgs.xhost}/bin/xhost +" - "${lib.getExe pkgs.xorg.xrandr} --output DP-1 --primary" + "${lib.getExe pkgs.xrandr} --output DP-1 --primary" ]; windowrulev2 = [ diff --git a/modules/hosts/yggdrasil/default.nix b/modules/hosts/yggdrasil/default.nix index f304530..41028e2 100644 --- a/modules/hosts/yggdrasil/default.nix +++ b/modules/hosts/yggdrasil/default.nix @@ -82,7 +82,7 @@ topLevel: { }; fileSystems."/mnt/pi_share" = { - device = "cholli@192.168.178.2:/storage/"; + device = "cholli@192.168.178.2:/storage/cholli/"; fsType = "sshfs"; options = [ diff --git a/modules/hosts/yggdrasil/disko.nix b/modules/hosts/yggdrasil/disko.nix index 2f33f67..2b9a341 100644 --- a/modules/hosts/yggdrasil/disko.nix +++ b/modules/hosts/yggdrasil/disko.nix @@ -17,6 +17,8 @@ trim.enable = true; }; + fileSystems."/home".neededForBoot = true; + disko.devices = { disk = { x = { diff --git a/modules/hosts/yggdrasil/hardware.nix b/modules/hosts/yggdrasil/hardware.nix index 54b1fb9..3d27e5f 100644 --- a/modules/hosts/yggdrasil/hardware.nix +++ b/modules/hosts/yggdrasil/hardware.nix @@ -14,6 +14,8 @@ extraModulePackages = with config.boot.kernelPackages; [ r8125 ]; blacklistedKernelModules = [ "r8169" ]; + kernelParams = [ "split_lock_detect=off" ]; + loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true;