From e2a291789708f4fe194aa33ac5ced860db9d6c0f Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Sat, 25 Dec 2021 16:22:01 -0500 Subject: [PATCH] .. --- README.md | 2 +- features/desktopish/default.nix | 1 + flake.lock | 35 ++++++++++++++++++++++----------- hosts/darwin.nix | 3 +++ 4 files changed, 29 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 8169801..44a001a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -This repository contains the Nix / NixOS configuration for all of my systems. Start from `flakes.nix` (see [Flakes](https://nixos.wiki/wiki/Flakes)) if you are looking for NixOS configuration. Start from `home.nix` if you are looking for non-NixOS Nix configuration (eg: on macOS). +This repository contains the Nix / NixOS configuration for all of my systems. Start from `flakes.nix` (see [Flakes](https://nixos.wiki/wiki/Flakes)). - `home.nix`: Only install things that are needed in all platforms (VMs, VPS, WSL2, etc.) - `flake.nix`: Install things I need natively on NixOS desktop & laptop computers diff --git a/features/desktopish/default.nix b/features/desktopish/default.nix index b46e397..e61d1f5 100644 --- a/features/desktopish/default.nix +++ b/features/desktopish/default.nix @@ -23,6 +23,7 @@ environment.systemPackages = with pkgs; [ acpi mpv + youtube-dl xorg.xmessage ]; diff --git a/flake.lock b/flake.lock index b4090c5..62b76a0 100644 --- a/flake.lock +++ b/flake.lock @@ -472,10 +472,7 @@ "neovim-flake": { "inputs": { "flake-utils": "flake-utils_4", - "nixpkgs": [ - "neovim-nightly-overlay", - "nixpkgs" - ] + "nixpkgs": "nixpkgs_5" }, "locked": { "dir": "contrib", @@ -497,7 +494,7 @@ "inputs": { "flake-compat": "flake-compat_5", "neovim-flake": "neovim-flake", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1638692002, @@ -543,7 +540,7 @@ "explain-pause-mode": "explain-pause-mode", "flake-utils": "flake-utils_5", "nix-straight": "nix-straight", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "nose": "nose", "ob-racket": "ob-racket", "org": "org", @@ -634,7 +631,7 @@ }, "nixos-vscode-server": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1621309617, @@ -713,6 +710,22 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1640319671, + "narHash": "sha256-ZkKmakwaOaLiZOpIZWbeJZwap5CzJ30s4UJTfydYIYc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "eac07edbd20ed4908b98790ba299250b5527ecdf", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1638376152, "narHash": "sha256-ucgLpVqhFnClH7YRUHBHnmiOd82RZdFR3XJt36ks5fE=", @@ -728,7 +741,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1626852498, "narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=", @@ -743,7 +756,7 @@ "type": "indirect" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1621073999, "narHash": "sha256-Cp99YreSFedcWovxNmO8g8qFYltQQJPRLfuot6Z7iGE=", @@ -759,7 +772,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1640319671, "narHash": "sha256-ZkKmakwaOaLiZOpIZWbeJZwap5CzJ30s4UJTfydYIYc=", @@ -915,7 +928,7 @@ "nix-doom-emacs": "nix-doom-emacs", "nixos-hardware": "nixos-hardware", "nixos-vscode-server": "nixos-vscode-server", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" } }, "rotate-text": { diff --git a/hosts/darwin.nix b/hosts/darwin.nix index 347c86c..d28e505 100644 --- a/hosts/darwin.nix +++ b/hosts/darwin.nix @@ -12,6 +12,9 @@ tmux pass + mpv + youtube-dl + # We must install Agda globally so that Doom-Emacs' agda config can # recognize it. It doesn't matter that our projects use Nix/direnv. #