From 3477528dd592653b92e81bdec1a6780ccf49fe23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?= Date: Fri, 5 Jan 2024 18:41:10 +0100 Subject: [PATCH] Add sha256 to go closer to purity --- hm/desktop.nix | 14 +++++++------- hm/style.nix | 5 ++++- hm/vim.nix | 9 +++++---- os/default.nix | 6 +++++- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/hm/desktop.nix b/hm/desktop.nix index 5a0672d..41c4391 100644 --- a/hm/desktop.nix +++ b/hm/desktop.nix @@ -1,11 +1,10 @@ { pkgs, config, lib, ... }: let - nixgl = import - (builtins.fetchGit { - url = "https://github.com/nix-community/nixGL"; - rev = "489d6b095ab9d289fe11af0219a9ff00fe87c7c5"; - }) - { }; + nixglsrc = builtins.fetchTarball { + url = "https://github.com/nix-community/nixGL/archive/489d6b095ab9d289fe11af0219a9ff00fe87c7c5.tar.gz"; + sha256 = "16b9jh46a02m79swsk5i5xw44738zy1i31al77mm1k8y4nxc8d9b"; + }; + nixgl = import (nixglsrc) { }; nixGLIntelPrefix = "${nixgl.nixVulkanIntel}/bin/nixVulkanIntel ${nixgl.nixGLIntel}/bin/nixGLIntel "; wmPrefix = "${lib.optionalString config.frogeye.desktop.nixGLIntel nixGLIntelPrefix}"; in @@ -651,7 +650,8 @@ in home = { file = { - ".face" = { # TODO Only works on pindakaas? See https://wiki.archlinux.org/title/LightDM#Changing_your_avatar + ".face" = { + # TODO Only works on pindakaas? See https://wiki.archlinux.org/title/LightDM#Changing_your_avatar source = pkgs.runCommand "face.png" { } "${pkgs.inkscape}/bin/inkscape ${./face.svg} -w 1024 -o $out"; }; }; diff --git a/hm/style.nix b/hm/style.nix index e73c6d1..c21ab8a 100644 --- a/hm/style.nix +++ b/hm/style.nix @@ -1,7 +1,10 @@ { pkgs, config, lib, ... }: let # Currently last commit in https://github.com/danth/stylix/pull/194 - stylix = builtins.fetchTarball "https://github.com/willemml/stylix/archive/2ed2b0086b41d582aca26e083c19c0e47c8991e3.tar.gz"; + stylix = builtins.fetchTarball { + url = "https://github.com/willemml/stylix/archive/2ed2b0086b41d582aca26e083c19c0e47c8991e3.tar.gz"; + sha256 = "1mwhpbfmw4n1lmy22s0dhbklzd8b0r7mn0mg7vbz44ac35m7kzf2"; + }; polarityFile = "${config.xdg.stateHome}/theme_polarity"; polarityFromFile = if builtins.pathExists polarityFile then lib.strings.fileContents polarityFile else "light"; polarity = if config.frogeye.polarity == "dynamic" then polarityFromFile else config.frogeye.polarity; diff --git a/hm/vim.nix b/hm/vim.nix index a34cf0c..eea12ec 100644 --- a/hm/vim.nix +++ b/hm/vim.nix @@ -1,9 +1,10 @@ { pkgs, lib, config, ... }: let - nixvim = import (builtins.fetchGit { - url = "https://github.com/nix-community/nixvim"; - rev = "c96d7b46d05a78e695ed1c725d1596b65509b4f9"; # 24.05 Anythin after this commit works - }); + nixvim = builtins.fetchTarball { + url = "https://github.com/nix-community/nixvim/archive/c96d7b46d05a78e695ed1c725d1596b65509b4f9.tar.gz"; + # 24.05 Anythin after this commit works + sha256 = "0brzl3k11qjy81wvs1i8ngbk4kkxild9ps3ammnbr912ldvq9nac"; + }; vim-shot-f = pkgs.vimUtils.buildVimPlugin { pname = "vim-shot-f"; version = "2016-02-05"; diff --git a/os/default.nix b/os/default.nix index 6fb335a..596cd3d 100644 --- a/os/default.nix +++ b/os/default.nix @@ -9,6 +9,10 @@ ./gaming ./geoffrey.nix ./wireless.nix - "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/3cb78c93e6a02f494aaf6aeb37481c27a2e2ee22.tar.gz"}/module.nix" + "${builtins.fetchTarball { + url = "https://github.com/nix-community/disko/archive/3cb78c93e6a02f494aaf6aeb37481c27a2e2ee22.tar.gz"; + sha256 = "0slkd86c7viv8ping6wizhab6iwxz0bn9fxvzrscz0r745d8iaca"; + } + }/module.nix" ]; }