diff --git a/flake.lock b/flake.lock index 7f9587d..52d1b7e 100644 --- a/flake.lock +++ b/flake.lock @@ -169,7 +169,7 @@ }, "devshell": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixvim", "nixpkgs" @@ -250,38 +250,6 @@ "type": "github" } }, - "flake-compat_2": { - "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-compat_3": { - "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-parts": { "inputs": { "nixpkgs-lib": [ @@ -307,11 +275,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -325,11 +293,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -377,7 +345,6 @@ "gitignore": { "inputs": { "nixpkgs": [ - "nixvim", "pre-commit-hooks", "nixpkgs" ] @@ -433,40 +400,18 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1706001011, - "narHash": "sha256-J7Bs9LHdZubgNHZ6+eE/7C18lZ1P6S5/zdJSdXFItI4=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "3df2a80f3f85f91ea06e5e91071fa74ba92e5084", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ - "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1710717205, - "narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=", + "lastModified": 1711591334, + "narHash": "sha256-9d5ilxxq4CXw44eFw8VFrRneAKex7D8xjn95mwZjgf4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3", + "rev": "f0dd0838c3558b59dc3b726d8ab89f5b5e35c297", "type": "github" }, "original": { @@ -525,6 +470,18 @@ "type": "github" } }, + "nixos-symbolic": { + "flake": false, + "locked": { + "narHash": "sha256-njb7R4zLnYS+jb1muFAC6sUDO9hVATVD0ABOPnqyoEE=", + "type": "file", + "url": "https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/white.svg" + }, + "original": { + "type": "file", + "url": "https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/white.svg" + } + }, "nixpkgs": { "locked": { "lastModified": 1711163522, @@ -569,11 +526,15 @@ "home-manager": [ "home-manager" ], - "nix-darwin": "nix-darwin", + "nix-darwin": [ + "nix-darwin" + ], "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks": "pre-commit-hooks" + "pre-commit-hooks": [ + "pre-commit-hooks" + ] }, "locked": { "lastModified": 1711404724, @@ -645,24 +606,26 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", + "flake-compat": [ + "flake-compat" + ], + "flake-utils": [ + "flake-utils" + ], "gitignore": "gitignore", "nixpkgs": [ - "nixvim", "nixpkgs" ], "nixpkgs-stable": [ - "nixvim", "nixpkgs" ] }, "locked": { - "lastModified": 1710923068, - "narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=", + "lastModified": 1711519547, + "narHash": "sha256-Q7YmSCUJmDl71fJv/zD9lrOCJ1/SE/okZ2DsrmRjzhY=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "e611897ddfdde3ed3eaac4758635d7177ff78673", + "rev": "7d47a32e5cd1ea481fab33c516356ce27c8cef4a", "type": "github" }, "original": { @@ -678,13 +641,18 @@ "ez-configs": "ez-configs", "flake-compat": "flake-compat", "flake-parts": "flake-parts", + "flake-utils": "flake-utils", "getchoo": "getchoo", "home-manager": "home-manager", + "nix-darwin": "nix-darwin", "nix-on-droid": "nix-on-droid", + "nixos-symbolic": "nixos-symbolic", "nixpkgs": "nixpkgs", "nixvim": "nixvim", + "pre-commit-hooks": "pre-commit-hooks", "stylix": "stylix", - "treefmt-nix": "treefmt-nix" + "treefmt-nix": "treefmt-nix", + "wallpaper": "wallpaper" } }, "scss-reset": { @@ -714,9 +682,13 @@ "base16-kitty": "base16-kitty", "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_3", + "flake-compat": [ + "flake-compat" + ], "gnome-shell": "gnome-shell", - "home-manager": "home-manager_2", + "home-manager": [ + "home-manager" + ], "nixpkgs": [ "nixpkgs" ] @@ -784,6 +756,18 @@ "repo": "treefmt-nix", "type": "github" } + }, + "wallpaper": { + "flake": false, + "locked": { + "narHash": "sha256-O/fxjSpcWWqZQNlGUQ27XRfYYkAdShyAXV4FMjdUxrc=", + "type": "file", + "url": "https://raw.githubusercontent.com/zhichaoh/catppuccin-wallpapers/main/misc/rainbow-cat.png" + }, + "original": { + "type": "file", + "url": "https://raw.githubusercontent.com/zhichaoh/catppuccin-wallpapers/main/misc/rainbow-cat.png" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 45fb02b..3606a41 100644 --- a/flake.nix +++ b/flake.nix @@ -73,14 +73,19 @@ }; inputs = { - # Systems nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + # Systems home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-darwin = { + url = "github:lnl7/nix-darwin"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nix-on-droid = { url = "github:nix-community/nix-on-droid/prerelease-23.11"; inputs.nixpkgs.follows = "nixpkgs"; @@ -101,16 +106,28 @@ flake-compat.url = "github:edolstra/flake-compat"; + flake-utils.url = "github:numtide/flake-utils"; + # Formatter treefmt-nix = { url = "github:numtide/treefmt-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + pre-commit-hooks = { + url = "github:cachix/pre-commit-hooks.nix"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs-stable.follows = "nixpkgs"; + inputs.flake-compat.follows = "flake-compat"; + inputs.flake-utils.follows = "flake-utils"; + }; + # Scheming stylix = { url = "github:danth/stylix"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-compat.follows = "flake-compat"; + inputs.home-manager.follows = "home-manager"; }; # Programs @@ -119,7 +136,9 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-compat.follows = "flake-compat"; inputs.flake-parts.follows = "flake-parts"; + inputs.pre-commit-hooks.follows = "pre-commit-hooks"; inputs.home-manager.follows = "home-manager"; + inputs.nix-darwin.follows = "nix-darwin"; }; ags = { @@ -137,6 +156,10 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-compat.follows = "flake-compat"; }; + + # Assets + wallpaper.url = "file+https://raw.githubusercontent.com/zhichaoh/catppuccin-wallpapers/main/misc/rainbow-cat.png"; + nixos-symbolic.url = "file+https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/white.svg"; }; nixConfig = { diff --git a/modules/home/ags/default.nix b/modules/home/ags/default.nix index f1193a8..d447e1e 100644 --- a/modules/home/ags/default.nix +++ b/modules/home/ags/default.nix @@ -1,7 +1,7 @@ { config, lib, - pkgs, + nixos-symbolic, ... }: with lib; let @@ -20,9 +20,6 @@ in { (color: "@define-color ${color} ${colors.withHashtag.${color}};") colorNames; - xdg.configFile."ags/src/assets/nixos-symbolic.svg".source = pkgs.fetchurl { - url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/35ebbbf01c3119005ed180726c388a01d4d1100c/logo/white.svg"; - hash = "sha256-Ed2l6i2wi/YTcWCq23bspH/t3RYp6AodykpXF1Zgccw="; - }; + xdg.configFile."ags/src/assets/nixos-symbolic.svg".source = nixos-symbolic; }; } diff --git a/modules/home/stylix/default.nix b/modules/home/stylix/default.nix index 31a4f45..d251f00 100644 --- a/modules/home/stylix/default.nix +++ b/modules/home/stylix/default.nix @@ -1,11 +1,12 @@ -{pkgs, ...}: { +{ + pkgs, + wallpaper, + ... +}: { config = { stylix = { # placeholder - image = pkgs.fetchurl { - url = "https://raw.githubusercontent.com/zhichaoh/catppuccin-wallpapers/1023077979591cdeca76aae94e0359da1707a60e/misc/rainbow-cat.png"; - hash = "sha256-WP+kQ7mgjpeekatDEPSP/XeDc5ZihCm+BxgqgwYDIEU="; - }; + image = wallpaper; base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; fonts = rec { diff --git a/modules/nixos/stylix/default.nix b/modules/nixos/stylix/default.nix index deb48db..2a0fd38 100644 --- a/modules/nixos/stylix/default.nix +++ b/modules/nixos/stylix/default.nix @@ -1,10 +1,11 @@ -{pkgs, ...}: { +{ + pkgs, + wallpaper, + ... +}: { config = { stylix = { - image = pkgs.fetchurl { - url = "https://raw.githubusercontent.com/zhichaoh/catppuccin-wallpapers/1023077979591cdeca76aae94e0359da1707a60e/misc/rainbow-cat.png"; - hash = "sha256-WP+kQ7mgjpeekatDEPSP/XeDc5ZihCm+BxgqgwYDIEU="; - }; + image = wallpaper; base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; fonts = rec { sansSerif = {