From 4fb6633d51079edbd4615b508e3d5504725a4cd4 Mon Sep 17 00:00:00 2001 From: Alex Stan <90788596+Ultra980@users.noreply.github.com> Date: Wed, 21 Jun 2023 14:14:11 +0300 Subject: [PATCH] viper is a chad Signed-off-by: Alex Stan --- flake.lock | 98 +++++++++++++++++++++++++++++++-- flake.nix | 2 + hosts/ultrapc/configuration.nix | 21 ++++++- users/ultra/home.nix | 2 + 4 files changed, 115 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 14e1e3e..836b7a7 100644 --- a/flake.lock +++ b/flake.lock @@ -317,6 +317,24 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1685546676, + "narHash": "sha256-XDbjJyAg6odX5Vj0Q22iI/gQuFvEkv9kamsSbQ+npaI=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "6ef2707776c6379bc727faf3f83c0dd60b06e0c6", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -474,6 +492,26 @@ "type": "github" } }, + "nix-but-gigachad": { + "inputs": { + "flake-parts": "flake-parts", + "nix-filter": "nix-filter", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1686727403, + "narHash": "sha256-AuyqUu72ehb99BPlJk3qeuIzZcQY7p24kgWMfqhcFmY=", + "owner": "viperML", + "repo": "nh", + "rev": "941d4de5450276a08cadc7528dedc297947629b2", + "type": "github" + }, + "original": { + "owner": "viperML", + "repo": "nh", + "type": "github" + } + }, "nix-doom-emacs": { "inputs": { "doom-emacs": "doom-emacs", @@ -490,7 +528,7 @@ "flake-utils": "flake-utils_2", "format-all": "format-all", "nix-straight": "nix-straight", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nose": "nose", "ob-racket": "ob-racket", "org": "org", @@ -517,9 +555,24 @@ "type": "github" } }, + "nix-filter": { + "locked": { + "lastModified": 1681154353, + "narHash": "sha256-MCJ5FHOlbfQRFwN0brqPbCunLEVw05D/3sRVoNVt2tI=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "f529f42792ade8e32c4be274af6b6d60857fbee7", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, "nix-software-center": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "utils": "utils" }, "locked": { @@ -601,6 +654,24 @@ "type": "github" } }, + "nixpkgs-lib_2": { + "locked": { + "dir": "lib", + "lastModified": 1682879489, + "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-master": { "locked": { "lastModified": 1687156045, @@ -649,6 +720,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1685383865, + "narHash": "sha256-3uQytfnotO6QJv3r04ajSXbEFMII0dUtw0uqYlZ4dbk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5e871d8aa6f57cc8e0dc087d1c5013f6e212b4ce", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1682566018, "narHash": "sha256-HPzPRFiy2o/7k7mtnwfM1E6NVZHiFbPdmYCMoIpkHO4=", @@ -663,7 +750,7 @@ "type": "indirect" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1680213900, "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", @@ -679,7 +766,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1686960236, "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=", @@ -852,10 +939,11 @@ "helix": "helix", "home-manager": "home-manager", "hypr-contrib": "hypr-contrib", + "nix-but-gigachad": "nix-but-gigachad", "nix-doom-emacs": "nix-doom-emacs", "nix-software-center": "nix-software-center", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nixpkgs-master": "nixpkgs-master" } }, diff --git a/flake.nix b/flake.nix index b29b444..1714823 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,8 @@ nixpkgs-master.url = "github:NixOS/nixpkgs/master"; hypr-contrib.url = "github:hyprwm/contrib"; # hyprland.url = "github:hyprwm/Hyprland"; + + nix-but-gigachad.url = "github:viperML/nh"; }; outputs = { self, nixpkgs, home-manager, ... }@inputs: { diff --git a/hosts/ultrapc/configuration.nix b/hosts/ultrapc/configuration.nix index 425cc45..2d0a793 100644 --- a/hosts/ultrapc/configuration.nix +++ b/hosts/ultrapc/configuration.nix @@ -6,17 +6,29 @@ let nix-software-center = inputs.nix-software-center.packages.${pkgs.system}.nix-software-center; doom-emacs = inputs.nix-doom-emacs.packages.${pkgs.system}.default; + nh = inputs.nix-but-gigachad.packages.${pkgs.system}.default; in { imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix ./cachix.nix + inputs.nix-but-gigachad.nixosModules.default ]; + nh = { + enable = true; + clean.enable = true; + }; nix.settings = { trusted-users = [ "root" "ultra" ]; experimental-features = [ "nix-command" "flakes" ]; - substituters = [ "https://hyprland.cachix.org" ]; - trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; + substituters = [ + "https://hyprland.cachix.org" + "https://viperml.cachix.org" + ]; + trusted-public-keys = [ + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "viperml.cachix.org-1:qZhKBMTfmcLL+OG6fj/hzsMEedgKvZVFRRAhq7j8Vh8=" + ]; }; boot = { @@ -136,6 +148,7 @@ in { clang-tools nil pkgconfig + nh ]; variables = { NIX_AUTO_RUN = "!"; @@ -223,10 +236,12 @@ in { # Enable KDE Plasma 5 displayManager = { + /* autoLogin = { enable = false; - # user = "ultra"; + user = "ultra"; }; + */ sddm = { enable = true; diff --git a/users/ultra/home.nix b/users/ultra/home.nix index 5975b82..1bcc3f3 100644 --- a/users/ultra/home.nix +++ b/users/ultra/home.nix @@ -12,6 +12,7 @@ let inherit (pkgs) system; }; hypr-contrib = inputs.hypr-contrib.packages.${pkgs.system}; + nh = inputs.nix-but-gigachad.packages.${pkgs.system}.default; in { imports = [ inputs.nix-doom-emacs.hmModule @@ -119,6 +120,7 @@ in { libsForQt5.alligator thunderbird brave + nh ]; };