diff --git a/flake.lock b/flake.lock index aa02243..a302828 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,56 @@ { "nodes": { + "Catch2": { + "flake": false, + "locked": { + "lastModified": 1759222471, + "narHash": "sha256-7Dx7PhtRwkbo8vHF57sAns2fQZ442D3cMyCt25RvzJc=", + "owner": "catchorg", + "repo": "Catch2", + "rev": "b3fb4b9feafcd8d91c5cb510a4775143fdbef02f", + "type": "github" + }, + "original": { + "owner": "catchorg", + "repo": "Catch2", + "rev": "b3fb4b9feafcd8d91c5cb510a4775143fdbef02f", + "type": "github" + } + }, + "MimeTypes": { + "flake": false, + "locked": { + "lastModified": 1577040615, + "narHash": "sha256-biRcxbpRVnD3+VVo0fNrNGeAi1P7pSzkGKHZrTtGp7Q=", + "owner": "lasselukkari", + "repo": "MimeTypes", + "rev": "8990d6a796bd9904ec3d41e5c150a1ffb48fe32e", + "type": "github" + }, + "original": { + "owner": "lasselukkari", + "repo": "MimeTypes", + "rev": "8990d6a796bd9904ec3d41e5c150a1ffb48fe32e", + "type": "github" + } + }, + "SPIRV-Cross-WallpaperEngine": { + "flake": false, + "locked": { + "lastModified": 1745093314, + "narHash": "sha256-ou66paGlu3KXf8LL8zfTiE8wOf0nRBocDs1QvfRVs+k=", + "owner": "Almamu", + "repo": "SPIRV-Cross-WallpaperEngine", + "rev": "ad4d02220b01c1800e5a4e6671d6d8ca8ab07783", + "type": "github" + }, + "original": { + "owner": "Almamu", + "repo": "SPIRV-Cross-WallpaperEngine", + "rev": "ad4d02220b01c1800e5a4e6671d6d8ca8ab07783", + "type": "github" + } + }, "aagl": { "inputs": { "flake-compat": "flake-compat", @@ -22,6 +73,23 @@ "type": "github" } }, + "argparse": { + "flake": false, + "locked": { + "lastModified": 1737934041, + "narHash": "sha256-gRLn4juxwde7ugvT/p4lx9ayDTm7o32NKaE/SEbnLHI=", + "owner": "p-ranav", + "repo": "argparse", + "rev": "d924b84eba1f0f0adf38b20b7b4829f6f65b6570", + "type": "github" + }, + "original": { + "owner": "p-ranav", + "repo": "argparse", + "rev": "d924b84eba1f0f0adf38b20b7b4829f6f65b6570", + "type": "github" + } + }, "crane": { "locked": { "lastModified": 1781825982, @@ -178,6 +246,23 @@ "type": "github" } }, + "glslang-WallpaperEngine": { + "flake": false, + "locked": { + "lastModified": 1770589476, + "narHash": "sha256-auhYcTWdSERwujUqwfDbF61tncO18dwar3mMQ09VW1w=", + "owner": "Almamu", + "repo": "glslang-WallpaperEngine", + "rev": "b775500a153f5ceb0e4b6f366b79c4c57521bb62", + "type": "github" + }, + "original": { + "owner": "Almamu", + "repo": "glslang-WallpaperEngine", + "rev": "b775500a153f5ceb0e4b6f366b79c4c57521bb62", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -219,6 +304,40 @@ "type": "github" } }, + "json": { + "flake": false, + "locked": { + "lastModified": 1743872075, + "narHash": "sha256-eSqi4dhFrUvjYN+jD8nGqj1FbzGA6I2+eSqzdCGOLH8=", + "owner": "nlohmann", + "repo": "json", + "rev": "4424a0fcc1c7fa640b5c87d26776d99150dacd10", + "type": "github" + }, + "original": { + "owner": "nlohmann", + "repo": "json", + "rev": "4424a0fcc1c7fa640b5c87d26776d99150dacd10", + "type": "github" + } + }, + "kissfft": { + "flake": false, + "locked": { + "lastModified": 1739194969, + "narHash": "sha256-DywClnx67EE+CnduSuZIIfaAKbBg1ebQ+JgwIpDsnGQ=", + "owner": "mborgerding", + "repo": "kissfft", + "rev": "febd4caeed32e33ad8b2e0bb5ea77542c40f18ec", + "type": "github" + }, + "original": { + "owner": "mborgerding", + "repo": "kissfft", + "rev": "febd4caeed32e33ad8b2e0bb5ea77542c40f18ec", + "type": "github" + } + }, "lanzaboote": { "inputs": { "crane": "crane", @@ -311,6 +430,22 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1789286504, + "narHash": "sha256-eiEK7cKZORNEvX0GeF3RtNEF/JXhgf2RqSp3230q13E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ef34387ddd751e1ab8857adf4676492d32eb24ec", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "pre-commit": { "inputs": { "flake-compat": "flake-compat_2", @@ -334,6 +469,23 @@ "type": "github" } }, + "quickjs": { + "flake": false, + "locked": { + "lastModified": 1770976497, + "narHash": "sha256-odQznZ/Xc6IGh6JPM1RyyEn9HL/+/AFR99XcF+WHJDc=", + "owner": "quickjs-ng", + "repo": "quickjs", + "rev": "72ba50f63ee31202f8c18b8d07ab1e1c3486ee6f", + "type": "github" + }, + "original": { + "owner": "quickjs-ng", + "repo": "quickjs", + "rev": "72ba50f63ee31202f8c18b8d07ab1e1c3486ee6f", + "type": "github" + } + }, "root": { "inputs": { "aagl": "aagl", @@ -343,6 +495,7 @@ "nixpkgs": "nixpkgs_2", "snowfall-lib": "snowfall-lib", "sops-nix": "sops-nix", + "wallpaperengine": "wallpaperengine", "zen-browser": "zen-browser" } }, @@ -430,6 +583,23 @@ "type": "github" } }, + "stb": { + "flake": false, + "locked": { + "lastModified": 1741976854, + "narHash": "sha256-FkTeRO/AC5itykH4uWNsE0UeQTS34VtGGoej5QJiBlg=", + "owner": "nothings", + "repo": "stb", + "rev": "f0569113c93ad095470c54bf34a17b36646bbbb5", + "type": "github" + }, + "original": { + "owner": "nothings", + "repo": "stb", + "rev": "f0569113c93ad095470c54bf34a17b36646bbbb5", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -445,6 +615,30 @@ "type": "github" } }, + "wallpaperengine": { + "inputs": { + "Catch2": "Catch2", + "MimeTypes": "MimeTypes", + "SPIRV-Cross-WallpaperEngine": "SPIRV-Cross-WallpaperEngine", + "argparse": "argparse", + "glslang-WallpaperEngine": "glslang-WallpaperEngine", + "json": "json", + "kissfft": "kissfft", + "nixpkgs": "nixpkgs_3", + "quickjs": "quickjs", + "stb": "stb" + }, + "locked": { + "lastModified": 1789783126, + "narHash": "sha256-z6rSxx9Hz68EEJ1suug52MO/PQhMGPamSwX0FmMDgx4=", + "path": "/home/andreas/Projects/linwallpaap/linux-wallpaperengine", + "type": "path" + }, + "original": { + "path": "/home/andreas/Projects/linwallpaap/linux-wallpaperengine", + "type": "path" + } + }, "zen-browser": { "inputs": { "home-manager": "home-manager_2", diff --git a/homes/x86_64-linux/andreas@drivebystation-nix/default.nix b/homes/x86_64-linux/andreas@drivebystation-nix/default.nix index 6c33666..bdfa6d3 100644 --- a/homes/x86_64-linux/andreas@drivebystation-nix/default.nix +++ b/homes/x86_64-linux/andreas@drivebystation-nix/default.nix @@ -37,12 +37,12 @@ in }; # Auto-start linux-wallpaperengine for dual monitors via XDG autostart - xdg.configFile."autostart/linux-wallpaperengine.desktop".text = '' - [Desktop Entry] - Type=Application - Name=Wallpaper Engine - Exec=${pkgs.my-namespace.linux-wallpaperengine}/bin/linux-wallpaperengine --screen-root DP-1 --bg 2935872330 --screen-root DP-2 --bg 2935872330 -f 12 - X-KDE-autostart-after=panel - X-KDE-StartupNotify=false - ''; + # xdg.configFile."autostart/linux-wallpaperengine.desktop".text = '' + # [Desktop Entry] + # Type=Application + # Name=Wallpaper Engine + # Exec=${pkgs.my-namespace.linux-wallpaperengine}/bin/linux-wallpaperengine --screen-root DP-1 --bg 2935872330 --screen-root DP-2 --bg 2935872330 -f 12 + # X-KDE-autostart-after=panel + # X-KDE-StartupNotify=false + # ''; } \ No newline at end of file diff --git a/systems/x86_64-linux/drivebystation-nix/configuration.nix b/systems/x86_64-linux/drivebystation-nix/configuration.nix index e3c7bc1..8564646 100644 --- a/systems/x86_64-linux/drivebystation-nix/configuration.nix +++ b/systems/x86_64-linux/drivebystation-nix/configuration.nix @@ -14,6 +14,7 @@ ./hardware/hardware-configuration.nix ]; + # Bootloader. # boot.loader.systemd-boot.enable = true; # managed by lanzaboote boot.loader.efi.canTouchEfiVariables = true; @@ -288,6 +289,6 @@ # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "24.05"; # Did you read the comment? + system.stateVersion = "26.05"; # Did you read the comment? } diff --git a/systems/x86_64-linux/drivebystation-nix/default.nix b/systems/x86_64-linux/drivebystation-nix/default.nix index 4d95aa3..3c874e9 100644 --- a/systems/x86_64-linux/drivebystation-nix/default.nix +++ b/systems/x86_64-linux/drivebystation-nix/default.nix @@ -41,7 +41,7 @@ in ]; config = { programs.linux-wallpaperengine.enable = true; - system.stateVersion = "24.05"; + system.stateVersion = "26.05"; nix.settings.experimental-features = [ "nix-command" "flakes" ]; # Define a user account. Don't forget to set a password with ‘passwd’. # Desktops diff --git a/systems/x86_64-linux/drivebystation-nix/hardware/hardware-configuration.nix b/systems/x86_64-linux/drivebystation-nix/hardware/hardware-configuration.nix index eb4bfc4..0d8b85f 100644 --- a/systems/x86_64-linux/drivebystation-nix/hardware/hardware-configuration.nix +++ b/systems/x86_64-linux/drivebystation-nix/hardware/hardware-configuration.nix @@ -39,17 +39,21 @@ }; - fileSystems."/" = { - device = "/dev/disk/by-uuid/563805a1-5277-4488-bbdd-c1a7ed37be76"; - fsType = "ext4"; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/31fe479a-f4ef-4ee5-9cd9-d43ed1a3c88b"; + fsType = "ext4"; + }; - fileSystems."/boot" = { - #device = "/dev/disk/by-uuid/E846-D998"; - device = "/dev/disk/by-uuid/19BE-8BAA"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/646A-D107"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + fileSystems."/home" = + { device = "/dev/disk/by-uuid/6ac4f42b-09e3-43b3-8215-8ff9a3c0695e"; + fsType = "ext4"; + }; # Mount ntfs partition # fileSystems."/run/media/627C3BDF7C3BAD23" = { @@ -80,10 +84,10 @@ swapDevices = [ { device = "/var/lib/swapfile"; size = 32*1024; - } ]; #resume-offset = 78399488 - boot.resumeDevice = "/dev/disk/by-uuid/563805a1-5277-4488-bbdd-c1a7ed37be76"; # the unlocked drive mapping + } ]; #resume-offset = 195323904 + boot.resumeDevice = "/dev/disk/by-uuid/31fe479a-f4ef-4ee5-9cd9-d43ed1a3c88b"; # the unlocked drive mapping boot.kernelParams = [ - "resume_offset=78399488" #sudo filefrag -v /var/lib/swapfile|awk 'NR==4{gsub(/\./,"");print $4;}' + "resume_offset=195323904" #sudo filefrag -v /var/lib/swapfile|awk 'NR==4{gsub(/\./,"");print $4;}' "r8125.aspm=0" # realtek network adapter fix ]; security.protectKernelImage = false;