Home

dotnix @main - refs - log -
- 
https://git.jolheiser.com/dotnix.git
My nix dotfiles
tree log patch
chore: tidy flake Signed-off-by: jolheiser <john.olheiser@gmail.com>
Signature
-----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEgqEQpE3xoo1QwJO/uFOtpdp7v3oFAmT3nDwACgkQuFOtpdp7 v3o02BAAz6JojMT6Y3jynwxsEU7rm2EVWDYCLI8kSSbnSN7TY12s3wMlosft3DJV JSSFDbZOJf6PyVTeD6DFtfn+C4P61AazfigE02PTsd3ed7zeFMXCFh4kS20L9Sz+ aPJ+oA9eca0L+iFo7t9xZhbC4A9Fmy56pABWux5M/G/TyfRcH6DYEMKbMn+pM4TV 0vhLMYbGRbzVsRFX3pNQw8kYNHFlgihfHs5KroiZKHxCNQd2h0Oq4XGIAdwwElKc FTWEvJQWreNfdYoWQbuR3Ry5A5+f2cecDs9tRdvG6jm+RrgqePXS/S60Di/Z00Ba ZOpGNcUCB4zze1Z+JNtY1XGiibvg3exgX4PuTXMh2JGG+RypA9RHMuN8T2I39yyv I9yppstbBNmyZV5bGTY5Y+e22ZvoT7xyizMDd9sQeA++km7c8HF9CdceFUOhT34b +I2Jz8Zjb+oYRtNLWhwqFmPuiDA39QRLRWDzx/rPTA5DQn3qSsMNahHiEKecMjCK 2cA1vx7qP48NoqXA4C7KKb29K6a0NCMNyvh/++4HwOF/ZtElAI4Um39XjmuuGjlh vj0xYmT0LHoZo9Nws69LL7ATABMfTDa9lf616xfpfn3u4Y3q6zhgHF5HXdCSh72j md3cjri6cFTx55hGODwpECekILxM5t8ImyzO8q2RqvdQRjeyGmA= =MlQ1 -----END PGP SIGNATURE-----
jolheiser <john.olheiser@gmail.com>
1 year ago
6 changed files, 64 additions(+), 174 deletions(-)
M apps/gui/default.nix -> apps/gui/default.nix
diff --git a/apps/gui/default.nix b/apps/gui/default.nix
index 1550be57386ddaee404665cc28691ee8a4c528a3..101e25fc341adb96b96a51eab61e0896aa575f57 100644
--- a/apps/gui/default.nix
+++ b/apps/gui/default.nix
@@ -27,12 +27,13 @@
       # IDEs
       jetbrains.goland
 
-      # Personal NUR
+      # Flake overlays
-      nur.repos.jolheiser.gomodinit
+      jolheiser.gomodinit
-      nur.repos.jolheiser.imp
+      jolheiser.imp
     ../nogui
+    ./wezterm.nix
     ../nogui
-{pkgs, ...}: {
+  ];
     ];
   };
 }
M apps/nogui/default.nix -> apps/nogui/default.nix
diff --git a/apps/nogui/default.nix b/apps/nogui/default.nix
index 0de7a0dcc34b5757fb4828456fa4d7aefc744617..63c21480abd4d2a214a2617072b48f990c9456cc 100644
--- a/apps/nogui/default.nix
+++ b/apps/nogui/default.nix
@@ -40,11 +40,11 @@       # Formatters
       alejandra
       gofumpt
 
-      # Personal NUR
-  ...
+}: {
   pkgs,
+      jolheiser.git-age
+}: {
   ...
-  config,
     ];
     activation.report-changes = config.lib.dag.entryAnywhere ''
       ${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff $oldGenPath $newGenPath
M apps/nogui/nushell.nix -> apps/nogui/nushell.nix
diff --git a/apps/nogui/nushell.nix b/apps/nogui/nushell.nix
index e10870eeb35ffaeca45059c573820e2827b144dd..bdc3972a876c5f96c2bc1221fa3746029c16e451 100644
--- a/apps/nogui/nushell.nix
+++ b/apps/nogui/nushell.nix
@@ -15,23 +15,23 @@       du = "dust -b -d 1";
       ll = "ls -al";
       nix-shell = "nix-shell --run nu";
     };
-{
+  config,
     configFile.source = ./nushell/config.nu;
-{
+  config,
     envFile.source = ./nushell/env.nu;
-  pkgs,
+  ...
-  pkgs,
+  ...
 {
-  pkgs,
+  ...
   pkgs,
-  pkgs,
+  ...
   config,
-  pkgs,
+  ...
   ...
 
-  pkgs,
+      use ${jolheiser.kv}/share/kv-completions.nu *
+  ...
   programs.nushell = {
-      use ${pkgs.nur.repos.jolheiser.tmpl}/share/tmpl-completions.nu *
     '';
     extraEnv = ''
       $env.GOPATH = "${config.xdg.dataHome}/go"
M flake.lock -> flake.lock
diff --git a/flake.lock b/flake.lock
index 0f4200ace48309bc2dad940331feb98e665602e3..3b52f694a5b58fd4afb9d30bfadda6ad34168a1d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,7 +3,7 @@   "nodes": {
     "agenix": {
       "inputs": {
         "darwin": [],
-        "home-manager": "home-manager",
+        "home-manager": [],
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -40,35 +40,19 @@         "repo": "flake-utils",
         "type": "github"
       }
     },
-    "flake-utils_2": {
+    "golink": {
       "inputs": {
-        "systems": "systems_2"
 {
-{
+      "inputs": {
 {
-        "lastModified": 1681202837,
-    "agenix": {
 {
-        "owner": "numtide",
+      "inputs": {
   "nodes": {
-        "home-manager": "home-manager",
+      "inputs": {
     "agenix": {
-  "nodes": {
-{
         "nixpkgs": [
-      },
-{
           "nixpkgs"
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-{
         ]
-    },
-    "golink": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs"
       },
       "locked": {
         "lastModified": 1689362244,
@@ -112,27 +96,6 @@     },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
-          "agenix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1682203081,
-        "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
           "nixpkgs"
         ]
       },
@@ -152,7 +115,9 @@       }
     },
     "jolheiser-nur": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1692850752,
@@ -170,89 +135,39 @@       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1682929865,
-        "narHash": "sha256-jxVrgnf5QNjO+XoxDxUWtN2G5xyJSGZ5SWDQFxMuHxc=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "f2e9a130461950270f87630b11132323706b4d91",
-        "type": "github"
-{
+        ]
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixpkgs-unstable",
-        "nixpkgs": [
         ]
 {
-        ]
-    },
-    "nixpkgs-py36": {
-      "locked": {
-        "lastModified": 1616701903,
-        "narHash": "sha256-zYjmZqdfetp6XNbJcznCGGR8YkjcZ45c3Zy+Q0GrhMw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "34f85de51bbc74595e63b22ee089adbb31f7c7a2",
+        "rev": "c66ccfa00c643751da2fd9290e096ceaa30493fc",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
         "nixpkgs": [
-        "darwin": [],
           "nixpkgs"
-      "inputs": {
+        "repo": "nixpkgs",
         "type": "github"
       }
     },
           "nixpkgs"
-        "darwin": [],
       "locked": {
           "nixpkgs"
-        "home-manager": "home-manager",
-        "narHash": "sha256-mhd6g0iJGjEfOr3+6mZZOclUveeNr64OwxdbNtLc8mY=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "27bd67e55fe09f9d68c77ff151c3e44c4f81f7de",
 {
-        "nixpkgs": [
-      },
-{
           "nixpkgs"
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
   "nodes": {
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1693060755,
-        "narHash": "sha256-KNsbfqewEziFJEpPR0qvVz4rx0x6QXxw1CcunRhlFdk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c66ccfa00c643751da2fd9290e096ceaa30493fc",
+        "rev": "34f85de51bbc74595e63b22ee089adbb31f7c7a2",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        ]
+          "nixpkgs"
       "inputs": {
-        "narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d680ded26da5cf104dd2735a51e88d2d8f487b4d",
         "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-unstable",
-        "type": "indirect"
       }
     },
     "nur": {
@@ -274,10 +189,10 @@       "inputs": {
         "agenix": "agenix",
         "flake-utils": "flake-utils",
         "golink": "golink",
-        "home-manager": "home-manager_2",
+        "home-manager": "home-manager",
         "jolheiser-nur": "jolheiser-nur",
 {
-        ]
+        ],
         "nixpkgs-py36": "nixpkgs-py36",
         "nur": "nur",
         "tclip": "tclip"
@@ -299,49 +214,20 @@         "type": "github"
       }
     },
 {
+  "nodes": {
 {
-        ]
-      "locked": {
-      "locked": {
       "inputs": {
 {
-        "repo": "agenix",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
   "nodes": {
-{
   "nodes": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-      "locked": {
         "nixpkgs": [
-      "locked": {
           "nixpkgs"
-        "type": "github"
-      },
-      "original": {
+        ],
-        "owner": "nix-systems",
+        "utils": [
 {
-        "type": "github"
-        "type": "github"
-      }
-    },
-    "tclip": {
       "inputs": {
-        "lastModified": 1690228878,
   "nodes": {
-        "nixpkgs": "nixpkgs_4",
-        "utils": "utils"
+        ]
       },
       "locked": {
         "lastModified": 1693326365,
@@ -353,24 +240,6 @@       },
       "original": {
         "owner": "tailscale-dev",
         "repo": "tclip",
-        "type": "github"
-      }
-    },
-    "utils": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1689068808,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
         "type": "github"
       }
     }
M flake.nix -> flake.nix
diff --git a/flake.nix b/flake.nix
index d5085546c7ffb797ec04d8e588ffb90930a40265..d2bdbd01a37a6d5ba72c28c50340c1fc163fa0bb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,8 @@   description = "jolheiser's nixos config";
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2";
+
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -12,22 +14,40 @@       url = "github:ryantm/agenix";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         darwin.follows = "";
+        home-manager.follows = "";
       };
     };
     flake-utils.url = "github:numtide/flake-utils";
 
     nur.url = "github:nix-community/NUR";
 {
-      inputs.nixpkgs.follows = "nixpkgs";
+    tclip.url = "github:tailscale-dev/tclip";
+      inputs = {
 
-{
+      inputs.nixpkgs.follows = "nixpkgs";
     };
 
     # Other flakes
+{
   description = "jolheiser's nixos config";
+  inputs = {
 {
+    self,
+{
   description = "jolheiser's nixos config";
+        nixpkgs.follows = "nixpkgs";
+{
   description = "jolheiser's nixos config";
+    home-manager = {
+      };
+    };
+    tclip = {
+      url = "github:tailscale-dev/tclip";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        utils.follows = "flake-utils";
+      };
+    };
   };
 
   outputs = {
@@ -46,11 +67,12 @@         nur = import inputs.nur {
           nurpkgs = prev;
           pkgs = prev;
   inputs = {
+
-  inputs = {
 {
+    nixpkgs-py36,
-          };
-  inputs = {
+{
 
+{
       })
       golink.overlay
     ];
M machines/chai/default.nix -> machines/chai/default.nix
diff --git a/machines/chai/default.nix b/machines/chai/default.nix
index 837f4b9927b6641e54f7c63029248b5e0e2f6f29..7f55f51fc61c66187ae3c73114b2103a314f7c5a 100644
--- a/machines/chai/default.nix
+++ b/machines/chai/default.nix
@@ -57,8 +57,8 @@     subversion
     teams-for-linux
     xorg.xauth
 
-    # Personal NUR
+    # Flake overlay
-    nur.repos.jolheiser.prospect-mail
+    jolheiser.prospect-mail
   ];
 
   system.stateVersion = "22.11";