diff --git a/flake.lock b/flake.lock index bcbabd2..057fcff 100644 --- a/flake.lock +++ b/flake.lock @@ -16,7 +16,38 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -31,6 +62,28 @@ "type": "github" } }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "wallpaper", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -126,6 +179,22 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1673800717, + "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1690640159, @@ -159,6 +228,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1675309347, + "narHash": "sha256-D3CQ6HRDT2m3XJlrzb5jKq4vNFR5xFTEFKC7iSjlFpM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "006c3bd4dd2f5d1d2094047f307cbf9e2b73d9c5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1689088367, "narHash": "sha256-Y2tl2TlKCWEHrOeM9ivjCLlRAKH3qoPUE/emhZECU14=", @@ -189,6 +274,34 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": [ + "wallpaper", + "flake-utils" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "wallpaper", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1675337566, + "narHash": "sha256-jmLBTQcs1jFOn8h1Q5b5XwPfYgFOtcZ3+mU9KvfC6Js=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "5668d079583a5b594cb4e0cc0e6d84f1b93da7ae", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", @@ -197,9 +310,30 @@ "nixpkgs-master": "nixpkgs-master", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", + "wallpaper": "wallpaper", "zig": "zig" } }, + "wallpaper": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_3", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1682599883, + "narHash": "sha256-3RLfNhq8decb2VOTJLboloPX1M7Rwy3iGZL4DV7aLd0=", + "owner": "lunik1", + "repo": "nix-wallpaper", + "rev": "e1dfc3e671f9af843721c32ed7c08ea9966426c6", + "type": "github" + }, + "original": { + "owner": "lunik1", + "repo": "nix-wallpaper", + "type": "github" + } + }, "wlroots": { "flake": false, "locked": { @@ -246,9 +380,9 @@ }, "zig": { "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3" + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1689899128, diff --git a/flake.nix b/flake.nix index 1419fb7..5044667 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,9 @@ # Zig zig.url = github:mitchellh/zig-overlay; + + # Wallpaper + wallpaper.url = github:lunik1/nix-wallpaper; }; outputs = { @@ -29,6 +32,7 @@ hyprland, nur, zig, + wallpaper, } @ inputs: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; @@ -41,6 +45,9 @@ modules = [ ./home + { + _module.args.wallpaper = wallpaper.packages.${system}.default; + } hyprland.homeManagerModules.default diff --git a/home/default.nix b/home/default.nix index 2b61702..6b54e22 100644 --- a/home/default.nix +++ b/home/default.nix @@ -5,6 +5,7 @@ options, specialArgs, modulesPath, + wallpaper, }: { nixpkgs.config.allowUnfreePredicate = _: true; @@ -18,9 +19,10 @@ }; # Symlinks - home.file = { - ".wallpaper".source = ./wallpaper; - }; + #home.file = { + # ".wallpaper".source = "${wallpaper.override { preset = "gruvbox-dark"; width = 3840; height = 2160;}}/share/wallpapers/nixos-wallpaper.png"; + # #".wallpaper".source = ./wallpaper; + #}; # TODO: Change for Laptop targets.genericLinux.enable = false; # Enable on non-nixos ditros @@ -65,5 +67,8 @@ }; # Gnome settings - dconf.settings = import ./gnome.nix {inherit lib;}; + dconf.settings = import ./gnome.nix { + inherit lib; + inherit wallpaper; + }; } diff --git a/home/gnome.nix b/home/gnome.nix index 8d0f600..a5f38cf 100644 --- a/home/gnome.nix +++ b/home/gnome.nix @@ -1,11 +1,25 @@ -{lib}: { +{ + lib, + wallpaper, +}: { # Use `dconf watch /` to track stateful changes you are doing, then set them here. "org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; }; - "org/gnome/desktop/background" = { - picture-uri = "file:///home/kristian/.wallpaper"; - picture-uri-dark = "file:///home/kristian/.wallpaper"; + "org/gnome/desktop/background" = let + width = 3840; + height = 2160; + in { + picture-uri = "file://${wallpaper.override { + preset = "nord-snow-aurora"; + inherit width; + inherit height; + }}/share/wallpapers/nixos-wallpaper.png"; + picture-uri-dark = "file://${wallpaper.override { + preset = "nord-night-aurora"; + inherit width; + inherit height; + }}/share/wallpapers/nixos-wallpaper.png"; }; "org/gnome/desktop/wm/keybindings" = { switch-to-workspace-left = ["1"]; @@ -33,4 +47,7 @@ edge-tiling = true; dynamic-workspaces = true; }; + "org/gnome/Console" = { + theme = "auto"; + }; } diff --git a/home/wallpaper b/home/wallpaper deleted file mode 100644 index 5fbc6bc..0000000 Binary files a/home/wallpaper and /dev/null differ