From 4a5981d05036fa25782a5ad10868953d5b15ba1c Mon Sep 17 00:00:00 2001 From: pegasust Date: Thu, 12 Jan 2023 12:34:30 -0700 Subject: [PATCH] add sha256 to pinned nixpkgs to support nix config monorepo --- .../home-manager/base/private_chromium.nix | 2 ++ .../home-manager/base/productive_desktop.nix | 1 + nix-conf/home-manager/flake.lock | 26 +++++++++---------- nix-conf/home-manager/flake.nix | 1 + out-of-tree/nixGL/nixpkgs.nix | 1 + 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/nix-conf/home-manager/base/private_chromium.nix b/nix-conf/home-manager/base/private_chromium.nix index c8de51c..5cb7204 100644 --- a/nix-conf/home-manager/base/private_chromium.nix +++ b/nix-conf/home-manager/base/private_chromium.nix @@ -1,3 +1,5 @@ +# TODO: maybe throw if base.graphics is not enabled? +# Though, headless chromium might be possible { config, pkgs, lib, ... }: let cfg = config.base.private_chromium; in diff --git a/nix-conf/home-manager/base/productive_desktop.nix b/nix-conf/home-manager/base/productive_desktop.nix index f319af8..52c18ac 100644 --- a/nix-conf/home-manager/base/productive_desktop.nix +++ b/nix-conf/home-manager/base/productive_desktop.nix @@ -1,3 +1,4 @@ +# A module that takes care of a GUI-ful, productive desktop environment inputs@{pkgs,...}: { imports = [ # slack diff --git a/nix-conf/home-manager/flake.lock b/nix-conf/home-manager/flake.lock index 1692f0f..6534f6e 100644 --- a/nix-conf/home-manager/flake.lock +++ b/nix-conf/home-manager/flake.lock @@ -139,11 +139,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1673401931, - "narHash": "sha256-wt0AcvtyWSyk6HxANH3iO0ztzzAO0jxHkF6tk2nY1jg=", + "lastModified": 1673504032, + "narHash": "sha256-x4nv7g8+bQXg5PfkFw3vCcr3pYI0Hco0VoSbAy60xek=", "owner": "neovim", "repo": "neovim", - "rev": "93d99aefd314bc4abfc54c0c29a4de84b6fcc823", + "rev": "143d3f1f3224bca02bfef7df0932b9d7524a3ff2", "type": "github" }, "original": { @@ -160,11 +160,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1673424920, - "narHash": "sha256-obfKkavXH9CWLTJaJ8bPJ6AZdbE24+cIeBbQjzuSHv0=", + "lastModified": 1673511313, + "narHash": "sha256-QGUT3w1bHclVRqX958EPOd3OxR/R10MoV97N5jx/qbw=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "15813daffca93531243cf00ba57963e8d3df4129", + "rev": "5af6fe31f9906e70a1e8985dbbdcc4ae66c7f82d", "type": "github" }, "original": { @@ -200,8 +200,8 @@ }, "original": { "owner": "nixos", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", - "rev": "fad51abd42ca17a60fc1d4cb9382e2d79ae31836", "type": "github" } }, @@ -222,11 +222,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1673315479, - "narHash": "sha256-GNCFRtDHjTygXGJp/H+f2XQPMGxpYSmNiibIqYzihtM=", + "lastModified": 1673450908, + "narHash": "sha256-b8em+kwrNtnB7gR8SyVf6WuTyQ+6tHS6dzt9D9wgKF0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c07552f6f7d4eead7806645ec03f7f1eb71ba6bd", + "rev": "6c8644fc37b6e141cbfa6c7dc8d98846c4ff0c2e", "type": "github" }, "original": { @@ -270,11 +270,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1673404037, - "narHash": "sha256-9yhRzFiqzVQaJN5jsAIwApDolkORRQ3EJi7D4yu58ig=", + "lastModified": 1673490397, + "narHash": "sha256-VCSmIYJy/ZzTvEGjdfITmTYfybXBgZpMjyjDndbou+8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a979c85ed4691bf996af88504522b32e9611ccfe", + "rev": "0833f4d063a2bb75aa31680f703ba594a384ffe6", "type": "github" }, "original": { diff --git a/nix-conf/home-manager/flake.nix b/nix-conf/home-manager/flake.nix index 3b60024..44185b9 100644 --- a/nix-conf/home-manager/flake.nix +++ b/nix-conf/home-manager/flake.nix @@ -153,6 +153,7 @@ base.alacritty.font.family = "BitstreamVeraSansMono Nerd Font"; base.keepass.path = "/media/homelab/f/PersistentHotStorage/keepass.kdbx"; } + ./base/productive_desktop.nix ]; extraSpecialArgs = mkModuleArgs { diff --git a/out-of-tree/nixGL/nixpkgs.nix b/out-of-tree/nixGL/nixpkgs.nix index dfede53..a4e1b5b 100644 --- a/out-of-tree/nixGL/nixpkgs.nix +++ b/out-of-tree/nixGL/nixpkgs.nix @@ -3,4 +3,5 @@ let in import (fetchTarball { url = "https://github.com/nixos/nixpkgs/archive/${rev}.tar.gz"; + sha256 = "14sm0bjjcmi9qmznwy3nkd2vbhj5xcshgm54a5wiprl9ssvxqw53"; })