From a9b1a299cdc643ff24c91da1b38bb723f2ddd4dc Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 2 Dec 2024 16:05:05 -0600 Subject: [PATCH] Beef up --- flake.lock | 153 +-------------------------------------------- flake.nix | 18 +++--- nixos/beefcake.nix | 2 +- 3 files changed, 12 insertions(+), 161 deletions(-) diff --git a/flake.lock b/flake.lock index 2d95732..b1365de 100644 --- a/flake.lock +++ b/flake.lock @@ -135,41 +135,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "freetype2": { - "flake": false, - "locked": { - "lastModified": 1687587065, - "narHash": "sha256-+Fh+/k+NWL5Ow9sDLtp8Cv/8rLNA1oByQQCIQS/bysY=", - "owner": "wez", - "repo": "freetype2", - "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d", - "type": "github" - }, - "original": { - "owner": "wez", - "repo": "freetype2", - "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d", - "type": "github" - } - }, "git-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -297,23 +262,6 @@ "type": "github" } }, - "harfbuzz": { - "flake": false, - "locked": { - "lastModified": 1711722720, - "narHash": "sha256-GdxcAPx5QyniSHPAN1ih28AD9JLUPR0ItqW9JEsl3pU=", - "owner": "harfbuzz", - "repo": "harfbuzz", - "rev": "63973005bc07aba599b47fdd4cf788647b601ccd", - "type": "github" - }, - "original": { - "owner": "harfbuzz", - "ref": "8.4.0", - "repo": "harfbuzz", - "type": "github" - } - }, "helix": { "inputs": { "crane": "crane", @@ -559,23 +507,6 @@ "type": "github" } }, - "libpng": { - "flake": false, - "locked": { - "lastModified": 1549245649, - "narHash": "sha256-1+cRp0Ungme/OGfc9kGJbklYIWAFxk8Il1M+NV4KSgw=", - "owner": "glennrp", - "repo": "libpng", - "rev": "8439534daa1d3a5705ba92e653eda9251246dd61", - "type": "github" - }, - "original": { - "owner": "glennrp", - "repo": "libpng", - "rev": "8439534daa1d3a5705ba92e653eda9251246dd61", - "type": "github" - } - }, "mobile-nixos": { "flake": false, "locked": { @@ -764,8 +695,7 @@ "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "slippi": "slippi", - "sops-nix": "sops-nix", - "wezterm": "wezterm" + "sops-nix": "sops-nix" } }, "rust-overlay": { @@ -789,27 +719,6 @@ "type": "github" } }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "wezterm", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729477859, - "narHash": "sha256-r0VyeJxy4O4CgTB/PNtfQft9fPfN1VuGvnZiCxDArvg=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "ada8266712449c4c0e6ee6fcbc442b3c217c79e1", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "slippi": { "inputs": { "git-hooks": "git-hooks_2", @@ -884,49 +793,6 @@ "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" - } - }, - "wezterm": { - "inputs": { - "flake-utils": "flake-utils_2", - "freetype2": "freetype2", - "harfbuzz": "harfbuzz", - "libpng": "libpng", - "nixpkgs": [ - "nixpkgs-unstable" - ], - "rust-overlay": "rust-overlay_2", - "zlib": "zlib" - }, - "locked": { - "dir": "nix", - "lastModified": 1732918908, - "narHash": "sha256-k43oaC+35/LGqJ+3MjIhn4Ko+ap3wTvHCJ4sj9W/o+k=", - "owner": "wez", - "repo": "wezterm", - "rev": "4906789a6d61da58f73b95f89b59c41af60e0f3b", - "type": "github" - }, - "original": { - "dir": "nix", - "owner": "wez", - "repo": "wezterm", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -967,23 +833,6 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } - }, - "zlib": { - "flake": false, - "locked": { - "lastModified": 1484501380, - "narHash": "sha256-j5b6aki1ztrzfCqu8y729sPar8GpyQWIrajdzpJC+ww=", - "owner": "madler", - "repo": "zlib", - "rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f", - "type": "github" - }, - "original": { - "owner": "madler", - "ref": "v1.2.11", - "repo": "zlib", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index e3b6a41..203ec7b 100644 --- a/flake.nix +++ b/flake.nix @@ -23,8 +23,8 @@ hardware.url = "github:nixos/nixos-hardware"; hyprland.url = "github:hyprwm/Hyprland"; - wezterm.url = "github:wez/wezterm?dir=nix"; - wezterm.inputs.nixpkgs.follows = "nixpkgs-unstable"; + # wezterm.url = "github:wez/wezterm?dir=nix"; + # wezterm.inputs.nixpkgs.follows = "nixpkgs-unstable"; slippi.url = "github:lytedev/slippi-nix"; # slippi.url = "git+file:///home/daniel/code/open-source/slippi-nix"; @@ -69,7 +69,7 @@ disko, sops-nix, git-hooks, - wezterm, + # wezterm, home-manager, home-manager-unstable, helix, @@ -230,9 +230,11 @@ }; }; - modifications = final: prev: let - wezterm-input = wezterm; - in rec { + modifications = final: prev: + # let + # wezterm-input = wezterm; + # in + rec { helix = helix.outputs.packages.${prev.system}.helix; final.helix = helix; /* @@ -241,9 +243,9 @@ not-yet-merged (abandoned?): https://github.com/wez/wezterm/pull/4737 I did try using the latest code via the flake, but alas it did not resolve my issues with mux'ing */ - wezterm = wezterm-input.outputs.packages.${prev.system}.default; + # wezterm = wezterm-input.outputs.packages.${prev.system}.default; # wezterm = (import nixpkgs {inherit (prev) system;}).wezterm; - final.wezterm = wezterm; + # final.wezterm = wezterm; # zellij = prev.zellij.overrideAttrs rec { # version = "0.41.0"; diff --git a/nixos/beefcake.nix b/nixos/beefcake.nix index c745a40..d5c5ca2 100644 --- a/nixos/beefcake.nix +++ b/nixos/beefcake.nix @@ -1769,7 +1769,7 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00 services.paperless = { enable = true; - package = pkgs.paperless-ngx; + # package = pkgs.paperless-ngx; dataDir = "/storage/paperless"; passwordFile = config.sops.secrets.paperless-superuser-password.path; };