summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore2
-rw-r--r--awslocal.nix55
-rw-r--r--flake.lock651
-rw-r--r--flake.nix18
-rw-r--r--home.nix52
-rw-r--r--niri.nix9
l---------result1
-rw-r--r--secrets/gridx/aerc.nixbin0 -> 683 bytes
-rw-r--r--secrets/gridx/gridx.nixbin0 -> 332 bytes
9 files changed, 667 insertions, 121 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..27964eb
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.git-crypt/
+result
diff --git a/awslocal.nix b/awslocal.nix
deleted file mode 100644
index 1968b08..0000000
--- a/awslocal.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
- lib,
- buildPythonPackage,
- fetchPypi,
- # build-system
- setuptools,
- setuptools-scm,
- # dependencies
- attrs,
- pluggy,
- py,
- six,
- # tests
- hypothesis,
-}:
-buildPythonPackage rec {
- pname = "awscli-local";
- version = "3.3.1";
- pyproject = true;
-
- src = fetchPypi {
- inherit pname version;
- hash = "sha256-z4Q23FnYaVNG/NOrKW3kZCXsqwDWQJbOvnn7Ueyy65M=";
- };
-
- postPatch = ''
- # don't test bash builtins
- rm testing/test_argcomplete.py
- '';
-
- build-system = [
- setuptools
- setuptools-scm
- ];
-
- dependencies = [
- attrs
- py
- setuptools
- six
- pluggy
- ];
-
- nativeCheckInputs = [
- hypothesis
- ];
-
- meta = {
- changelog = "https://github.com/pytest-dev/pytest/releases/tag/${version}";
- description = "Framework for writing tests";
- homepage = "https://github.com/pytest-dev/pytest";
- license = lib.licenses.mit;
- maintainers = with lib.maintainers; [domenkozar lovek323 madjar lsix];
- };
-}
diff --git a/flake.lock b/flake.lock
index 3b09b05..027ecd8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,8 +1,190 @@
{
"nodes": {
+ "cachix": {
+ "inputs": {
+ "devenv": [
+ "edge-tools",
+ "devenv"
+ ],
+ "flake-compat": [
+ "edge-tools",
+ "devenv"
+ ],
+ "git-hooks": [
+ "edge-tools",
+ "devenv"
+ ],
+ "nixpkgs": "nixpkgs"
+ },
+ "locked": {
+ "lastModified": 1742042642,
+ "narHash": "sha256-D0gP8srrX0qj+wNYNPdtVJsQuFzIng3q43thnHXQ/es=",
+ "owner": "cachix",
+ "repo": "cachix",
+ "rev": "a624d3eaf4b1d225f918de8543ed739f2f574203",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "ref": "latest",
+ "repo": "cachix",
+ "type": "github"
+ }
+ },
+ "cachix_2": {
+ "inputs": {
+ "devenv": [
+ "edge-tools",
+ "ecs",
+ "devenv"
+ ],
+ "flake-compat": [
+ "edge-tools",
+ "ecs",
+ "devenv"
+ ],
+ "git-hooks": [
+ "edge-tools",
+ "ecs",
+ "devenv"
+ ],
+ "nixpkgs": "nixpkgs_4"
+ },
+ "locked": {
+ "lastModified": 1737621947,
+ "narHash": "sha256-8HFvG7fvIFbgtaYAY2628Tb89fA55nPm2jSiNs0/Cws=",
+ "owner": "cachix",
+ "repo": "cachix",
+ "rev": "f65a3cd5e339c223471e64c051434616e18cc4f5",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "ref": "latest",
+ "repo": "cachix",
+ "type": "github"
+ }
+ },
+ "devenv": {
+ "inputs": {
+ "cachix": "cachix",
+ "flake-compat": "flake-compat",
+ "git-hooks": "git-hooks",
+ "nix": "nix",
+ "nixpkgs": "nixpkgs_3"
+ },
+ "locked": {
+ "lastModified": 1746423062,
+ "narHash": "sha256-BgiRweL6nMjeO2BQgnOyIquuviybI4S8Nc8r9hYjcBc=",
+ "owner": "cachix",
+ "repo": "devenv",
+ "rev": "aba5cf8412827fdb637fceb2c305d10fcea907c6",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "repo": "devenv",
+ "type": "github"
+ }
+ },
+ "devenv_2": {
+ "inputs": {
+ "cachix": "cachix_2",
+ "flake-compat": "flake-compat_2",
+ "git-hooks": "git-hooks_2",
+ "nix": "nix_2",
+ "nixpkgs": "nixpkgs_6"
+ },
+ "locked": {
+ "lastModified": 1743292849,
+ "narHash": "sha256-rybjlr2xNmSHrlRVliYvI9bOPRnROecFqz+tO0V2woI=",
+ "owner": "cachix",
+ "repo": "devenv",
+ "rev": "fa5cbf91fb1f1614936997badbb6018a2fdef320",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "repo": "devenv",
+ "type": "github"
+ }
+ },
+ "ecs": {
+ "inputs": {
+ "devenv": "devenv_2",
+ "nixpkgs": "nixpkgs_7",
+ "systems": "systems"
+ },
+ "locked": {
+ "lastModified": 1746454006,
+ "narHash": "sha256-ayUGeFYQtQyVeLS7e77ep3BSplGqmoeMqxckJ4D9lzs=",
+ "ref": "refs/heads/main",
+ "rev": "f469bdd4c08fef6537202815fe430f7431249b68",
+ "revCount": 3992,
+ "type": "git",
+ "url": "ssh://git@github.com/grid-x/edge-connector"
+ },
+ "original": {
+ "type": "git",
+ "url": "ssh://git@github.com/grid-x/edge-connector"
+ }
+ },
+ "edge-tools": {
+ "inputs": {
+ "devenv": "devenv",
+ "ecs": "ecs",
+ "nixpkgs": "nixpkgs_8",
+ "systems": "systems_2"
+ },
+ "locked": {
+ "lastModified": 1746514348,
+ "narHash": "sha256-bXrj9OitpiXevAbWoj1eD8yOm9uTPRzotEAHTRSi/bw=",
+ "ref": "refs/heads/main",
+ "rev": "a470844ae5de78e8edc64f17bb6e11fbefd9cba5",
+ "revCount": 116,
+ "type": "git",
+ "url": "ssh://git@github.com/grid-x/edge-tools"
+ },
+ "original": {
+ "type": "git",
+ "url": "ssh://git@github.com/grid-x/edge-tools"
+ }
+ },
"flake-compat": {
"flake": false,
"locked": {
+ "lastModified": 1733328505,
+ "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+ "type": "github"
+ },
+ "original": {
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "type": "github"
+ }
+ },
+ "flake-compat_2": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1733328505,
+ "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+ "type": "github"
+ },
+ "original": {
+ "owner": "edolstra",
+ "repo": "flake-compat",
+ "type": "github"
+ }
+ },
+ "flake-compat_3": {
+ "flake": false,
+ "locked": {
"lastModified": 1747046372,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra",
@@ -16,9 +198,56 @@
"type": "github"
}
},
+ "flake-parts": {
+ "inputs": {
+ "nixpkgs-lib": [
+ "edge-tools",
+ "devenv",
+ "nix",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1712014858,
+ "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "type": "github"
+ }
+ },
+ "flake-parts_2": {
+ "inputs": {
+ "nixpkgs-lib": [
+ "edge-tools",
+ "ecs",
+ "devenv",
+ "nix",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1712014858,
+ "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "type": "github"
+ }
+ },
"flake-utils": {
"inputs": {
- "systems": "systems"
+ "systems": "systems_3"
},
"locked": {
"lastModified": 1731533236,
@@ -36,7 +265,7 @@
},
"flake-utils_2": {
"inputs": {
- "systems": "systems_2"
+ "systems": "systems_4"
},
"locked": {
"lastModified": 1710146030,
@@ -54,18 +283,18 @@
},
"ghostty": {
"inputs": {
- "flake-compat": "flake-compat",
+ "flake-compat": "flake-compat_3",
"flake-utils": "flake-utils",
- "nixpkgs": "nixpkgs",
+ "nixpkgs": "nixpkgs_9",
"zig": "zig",
"zon2nix": "zon2nix"
},
"locked": {
- "lastModified": 1750679248,
- "narHash": "sha256-zRv0FqFwR4xenvgpyh386gtEXEWdRKZJDvLJV1MRyVc=",
+ "lastModified": 1750884490,
+ "narHash": "sha256-hRt8xWReiDFyR4MDFg7FCq1PtvJb8hmrelkifnu/7yI=",
"ref": "refs/heads/main",
- "rev": "373fc6bcbf04f50bc8a8d19c7688f8ee24fb3849",
- "revCount": 10710,
+ "rev": "fa47db5363bedc5c3c9add87a83427447a273a90",
+ "revCount": 10771,
"type": "git",
"url": "ssh://git@github.com/ghostty-org/ghostty"
},
@@ -74,10 +303,113 @@
"url": "ssh://git@github.com/ghostty-org/ghostty"
}
},
+ "git-hooks": {
+ "inputs": {
+ "flake-compat": [
+ "edge-tools",
+ "devenv"
+ ],
+ "gitignore": "gitignore",
+ "nixpkgs": [
+ "edge-tools",
+ "devenv",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1742649964,
+ "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
+ "owner": "cachix",
+ "repo": "git-hooks.nix",
+ "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "repo": "git-hooks.nix",
+ "type": "github"
+ }
+ },
+ "git-hooks_2": {
+ "inputs": {
+ "flake-compat": [
+ "edge-tools",
+ "ecs",
+ "devenv"
+ ],
+ "gitignore": "gitignore_2",
+ "nixpkgs": [
+ "edge-tools",
+ "ecs",
+ "devenv",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1740849354,
+ "narHash": "sha256-oy33+t09FraucSZ2rZ6qnD1Y1c8azKKmQuCvF2ytUko=",
+ "owner": "cachix",
+ "repo": "git-hooks.nix",
+ "rev": "4a709a8ce9f8c08fa7ddb86761fe488ff7858a07",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "repo": "git-hooks.nix",
+ "type": "github"
+ }
+ },
+ "gitignore": {
+ "inputs": {
+ "nixpkgs": [
+ "edge-tools",
+ "devenv",
+ "git-hooks",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1709087332,
+ "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "type": "github"
+ }
+ },
+ "gitignore_2": {
+ "inputs": {
+ "nixpkgs": [
+ "edge-tools",
+ "ecs",
+ "devenv",
+ "git-hooks",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1709087332,
+ "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "type": "github"
+ }
+ },
"gxctl": {
"inputs": {
"flake-utils": "flake-utils_2",
- "nixpkgs": "nixpkgs_2"
+ "nixpkgs": "nixpkgs_10"
},
"locked": {
"lastModified": 1750671555,
@@ -100,11 +432,11 @@
]
},
"locked": {
- "lastModified": 1750654717,
- "narHash": "sha256-YXlhTUGaLAY1rSosaRXO5RSGriEyF9BGdLkpKV+9jyI=",
+ "lastModified": 1750798083,
+ "narHash": "sha256-DTCCcp6WCFaYXWKFRA6fiI2zlvOLCf5Vwx8+/0R8Wc4=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "4c9e99e8e8e36bcdfa9cdb102e45e4dc95aa5c5b",
+ "rev": "ff31a4677c1a8ae506aa7e003a3dba08cb203f82",
"type": "github"
},
"original": {
@@ -113,20 +445,133 @@
"type": "github"
}
},
+ "libgit2": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1697646580,
+ "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=",
+ "owner": "libgit2",
+ "repo": "libgit2",
+ "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5",
+ "type": "github"
+ },
+ "original": {
+ "owner": "libgit2",
+ "repo": "libgit2",
+ "type": "github"
+ }
+ },
+ "libgit2_2": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1697646580,
+ "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=",
+ "owner": "libgit2",
+ "repo": "libgit2",
+ "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5",
+ "type": "github"
+ },
+ "original": {
+ "owner": "libgit2",
+ "repo": "libgit2",
+ "type": "github"
+ }
+ },
+ "nix": {
+ "inputs": {
+ "flake-compat": [
+ "edge-tools",
+ "devenv"
+ ],
+ "flake-parts": "flake-parts",
+ "libgit2": "libgit2",
+ "nixpkgs": "nixpkgs_2",
+ "nixpkgs-23-11": [
+ "edge-tools",
+ "devenv"
+ ],
+ "nixpkgs-regression": [
+ "edge-tools",
+ "devenv"
+ ],
+ "pre-commit-hooks": [
+ "edge-tools",
+ "devenv"
+ ]
+ },
+ "locked": {
+ "lastModified": 1745930071,
+ "narHash": "sha256-bYyjarS3qSNqxfgc89IoVz8cAFDkF9yPE63EJr+h50s=",
+ "owner": "domenkozar",
+ "repo": "nix",
+ "rev": "b455edf3505f1bf0172b39a735caef94687d0d9c",
+ "type": "github"
+ },
+ "original": {
+ "owner": "domenkozar",
+ "ref": "devenv-2.24",
+ "repo": "nix",
+ "type": "github"
+ }
+ },
+ "nix_2": {
+ "inputs": {
+ "flake-compat": [
+ "edge-tools",
+ "ecs",
+ "devenv"
+ ],
+ "flake-parts": "flake-parts_2",
+ "libgit2": "libgit2_2",
+ "nixpkgs": "nixpkgs_5",
+ "nixpkgs-23-11": [
+ "edge-tools",
+ "ecs",
+ "devenv"
+ ],
+ "nixpkgs-regression": [
+ "edge-tools",
+ "ecs",
+ "devenv"
+ ],
+ "pre-commit-hooks": [
+ "edge-tools",
+ "ecs",
+ "devenv"
+ ]
+ },
+ "locked": {
+ "lastModified": 1741798497,
+ "narHash": "sha256-E3j+3MoY8Y96mG1dUIiLFm2tZmNbRvSiyN7CrSKuAVg=",
+ "owner": "domenkozar",
+ "repo": "nix",
+ "rev": "f3f44b2baaf6c4c6e179de8cbb1cc6db031083cd",
+ "type": "github"
+ },
+ "original": {
+ "owner": "domenkozar",
+ "ref": "devenv-2.24",
+ "repo": "nix",
+ "type": "github"
+ }
+ },
"nixpkgs": {
"locked": {
- "lastModified": 1748189127,
- "narHash": "sha256-zRDR+EbbeObu4V2X5QCd2Bk5eltfDlCr5yvhBwUT6pY=",
- "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
- "type": "tarball",
- "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802491.7c43f080a7f2/nixexprs.tar.xz"
+ "lastModified": 1733212471,
+ "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
+ "type": "github"
},
"original": {
- "type": "tarball",
- "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz"
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
}
},
- "nixpkgs_2": {
+ "nixpkgs_10": {
"locked": {
"lastModified": 1720691131,
"narHash": "sha256-CWT+KN8aTPyMIx8P303gsVxUnkinIz0a/Cmasz1jyIM=",
@@ -142,13 +587,13 @@
"type": "github"
}
},
- "nixpkgs_3": {
+ "nixpkgs_11": {
"locked": {
- "lastModified": 1750506804,
- "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
+ "lastModified": 1750776420,
+ "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "4206c4cb56751df534751b058295ea61357bbbaa",
+ "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf",
"type": "github"
},
"original": {
@@ -158,12 +603,138 @@
"type": "github"
}
},
+ "nixpkgs_2": {
+ "locked": {
+ "lastModified": 1717432640,
+ "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "release-24.05",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_3": {
+ "locked": {
+ "lastModified": 1733477122,
+ "narHash": "sha256-qamMCz5mNpQmgBwc8SB5tVMlD5sbwVIToVZtSxMph9s=",
+ "owner": "cachix",
+ "repo": "devenv-nixpkgs",
+ "rev": "7bd9e84d0452f6d2e63b6e6da29fe73fac951857",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "ref": "rolling",
+ "repo": "devenv-nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_4": {
+ "locked": {
+ "lastModified": 1733212471,
+ "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_5": {
+ "locked": {
+ "lastModified": 1717432640,
+ "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "release-24.05",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_6": {
+ "locked": {
+ "lastModified": 1733477122,
+ "narHash": "sha256-qamMCz5mNpQmgBwc8SB5tVMlD5sbwVIToVZtSxMph9s=",
+ "owner": "cachix",
+ "repo": "devenv-nixpkgs",
+ "rev": "7bd9e84d0452f6d2e63b6e6da29fe73fac951857",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "ref": "rolling",
+ "repo": "devenv-nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_7": {
+ "locked": {
+ "lastModified": 1743315132,
+ "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "52faf482a3889b7619003c0daec593a1912fddc1",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_8": {
+ "locked": {
+ "lastModified": 1746328495,
+ "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_9": {
+ "locked": {
+ "lastModified": 1748189127,
+ "narHash": "sha256-zRDR+EbbeObu4V2X5QCd2Bk5eltfDlCr5yvhBwUT6pY=",
+ "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
+ "type": "tarball",
+ "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802491.7c43f080a7f2/nixexprs.tar.xz"
+ },
+ "original": {
+ "type": "tarball",
+ "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz"
+ }
+ },
"root": {
"inputs": {
+ "edge-tools": "edge-tools",
"ghostty": "ghostty",
"gxctl": "gxctl",
"home-manager": "home-manager",
- "nixpkgs": "nixpkgs_3"
+ "nixpkgs": "nixpkgs_11"
}
},
"systems": {
@@ -196,6 +767,36 @@
"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"
+ }
+ },
+ "systems_4": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
+ },
"zig": {
"inputs": {
"flake-compat": [
diff --git a/flake.nix b/flake.nix
index 0177c83..50d15f5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,12 +3,14 @@
inputs = {
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
- gxctl.url = "git+ssh://git@github.com/grid-x/gxctl";
ghostty.url = "git+ssh://git@github.com/ghostty-org/ghostty";
home-manager = {
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
+
+ gxctl.url = "git+ssh://git@github.com/grid-x/gxctl";
+ edge-tools.url = "git+ssh://git@github.com/grid-x/edge-tools";
};
outputs = inputs @ {
@@ -24,7 +26,19 @@
system = "x86_64-linux";
};
in {
- "gabrielgio" = home-manager.lib.homeManagerConfiguration {
+ "gabrielgio@workstation.lan" = home-manager.lib.homeManagerConfiguration {
+ inherit pkgs;
+
+ extraSpecialArgs = {
+ inherit inputs;
+ };
+
+ modules = [
+ ./home.nix
+ ./secrets/gridx/gridx.nix
+ ];
+ };
+ "gabrielgio@homestation.lan" = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
extraSpecialArgs = {
diff --git a/home.nix b/home.nix
index 6e37e3a..12a5100 100644
--- a/home.nix
+++ b/home.nix
@@ -8,36 +8,28 @@ in {
home.username = "gabrielgio";
home.homeDirectory = "/home/gabrielgio";
home.stateVersion = "25.05";
- home.packages = with pkgs;
- [
- alejandra
- awscli2
- comma
- grpcurl
- jujutsu
- k6
- kubectl
- ngrok
- nix-index
- nixd
- protoscope
- python312Packages.cssbeautifier
- ssm-session-manager-plugin
- streamlink
- terraform
- terraform-ls
- vale
- yaml-language-server
- ]
- ++ (
- if hostname != "workstation.lan"
- then [
- inputs.gxctl.packages.${pkgs.system}.gxctl
- inputs.gxctl.packages.${pkgs.system}.gxssh
- inputs.gxctl.packages.${pkgs.system}.gxscp
- ]
- else []
- );
+ home.packages = with pkgs; [
+ alejandra
+ awscli2
+ comma
+ gofumpt
+ grpcurl
+ home-manager
+ jujutsu
+ k6
+ kubectl
+ ngrok
+ nix-index
+ nixd
+ protoscope
+ python312Packages.cssbeautifier
+ ssm-session-manager-plugin
+ streamlink
+ terraform
+ terraform-ls
+ vale
+ yaml-language-server
+ ];
programs = {
direnv = {
diff --git a/niri.nix b/niri.nix
index 5c131da..b70e76d 100644
--- a/niri.nix
+++ b/niri.nix
@@ -61,14 +61,7 @@
}
spawn-at-startup "dbus-update-activation-environment" "WAYLAND_DISPLAY" "XDG_CURRENT_DESKTOP=sway"
- //spawn-at-startup "/usr/libexec/pipewire-launcher"
- //spawn-at-startup "openrc --user gui"
-
- spawn-at-startup "waybar"
- spawn-at-startup "mako"
- spawn-at-startup "nm-applet"
- spawn-at-startup "blueman-applet"
- spawn-at-startup "swaybg" "-c" "DDDDDD"
+ spawn-at-startup "openrc --user gui"
spawn-at-startup "xwayland-satellite" ":12"
environment {
diff --git a/result b/result
deleted file mode 120000
index ea9e9e5..0000000
--- a/result
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/aq1cwsxfms57sz105a47kfpkacxm2ca2-home-manager-generation \ No newline at end of file
diff --git a/secrets/gridx/aerc.nix b/secrets/gridx/aerc.nix
new file mode 100644
index 0000000..5f99eb2
--- /dev/null
+++ b/secrets/gridx/aerc.nix
Binary files differ
diff --git a/secrets/gridx/gridx.nix b/secrets/gridx/gridx.nix
new file mode 100644
index 0000000..b087825
--- /dev/null
+++ b/secrets/gridx/gridx.nix
Binary files differ
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-09 23:16:33 +0000