diff options
| -rw-r--r-- | nix/flake.lock | 133 | ||||
| -rw-r--r-- | nix/flake.nix | 16 | ||||
| -rw-r--r-- | wallpapers/Circles4.png | bin | 9288332 -> 0 bytes | |||
| -rw-r--r-- | wallpapers/Curve3.png | bin | 15858788 -> 0 bytes | |||
| -rw-r--r-- | wallpapers/Curve4.png | bin | 16908789 -> 0 bytes | |||
| -rw-r--r-- | wallpapers/Landscape1.png | bin | 3381181 -> 0 bytes | |||
| -rw-r--r-- | wallpapers/Landscape2.png | bin | 2897230 -> 0 bytes | |||
| -rw-r--r-- | wallpapers/Landscape3.png | bin | 7050220 -> 0 bytes | |||
| -rw-r--r-- | wallpapers/Landscape4.png | bin | 10500014 -> 0 bytes | |||
| -rw-r--r-- | wallpapers/README.txt | 7 |
10 files changed, 146 insertions, 10 deletions
diff --git a/nix/flake.lock b/nix/flake.lock index 064e44e..56b6d41 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -17,6 +17,62 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "nix-wallpaper", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -56,8 +112,44 @@ "type": "github" } }, + "nix-wallpaper": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1769821964, + "narHash": "sha256-WcfoLCZbo32Psw2mP9bF8uHCF50SMAhQFkWq+/+Z9B0=", + "owner": "lunik1", + "repo": "nix-wallpaper", + "rev": "f658947fdc9ab85be9003deb26632a464bd41e5d", + "type": "github" + }, + "original": { + "owner": "lunik1", + "repo": "nix-wallpaper", + "type": "github" + } + }, "nixpkgs": { "locked": { + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { "lastModified": 1782918843, "narHash": "sha256-ETYnV9U7Sr+A45dohzZdfCZKOss4qrTkO+wgNZNvEc0=", "owner": "NixOS", @@ -72,11 +164,50 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": [ + "nix-wallpaper", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "nix-darwin": "nix-darwin", "nix-homebrew": "nix-homebrew", - "nixpkgs": "nixpkgs" + "nix-wallpaper": "nix-wallpaper", + "nixpkgs": "nixpkgs_2" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" } } }, diff --git a/nix/flake.nix b/nix/flake.nix index 18fde7a..3edc4c5 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -7,6 +7,7 @@ nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; nix-homebrew.url = "github:zhaofengli/nix-homebrew"; + nix-wallpaper.url = "github:lunik1/nix-wallpaper"; }; outputs = @@ -15,8 +16,16 @@ nix-darwin, nixpkgs, nix-homebrew, + nix-wallpaper, }: let + system = "aarch64-darwin"; + + wallpaper = nix-wallpaper.packages.${system}.default.override { + preset = "catppuccin-frappe"; + logoSize = 25; + }; + configuration = { pkgs, @@ -48,6 +57,9 @@ pkgs.ripgrep pkgs.ffmpeg + # pkgs.discord + # pkgs.signal-desktop + pkgs.nixd pkgs.nixfmt @@ -110,7 +122,7 @@ --target="/Users/melodidey" \ --restow "." - osascript -e "tell application \"System Events\" to tell every desktop to set picture to \"/Users/melodidey/dotfiles/wallpapers/Curve3.png\" as POSIX file" + osascript -e "tell application \"System Events\" to tell every desktop to set picture to \"${wallpaper}/share/wallpapers/nixos-wallpaper.png\" as POSIX file" ''; system.defaults = { @@ -148,7 +160,7 @@ system.stateVersion = 6; # The platform the configuration will be used on. - nixpkgs.hostPlatform = "aarch64-darwin"; + nixpkgs.hostPlatform = system; }; in { diff --git a/wallpapers/Circles4.png b/wallpapers/Circles4.png Binary files differdeleted file mode 100644 index e5e1ec6..0000000 --- a/wallpapers/Circles4.png +++ /dev/null diff --git a/wallpapers/Curve3.png b/wallpapers/Curve3.png Binary files differdeleted file mode 100644 index daf08dc..0000000 --- a/wallpapers/Curve3.png +++ /dev/null diff --git a/wallpapers/Curve4.png b/wallpapers/Curve4.png Binary files differdeleted file mode 100644 index 8e6eeb0..0000000 --- a/wallpapers/Curve4.png +++ /dev/null diff --git a/wallpapers/Landscape1.png b/wallpapers/Landscape1.png Binary files differdeleted file mode 100644 index b0e8347..0000000 --- a/wallpapers/Landscape1.png +++ /dev/null diff --git a/wallpapers/Landscape2.png b/wallpapers/Landscape2.png Binary files differdeleted file mode 100644 index 02724ab..0000000 --- a/wallpapers/Landscape2.png +++ /dev/null diff --git a/wallpapers/Landscape3.png b/wallpapers/Landscape3.png Binary files differdeleted file mode 100644 index 8cfacf3..0000000 --- a/wallpapers/Landscape3.png +++ /dev/null diff --git a/wallpapers/Landscape4.png b/wallpapers/Landscape4.png Binary files differdeleted file mode 100644 index c0c269f..0000000 --- a/wallpapers/Landscape4.png +++ /dev/null diff --git a/wallpapers/README.txt b/wallpapers/README.txt deleted file mode 100644 index d5b8e20..0000000 --- a/wallpapers/README.txt +++ /dev/null @@ -1,7 +0,0 @@ -SCI VALLEY
-Wallpapers by sci
-
-Only for use as desktop/mobile wallpapers.
-Using the images in your own artworks and then distributing them commercially is not allowed.
-
-https://twitter.com/scidsgn
\ No newline at end of file |
