From acb556f98f858e4123eecdf9e08c07eeb3cae149 Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Josh)" Date: Mon, 13 May 2024 00:15:14 -0500 Subject: [PATCH] bunch of random stuff --- flake.lock | 64 +++++++++++++++++++++-- hosts/_common/configuration.nix | 36 ++++++++----- users/_common/components/black.png | Bin 0 -> 70 bytes users/josh/configuration.nix | 18 +++++-- users/josh/home_manager/_components.nix | 12 ----- users/luser/configuration.nix | 19 +++++-- users/luser/home_manager/_components.nix | 12 ----- 7 files changed, 112 insertions(+), 49 deletions(-) create mode 100644 users/_common/components/black.png delete mode 100644 users/josh/home_manager/_components.nix delete mode 100644 users/luser/home_manager/_components.nix diff --git a/flake.lock b/flake.lock index a8edebd..ccce632 100644 --- a/flake.lock +++ b/flake.lock @@ -86,6 +86,24 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -210,14 +228,15 @@ "nixpkgs": [ "nixpkgs" ], - "nvim_plugin-chrisgrieser/nvim-early-retirement": "nvim_plugin-chrisgrieser/nvim-early-retirement" + "nvim_plugin-chrisgrieser/nvim-early-retirement": "nvim_plugin-chrisgrieser/nvim-early-retirement", + "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1715363339, - "narHash": "sha256-xnj/A1soOLbZ2ilb2+6yvTnNFWBNl3UuVff0fFyMXww=", + "lastModified": 1715576186, + "narHash": "sha256-taN5/bY6xDXA7+z0GJE0q24Lt/2zEJIetKfvrkpgHAo=", "owner": "RingOfStorms", "repo": "nvim", - "rev": "d92d753a6101733748c59f26fc7b1517678e4e59", + "rev": "20633579746615fa55c6c6b8dfdf45899095aca0", "type": "github" }, "original": { @@ -261,6 +280,28 @@ "type": "github" } }, + "rust-overlay_2": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "ringofstorms-nvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1715566659, + "narHash": "sha256-OpI0TnN+uE0vvxjPStlTzf5RTohIXVSMwrP9NEgMtaY=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "6c465248316cd31502c82f81f1a3acf2d621b01c", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -290,6 +331,21 @@ "repo": "default", "type": "github" } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/hosts/_common/configuration.nix b/hosts/_common/configuration.nix index 91f0380..d78056e 100644 --- a/hosts/_common/configuration.nix +++ b/hosts/_common/configuration.nix @@ -1,20 +1,29 @@ -{ config, lib, pkgs, settings, ylib, ... } @ inputs: +{ + config, + lib, + pkgs, + settings, + ylib, + ... +}@inputs: let defaultLocal = "en_US.UTF-8"; in { - imports = - [ - # Secrets management - ./ragenix.nix - # Include the results of the hardware scan. - (/${settings.hostsDir}/${settings.system.hostname}/hardware-configuration.nix) - # Include the specific machine's config. - (/${settings.hostsDir}/${settings.system.hostname}/configuration.nix) - ]; + imports = [ + # Secrets management + ./ragenix.nix + # Include the results of the hardware scan. + (/${settings.hostsDir}/${settings.system.hostname}/hardware-configuration.nix) + # Include the specific machine's config. + (/${settings.hostsDir}/${settings.system.hostname}/configuration.nix) + ]; # Enable flakes - nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nix.settings.experimental-features = [ + "nix-command" + "flakes" + ]; # ========== # Common @@ -54,7 +63,7 @@ in vim wget curl - neofetch + fastfetch bat htop unzip @@ -97,6 +106,9 @@ in rg = "rg --no-ignore"; rgf = "rg --files 2>/dev/null | rg"; + # Neofetch is dead + neo = "fastfetch"; + # Nix deprecations nix-hash = "echo 'The functionality of nix-hash may be covered by various subcommands or options in the new `nix` command.'"; nix-build = "echo 'Use `nix build` instead.'"; diff --git a/users/_common/components/black.png b/users/_common/components/black.png new file mode 100644 index 0000000000000000000000000000000000000000..b87512fc26fcb2c60adbceaa00c47b12f8bcbc18 GIT binary patch literal 70 zcmeAS@N?(olHy`uVBq!ia0y~yU|