summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjetil Orbekk <kj@orbekk.com>2023-08-14 20:21:56 -0400
committerKjetil Orbekk <kj@orbekk.com>2023-08-14 20:21:56 -0400
commit7857ec66d7665a3e1dae21eac70500d9e97e39ed (patch)
treeea354661885ae0a9b092789258f7cbccb3fa8eb9
parent0cdf163f4f1ea10dbbf9d6c7c3f03ead6c19d2e3 (diff)
update config
-rw-r--r--flake.lock30
-rw-r--r--modules/common.nix11
2 files changed, 25 insertions, 16 deletions
diff --git a/flake.lock b/flake.lock
index 56f74a8..3d9204e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -51,11 +51,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1691921730,
- "narHash": "sha256-2vTR0Vq2VRQt7+4todEdOJRGIU/qyPdVCXJgbosz3Aw=",
+ "lastModified": 1692037570,
+ "narHash": "sha256-bvj/wfLLFTc8cWAwhN8tgShiy8ekPWt1+gWlEH7W4zY=",
"owner": "nix-community",
"repo": "emacs-overlay",
- "rev": "9279ce7180483c5ec9e6da74b87000a49a4942c0",
+ "rev": "7a4b5bbc06182e2f704630cd77a614ab0d9c2f2e",
"type": "github"
},
"original": {
@@ -121,11 +121,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1691654369,
- "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=",
+ "lastModified": 1691899779,
+ "narHash": "sha256-IBf4KVr/UQJlzrqB2/IHtlvmwsvyIVLPerSzCPU/6Xk=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e",
+ "rev": "100a1550b0e7a64b960c625b656f9229bdef5f87",
"type": "github"
},
"original": {
@@ -137,11 +137,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1691693223,
- "narHash": "sha256-9t8ZY1XNAsWqxAJmXgg+GXqF5chORMVnBT6PSHaRV3I=",
+ "lastModified": 1691950488,
+ "narHash": "sha256-iUNEeudc4dGjx+HsHccnGiuZUVE/nhjXuQ1DVCsHIUY=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "18784aac1013da9b442adf29b6c7c228518b5d3f",
+ "rev": "720e61ed8de116eec48d6baea1d54469b536b985",
"type": "github"
},
"original": {
@@ -153,11 +153,11 @@
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1691654369,
- "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=",
+ "lastModified": 1691990649,
+ "narHash": "sha256-gMbKOiX1HwClRP9lADaaV/lnZr93NEaOFe4ApDx/zd8=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e",
+ "rev": "6e287913f7b1ef537c97aa301b67c34ea46b640f",
"type": "github"
},
"original": {
@@ -169,11 +169,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1691831739,
- "narHash": "sha256-6e12VCvA7jOjhzJ1adLiUV1GTPXGBcCfhggsDwiuNB4=",
+ "lastModified": 1691950488,
+ "narHash": "sha256-iUNEeudc4dGjx+HsHccnGiuZUVE/nhjXuQ1DVCsHIUY=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "3fe694c4156b84dac12627685c7ae592a71e2206",
+ "rev": "720e61ed8de116eec48d6baea1d54469b536b985",
"type": "github"
},
"original": {
diff --git a/modules/common.nix b/modules/common.nix
index f75366a..aafc1b0 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -2,7 +2,6 @@
programs.zsh.enable = true;
programs.zsh.interactiveShellInit = "bindkey -e";
programs.tmux.enable = true;
- programs.direnv.enable = true;
orbekk.secrets.enable = true;
@@ -24,7 +23,17 @@
];
environment.variables.EDITOR = "${pkgs.neovim}/bin/nvim";
+ # nix.settings = {
+ # keep-outputs = true;
+ # keep-derivations = true;
+ # };
+ environment.pathsToLink = [
+ "/share/nix-direnv"
+ ];
+
environment.systemPackages = with pkgs; [
+ # Can be replaced with `programs.direnv.enable` after next nixos version.
+ direnv nix-direnv
starship
cifs-utils
inetutils # telnet