diff --git a/flake.lock b/flake.lock index 46b6c12..38e88f5 100644 --- a/flake.lock +++ b/flake.lock @@ -162,26 +162,6 @@ "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": [ @@ -1837,7 +1817,6 @@ "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 a03ada4..26c80e8 100644 --- a/flake.nix +++ b/flake.nix @@ -92,13 +92,6 @@ 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 3e8ea4e..260cbeb 100644 --- a/modules/base/default.nix +++ b/modules/base/default.nix @@ -63,9 +63,7 @@ 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 43a3f67..0316653 100644 --- a/modules/desktop/addons/dms/default.nix +++ b/modules/desktop/addons/dms/default.nix @@ -4,9 +4,11 @@ inputs, lib, osConfig, - pkgs, ... }: + let + picture-path = "/home/cholli/Pictures/firewatch.jpg"; + in { imports = [ inputs.dankMaterialShell.homeModules.dank-material-shell @@ -32,8 +34,6 @@ 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 1d7ece4..fa78d9d 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -64,8 +64,7 @@ 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; }; }; @@ -145,9 +144,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.xhost}/bin/xhost +" + "${pkgs.xorg.xhost}/bin/xhost +" - "${lib.getExe pkgs.xrandr} --output DP-1 --primary" + "${lib.getExe pkgs.xorg.xrandr} --output DP-1 --primary" ]; windowrulev2 = [ diff --git a/modules/hosts/yggdrasil/default.nix b/modules/hosts/yggdrasil/default.nix index 41028e2..f304530 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/cholli/"; + device = "cholli@192.168.178.2:/storage/"; fsType = "sshfs"; options = [ diff --git a/modules/hosts/yggdrasil/disko.nix b/modules/hosts/yggdrasil/disko.nix index 2b9a341..2f33f67 100644 --- a/modules/hosts/yggdrasil/disko.nix +++ b/modules/hosts/yggdrasil/disko.nix @@ -17,8 +17,6 @@ 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 3d27e5f..54b1fb9 100644 --- a/modules/hosts/yggdrasil/hardware.nix +++ b/modules/hosts/yggdrasil/hardware.nix @@ -14,8 +14,6 @@ extraModulePackages = with config.boot.kernelPackages; [ r8125 ]; blacklistedKernelModules = [ "r8169" ]; - kernelParams = [ "split_lock_detect=off" ]; - loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true;