From d80fd6c243b07045189235d97e4d03863f2dc914 Mon Sep 17 00:00:00 2001
From: iofq <cjriddz@protonmail.com>
Date: Wed, 4 Sep 2024 23:32:01 -0500
Subject: [PATCH] swap

---
 flake.nix                                     | 29 ++++++++++++++-----
 home-manager/shared/programs/2fa/default.nix  |  5 +---
 home-manager/shared/programs/nvim/default.nix |  2 +-
 .../shared/programs/shell/default.nix         |  2 +-
 nixos/t14/hardware-configuration.nix          |  7 ++++-
 5 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/flake.nix b/flake.nix
index 825ae95..3e5fd5d 100755
--- a/flake.nix
+++ b/flake.nix
@@ -1,15 +1,25 @@
 {
   description = "Home Manager && NixOS configuration";
   inputs = {
-    nix-index-database.url = "github:nix-community/nix-index-database";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
-    pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
-    sops-nix.url = "github:Mic92/sops-nix";
-    tfa.url = "github:iofq/2fa";
-    treefmt-nix.url = "github:numtide/treefmt-nix";
-
+    pre-commit-hooks = {
+      url = "github:cachix/pre-commit-hooks.nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    sops-nix = {
+      url = "github:Mic92/sops-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    nix-index-database = {
+      url = "github:nix-community/nix-index-database";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    treefmt-nix = {
+      url = "github:numtide/treefmt-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     home-manager = {
       url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -37,9 +47,12 @@
           steam = pkgs.writeShellScriptBin "steam" ''
             flatpak run com.valvesoftware.Steam -pipewire "$@"
           '';
-          inherit (inputs.tfa.packages.${final.system}) twofa;
+          unstable = import inputs.nixpkgs-unstable {
+            inherit (final) system;
+            config.allowUnfree = true;
+            overlays = [inputs.nvim.overlays.default];
+          };
         })
-        inputs.nvim.overlays.default
       ];
     };
     eachSystem = f: nixpkgs.lib.genAttrs (import systems) (system: f nixpkgs.legacyPackages.${system});
diff --git a/home-manager/shared/programs/2fa/default.nix b/home-manager/shared/programs/2fa/default.nix
index c804a0b..61bc3a4 100755
--- a/home-manager/shared/programs/2fa/default.nix
+++ b/home-manager/shared/programs/2fa/default.nix
@@ -1,7 +1,4 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    twofa
-  ];
+_: {
   programs.gpg = {
     enable = true;
     settings = {
diff --git a/home-manager/shared/programs/nvim/default.nix b/home-manager/shared/programs/nvim/default.nix
index b46f651..6f9335c 100755
--- a/home-manager/shared/programs/nvim/default.nix
+++ b/home-manager/shared/programs/nvim/default.nix
@@ -1,5 +1,5 @@
 {pkgs, ...}: {
-  home.packages = with pkgs; [
+  home.packages = with pkgs.unstable; [
     nvim-pkg
   ];
 }
diff --git a/home-manager/shared/programs/shell/default.nix b/home-manager/shared/programs/shell/default.nix
index 4d366a5..8e38b61 100755
--- a/home-manager/shared/programs/shell/default.nix
+++ b/home-manager/shared/programs/shell/default.nix
@@ -22,7 +22,7 @@
       "exit"
     ];
     shellAliases = {
-      la = "eza -lahrt";
+      la = "eza -lahr";
       ll = "la";
       ":q" = "exit";
       mpv = "mpv --no-keepaspect-window";
diff --git a/nixos/t14/hardware-configuration.nix b/nixos/t14/hardware-configuration.nix
index 2d98182..d523d68 100755
--- a/nixos/t14/hardware-configuration.nix
+++ b/nixos/t14/hardware-configuration.nix
@@ -26,7 +26,12 @@
     fsType = "vfat";
   };
 
-  swapDevices = [];
+  swapDevices = [
+    {
+      device = "/swapfile";
+      size = 8 * 1024;
+    }
+  ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's