Compare commits

..

2 commits

8 changed files with 43 additions and 8 deletions

21
flake.lock generated
View file

@ -162,6 +162,26 @@
"type": "github" "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": { "disko": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -1817,6 +1837,7 @@
"catppuccin": "catppuccin", "catppuccin": "catppuccin",
"dankMaterialShell": "dankMaterialShell", "dankMaterialShell": "dankMaterialShell",
"devenv": "devenv", "devenv": "devenv",
"dgop": "dgop",
"disko": "disko", "disko": "disko",
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"git-hooks": "git-hooks_2", "git-hooks": "git-hooks_2",

View file

@ -92,6 +92,13 @@
dankMaterialShell = { dankMaterialShell = {
url = "github:AvengeMedia/DankMaterialShell/v1.2.3"; url = "github:AvengeMedia/DankMaterialShell/v1.2.3";
inputs = {
nixpkgs.follows = "nixpkgs-unstable";
};
};
dgop = {
url = "github:AvengeMedia/dgop";
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs-unstable";
}; };

View file

@ -63,7 +63,9 @@
defaultSopsFormat = "yaml"; defaultSopsFormat = "yaml";
age = { age = {
sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; sshKeyPaths = [
"/etc/ssh/ssh_host_ed25519_key"
];
keyFile = lib.mkIf ( keyFile = lib.mkIf (
config.networking.hostName == "yggdrasil" config.networking.hostName == "yggdrasil"
) "/home/cholli/.config/sops/age/keys.txt"; ) "/home/cholli/.config/sops/age/keys.txt";

View file

@ -4,11 +4,9 @@
inputs, inputs,
lib, lib,
osConfig, osConfig,
pkgs,
... ...
}: }:
let
picture-path = "/home/cholli/Pictures/firewatch.jpg";
in
{ {
imports = [ imports = [
inputs.dankMaterialShell.homeModules.dank-material-shell inputs.dankMaterialShell.homeModules.dank-material-shell
@ -34,6 +32,8 @@
includes.enable = false; includes.enable = false;
}; };
dgop.package = inputs.dgop.packages.${pkgs.stdenv.system}.default;
enableVPN = false; enableVPN = false;
enableDynamicTheming = false; enableDynamicTheming = false;
enableAudioWavelength = false; enableAudioWavelength = false;

View file

@ -64,7 +64,8 @@
hyprland = { hyprland = {
enable = true; enable = true;
package = hyprland-package; 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; withUWSM = true;
}; };
}; };
@ -144,9 +145,9 @@
"[workspace 7 silent] obsidian" "[workspace 7 silent] obsidian"
"[workspace 8 silent] discord" "[workspace 8 silent] discord"
"[workspace 9 silent] ELECTRON_OZONE_PLATFORM_HINT=x11 1password" # fix for promts not showing up anymore "[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 = [ windowrulev2 = [

View file

@ -82,7 +82,7 @@ topLevel: {
}; };
fileSystems."/mnt/pi_share" = { fileSystems."/mnt/pi_share" = {
device = "cholli@192.168.178.2:/storage/"; device = "cholli@192.168.178.2:/storage/cholli/";
fsType = "sshfs"; fsType = "sshfs";
options = [ options = [

View file

@ -17,6 +17,8 @@
trim.enable = true; trim.enable = true;
}; };
fileSystems."/home".neededForBoot = true;
disko.devices = { disko.devices = {
disk = { disk = {
x = { x = {

View file

@ -14,6 +14,8 @@
extraModulePackages = with config.boot.kernelPackages; [ r8125 ]; extraModulePackages = with config.boot.kernelPackages; [ r8125 ];
blacklistedKernelModules = [ "r8169" ]; blacklistedKernelModules = [ "r8169" ];
kernelParams = [ "split_lock_detect=off" ];
loader = { loader = {
systemd-boot.enable = true; systemd-boot.enable = true;
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;