From 9e7a775e2578e126dddb1c6f7514874265e3d08e Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Sun, 28 Apr 2024 21:30:47 +0200
Subject: yeet the nix flakes

this is, in the widest possible sense, a revert of
e88fed18f499a3e8ac98c772bbb62f00d1f8d1d7, which was now a little over
two years ago.

Of course, lots of things have changed since then:
 - this uses npins instead of niv, which is both simpler and still
   maintained
 - i haven't brought back the old deploy lib; I still use
   deploy-rs (with some modifications) to deploy things
 - if you actually use my stuff downstream, you can now use packages/ &
   tests/ & modules/ as entry points directly, while still having some
   control over inputs
 - (since i also don't believe any downstream users actually exist, i've
   not bothered to have a shim flake.nix so your stuff probably just
   broke. well, it was an experimental feature, anyways)
 - in general there's a lot more of the old-fashioned structure back
   again, with default.nix files in subdirectories that form a
   structure, not like how almost everything was just imported in the
   one big flake.nix file

For people who are interested in also having a non-flake config similar
to this one, it's probably best to take a look at inputs.nix (and also
at npins, of course)
---
 home/home.nix             |  4 ++--
 home/packages-minimal.nix |  2 +-
 home/packages.nix         |  2 +-
 home/unstable.nix         | 10 +++-------
 4 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'home')

diff --git a/home/home.nix b/home/home.nix
index 1e49983..d00c1db 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -215,7 +215,7 @@
   };
 
   systemd.user.services.syncical = let
-    feeds = (import inputs.feeds).ical; in {
+    feeds = inputs.feeds.ical; in {
       Unit.Description = "syncs ical feeds for almanac agenda";
       Service = {
         ExecStart = (pkgs.writeShellScript "syncical" ''
@@ -239,7 +239,7 @@
 
   programs.newsboat = {
     enable = true;
-    urls = (import ./newsboat-public.nix) ++ (import inputs.feeds).rss;
+    urls = (import ./newsboat-public.nix) ++ inputs.feeds.rss;
     browser = lib.getExe' pkgs.offpunk "offpunk";
     reloadThreads = 300;
     queries = {
diff --git a/home/packages-minimal.nix b/home/packages-minimal.nix
index c024654..3b5ede1 100644
--- a/home/packages-minimal.nix
+++ b/home/packages-minimal.nix
@@ -28,6 +28,6 @@
     jq html-tidy nodePackages.stylelint nodePackages.js-beautify zola
     lowdown
     # nix things
-    nixfmt niv inputs.deploy-rs.defaultPackage.${system}
+    nixfmt niv deploy-rs.deploy-rs
   ];
 }
diff --git a/home/packages.nix b/home/packages.nix
index 1f5e8cf..165cc59 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -70,7 +70,7 @@ in
     # others
     julia python39 inweb
     # nix things
-    nixfmt niv inputs.deploy-rs.defaultPackage.${system}
+    nixfmt niv
     #haskellPackages.nix-serve-ng
     nix-doc nix-output-monitor
     direnv
diff --git a/home/unstable.nix b/home/unstable.nix
index 0adb0ba..9592af7 100644
--- a/home/unstable.nix
+++ b/home/unstable.nix
@@ -1,6 +1,6 @@
-{config, pkgs, inputs, system, ...}:
+{config, pkgs, inputs, ...}:
 
-with inputs.nixpkgs-unstable.legacyPackages.${system};
+with inputs.nixpkgs-unstable;
 {
   home.packages = [
     dino
@@ -15,11 +15,7 @@ with inputs.nixpkgs-unstable.legacyPackages.${system};
     })
     gleam
     yazi
-
-    # hikari development
-    pkgs.pandoc # pkgs.xorg.xcbutilwm.dev
-    pkgs.bmake pkgs.pkg-config
-  ]; #++ hikari.buildInputs;
+  ];
 
   xdg.desktopEntries."Signal" = {
       name = "Signal";
-- 
cgit v1.2.3