From 6f1cb3da8fc08d7da9784ba7758feb4b99032ee8 Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Sat, 16 Mar 2024 17:39:26 +0530 Subject: [PATCH] [feat] Added wallpapers and music-player --- common/home.nix | 1 + flake.lock | 252 +++++++++++++++++++++++++++++++++++++++----- flake.nix | 4 + inputs.nix | 61 +++++++++++ linux/gtk.nix | 6 +- linux/hyprland.nix | 2 +- overlays.nix | 1 + utils/wallhaven.nix | 10 +- 8 files changed, 306 insertions(+), 31 deletions(-) create mode 100644 inputs.nix diff --git a/common/home.nix b/common/home.nix index 9c7cfe01..c91b4d62 100644 --- a/common/home.nix +++ b/common/home.nix @@ -9,6 +9,7 @@ home.packages = with pkgs; [ + music-player pandoc gnupg gpg-tui diff --git a/flake.lock b/flake.lock index 635b585f..07a58c16 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,21 @@ { "nodes": { + "advisory-db": { + "flake": false, + "locked": { + "lastModified": 1686827229, + "narHash": "sha256-Z8fcZE2J5hptQeyZqk+FyVCWCEfAZYN18NTVRkAecAk=", + "owner": "rustsec", + "repo": "advisory-db", + "rev": "37abf6e46378cb80ef43902a6bd9dcef2d9dfccc", + "type": "github" + }, + "original": { + "owner": "rustsec", + "repo": "advisory-db", + "type": "github" + } + }, "anyrun": { "inputs": { "flake-parts": "flake-parts", @@ -136,6 +152,54 @@ "type": "github" } }, + "crane_3": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_6", + "nixpkgs": [ + "music-player", + "nixpkgs" + ], + "rust-overlay": "rust-overlay_5" + }, + "locked": { + "lastModified": 1686621798, + "narHash": "sha256-FUwWszmSiDzUdTk8f69xwMoYlhdPaLvDaIYOE/y6VXc=", + "owner": "ipetkov", + "repo": "crane", + "rev": "75f7d715f8088f741be9981405f6444e2d49efdd", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "fenix": { + "inputs": { + "nixpkgs": [ + "music-player", + "nixpkgs" + ], + "rust-analyzer-src": [ + "music-player" + ] + }, + "locked": { + "lastModified": 1686896497, + "narHash": "sha256-IphIS1KpiFXp/j0v7mEMhtw51uvU5F0mqF2j4//7VAA=", + "owner": "nix-community", + "repo": "fenix", + "rev": "9c69d11badcd78710d7d8665bc3d2e1adc450ffe", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -155,11 +219,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -216,6 +280,22 @@ "type": "github" } }, + "flake-compat_6": { + "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-parts": { "inputs": { "nixpkgs-lib": [ @@ -376,6 +456,24 @@ "inputs": { "systems": "systems_10" }, + "locked": { + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_11": { + "inputs": { + "systems": "systems_11" + }, "locked": { "lastModified": 1701680307, "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", @@ -390,9 +488,27 @@ "type": "github" } }, - "flake-utils_11": { + "flake-utils_12": { "inputs": { - "systems": "systems_11" + "systems": "systems_12" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_13": { + "inputs": { + "systems": "systems_13" }, "locked": { "lastModified": 1701680307, @@ -484,11 +600,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -502,11 +618,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -520,11 +636,11 @@ "systems": "systems_8" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -538,11 +654,11 @@ "systems": "systems_9" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -768,6 +884,30 @@ "type": "github" } }, + "music-player": { + "inputs": { + "advisory-db": "advisory-db", + "crane": "crane_3", + "fenix": "fenix", + "flake-utils": "flake-utils_7", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1708711161, + "narHash": "sha256-/L+G7gdlCRLrscdHiNePW6lDq+dk/Be8C/j6KA2oW0U=", + "owner": "tsirysndr", + "repo": "music-player", + "rev": "53850d5e80f7c19daeb0c8af623d7c7078c1e242", + "type": "github" + }, + "original": { + "owner": "tsirysndr", + "repo": "music-player", + "type": "github" + } + }, "naersk": { "inputs": { "nixpkgs": "nixpkgs_3" @@ -788,8 +928,8 @@ }, "neorocks": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_8", + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_10", "neovim-nightly": "neovim-nightly", "nixpkgs": "nixpkgs_8", "pre-commit-hooks": "pre-commit-hooks" @@ -810,7 +950,7 @@ }, "neovim-flake": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_8", "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" @@ -834,7 +974,7 @@ }, "neovim-nightly": { "inputs": { - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_11", "nixpkgs": [ "rustaceanvim", "neorocks", @@ -859,7 +999,7 @@ }, "neovim-nightly-overlay": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_4", "hercules-ci-effects": "hercules-ci-effects", "neovim-flake": "neovim-flake", @@ -959,7 +1099,7 @@ }, "nixneovim": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_9", "haumea": "haumea", "home-manager": "home-manager_2", "nix-flake-tests": "nix-flake-tests", @@ -1331,8 +1471,8 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_10", + "flake-compat": "flake-compat_5", + "flake-utils": "flake-utils_12", "gitignore": "gitignore_2", "nixpkgs": [ "rustaceanvim", @@ -1388,8 +1528,8 @@ }, "pre-commit-hooks_2": { "inputs": { - "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_11", + "flake-compat": "flake-compat_6", + "flake-utils": "flake-utils_13", "gitignore": "gitignore_3", "nixpkgs": "nixpkgs_9", "nixpkgs-stable": "nixpkgs-stable_3" @@ -1418,6 +1558,7 @@ "home-manager": "home-manager", "ironbar": "ironbar", "lanzaboote": "lanzaboote", + "music-player": "music-player", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-darwin": "nix-darwin", "nix-index-database": "nix-index-database", @@ -1512,6 +1653,33 @@ "type": "github" } }, + "rust-overlay_5": { + "inputs": { + "flake-utils": [ + "music-player", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "music-player", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1685759304, + "narHash": "sha256-I3YBH6MS3G5kGzNuc1G0f9uYfTcNY9NYoRc3QsykLk4=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "c535b4f3327910c96dcf21851bbdd074d0760290", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "rustaceanvim": { "inputs": { "flake-parts": "flake-parts_6", @@ -1581,6 +1749,36 @@ "type": "github" } }, + "systems_12": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_13": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index ac12882e..195e47e3 100644 --- a/flake.nix +++ b/flake.nix @@ -53,6 +53,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nix-index-database.url = "github:Mic92/nix-index-database"; + music-player = { + url = "github:tsirysndr/music-player"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nur.url = "github:nix-community/nur"; diff --git a/inputs.nix b/inputs.nix new file mode 100644 index 00000000..cadc5c51 --- /dev/null +++ b/inputs.nix @@ -0,0 +1,61 @@ +{ + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nix-darwin = { + url = "github:LnL7/nix-darwin"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + neovim-nightly-overlay = { + url = "github:nix-community/neovim-nightly-overlay"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + anyrun = { + # My fork of anyrun that allows up / down with / + url = "github:uttarayan21/anyrun"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + anyrun-hyprwin = { + url = "github:uttarayan21/anyrun-hyprwin"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + anyrun-nixos-options = { + url = "github:n3oney/anyrun-nixos-options"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + anyrun-rink = { + url = "github:uttarayan21/anyrun-rink"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + ironbar = { + url = "github:JakeStanger/ironbar"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + lanzaboote = { + url = "github:nix-community/lanzaboote"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nixneovim = { + # url = "github:nixneovim/nixneovim"; + url = "github:uttarayan21/NixNeovim"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + # nixneovimplugins = { + # url = "github:NixNeovim/NixNeovimPlugins"; + # inputs.nixpkgs.follows = "nixpkgs"; + # } + rustaceanvim = { + url = "github:mrcjkb/rustaceanvim"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nix-index-database.url = "github:Mic92/nix-index-database"; + music-player = { + url = "github:tsirysndr/music-player"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + nur.url = "github:nix-community/nur"; + +} diff --git a/linux/gtk.nix b/linux/gtk.nix index 70e3e286..0de31cad 100644 --- a/linux/gtk.nix +++ b/linux/gtk.nix @@ -19,8 +19,12 @@ }; }; - gtk3.extraConfig = { gtk-application-prefer-dark-theme = 1; }; + cursorTheme = { + name = "Vanillay-DMZ"; + package = pkgs.vanilla-dmz; + }; + gtk3.extraConfig = { gtk-application-prefer-dark-theme = 1; }; gtk4.extraConfig = { gtk-application-prefer-dark-theme = 1; }; }; } diff --git a/linux/hyprland.nix b/linux/hyprland.nix index 637427ab..81c7109c 100644 --- a/linux/hyprland.nix +++ b/linux/hyprland.nix @@ -8,7 +8,7 @@ systemd.target = "hyprland-session.target"; settings.preload = wallpapers.all; settings.wallpapers = { - "DP-4" = wallpapers.lights; + "DP-4" = wallpapers.frieren_3; "DP-2" = wallpapers.shapes; }; }; diff --git a/overlays.nix b/overlays.nix index 38cdde52..2125bcef 100644 --- a/overlays.nix +++ b/overlays.nix @@ -23,6 +23,7 @@ let }; checkPhase = null; }; + music-player-git = inputs.music-player.packages.${prev.system}.default; }; anyrun-overlay = final: prev: { diff --git a/utils/wallhaven.nix b/utils/wallhaven.nix index 216bda8c..548751c9 100644 --- a/utils/wallhaven.nix +++ b/utils/wallhaven.nix @@ -2,7 +2,8 @@ let getWall = { url, sha256 ? pkgs.lib.fakeSha256 }: builtins.fetchurl { inherit url sha256; }; -in rec { +in +rec { inherit getWall; # Some predefined wallpapers lights = getWall { @@ -17,6 +18,11 @@ in rec { url = "https://w.wallhaven.cc/full/gp/wallhaven-gpv6rd.jpg"; sha256 = "18hpaxwi1npcfkmyw42plivmjlpgvxgblp8fy2glxh7g1yxh6qds"; }; + frieren_3 = getWall { + url = "https://w.wallhaven.cc/full/jx/wallhaven-jxqml5.jpg"; + sha256 = "0vm02yg4w5bfqns5k1r8y09fqxs0qy4y886myvnp64n1maaihp4k"; + }; - all = [ lights shapes cloud ]; + anime = [ frieren_3 ]; + all = [ lights shapes cloud ] ++ anime; }