From 3713ee2a4cbd3ad124c4dab7468643179689fce5 Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Sat, 18 Sep 2021 13:29:27 +0300 Subject: [PATCH] stuf --- flake.lock | 36 ++++++++++++++++++------------------ flake.nix | 8 ++++---- overlays/overrides.nix | 3 ++- users/patriot/default.nix | 3 ++- 4 files changed, 26 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index b8b8975..6c4a144 100644 --- a/flake.lock +++ b/flake.lock @@ -196,11 +196,11 @@ ] }, "locked": { - "lastModified": 1631156083, - "narHash": "sha256-FfYSjDmuBrq3p+CDJwvTrVow4HE7w0FIPN9AUSldM/s=", + "lastModified": 1631463790, + "narHash": "sha256-Fn5QyH3Kb1vVkGWDEurlqG2mFb7h24xpDuEc3NSuc/w=", "owner": "helix-editor", "repo": "helix", - "rev": "0b1bc566e4e3cfa88e23133fb018c998f2052c52", + "rev": "f2c73d156757b2567f306dcca4b94cf01b172d38", "type": "github" }, "original": { @@ -232,11 +232,11 @@ }, "latest": { "locked": { - "lastModified": 1631118067, - "narHash": "sha256-tEcFvm3a6ToeBGwHdjfB2mVQwa4LZCZTQYE2LnY3ycA=", + "lastModified": 1631381596, + "narHash": "sha256-Xk91RO0uMyul8fWo3RP7WqEP5bsKUVucJRgLZgascAo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "09cd65b33c5653d7d2954fef4b9f0e718c899743", + "rev": "f6e9e908ccbcabb365cb5434a4a38dd8c996fc72", "type": "github" }, "original": { @@ -334,11 +334,11 @@ "rustOverlay": "rustOverlay" }, "locked": { - "lastModified": 1630822133, - "narHash": "sha256-CoPUuZvXx690gj5O1EljXNyGInBDfqWC4MOXARMrHog=", + "lastModified": 1631254163, + "narHash": "sha256-8+nOGLH1fXwWnNMTQq/Igk434BzZF5Vld45xLDLiNDQ=", "owner": "yusdacra", "repo": "nix-cargo-integration", - "rev": "e9e445cd6694171a3393df8fd016356baec5742f", + "rev": "432d8504a32232e8d74710024d5bf5cc31767651", "type": "github" }, "original": { @@ -349,11 +349,11 @@ }, "nixos": { "locked": { - "lastModified": 1631098960, - "narHash": "sha256-6j6G/omHEFAnI2x7UvdrviGDNqiq1Fjd1A58Q6uc4sQ=", + "lastModified": 1631275245, + "narHash": "sha256-vROU1OFI2zvKSBjbMpbpl9R08Or3eUwaW5HJLq88QWY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "12eb1d16ae3b6cbf0ea83e9228bca8ffd7cfe347", + "rev": "8b0b81dab17753ab344a44c04be90a61dc55badf", "type": "github" }, "original": { @@ -424,11 +424,11 @@ ] }, "locked": { - "lastModified": 1631228932, - "narHash": "sha256-0FCQiVagh5ksgCqsnJAa/Q1qyYmsIy+QLdx/Mbkb+fs=", + "lastModified": 1631334801, + "narHash": "sha256-Q/H05xWWBZJITtK6Z/iaL/Gj8slf2/msbU+RfILv5HI=", "owner": "colemickens", "repo": "nixpkgs-wayland", - "rev": "14f7bdea4b46551592f097d28645d968d08b1f53", + "rev": "909d3dcdb7fe4a97b6639a355a5bf421ba52a6e1", "type": "github" }, "original": { @@ -499,11 +499,11 @@ "rustOverlay": { "flake": false, "locked": { - "lastModified": 1630808055, - "narHash": "sha256-axfnFXuakMyLMlNIr1yVzvC8ipj6nVJnia2YtkWdzYg=", + "lastModified": 1631240108, + "narHash": "sha256-ffsTkAGyQLxu4E28nVcqwc8xFL/H1UEwrRw2ITI43Aw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b4c01ab310031a557b6a00062378535be33c36bb", + "rev": "3a29d5e726b855d9463eb5dfe04f1ec14d413289", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e261392..a36fb95 100644 --- a/flake.nix +++ b/flake.nix @@ -93,11 +93,11 @@ #agenix.overlay #nvfetcher.overlay #deploy.overlay - nixpkgsWayland.overlay + #nixpkgsWayland.overlay (_: prev: { - helix = helix.packages.${prev.system}.helix; - helix-src = helix; - rnix-lsp = rnixLsp.packages.${prev.system}.rnix-lsp; + #helix = helix.packages.${prev.system}.helix; + #helix-src = helix; + #rnix-lsp = rnixLsp.packages.${prev.system}.rnix-lsp; }) ./pkgs/default.nix ]; diff --git a/overlays/overrides.nix b/overlays/overrides.nix index d13376f..27821b2 100644 --- a/overlays/overrides.nix +++ b/overlays/overrides.nix @@ -21,7 +21,8 @@ channels: final: prev: { gh chromium-unwrapped chromium - sublime4; + sublime4 + helix; libnotify-latest = channels.latest.libnotify; diff --git a/users/patriot/default.nix b/users/patriot/default.nix index a9216c9..b3cc26e 100644 --- a/users/patriot/default.nix +++ b/users/patriot/default.nix @@ -11,7 +11,7 @@ in isNormalUser = true; createHome = true; home = "/home/patriot"; - extraGroups = [ "wheel" "adbusers" "dialout" ]; + extraGroups = [ "wheel" "adbusers" "dialout" "wireshark" ]; shell = pkgs.zsh; hashedPassword = "$6$spzqhAyJfhHy$iHgLBlhjGn1l8PnbjJdWTn1GPvcjMqYNKUzdCe/7IrX6sHNgETSr/Nfpdmq9FCXLhrAfwHOd/q/8SvfeIeNX4/"; @@ -39,6 +39,7 @@ in enable = true; package = pkgs.adoptopenjdk-jre-bin; }; + wireshark.enable = true; }; security.pam.services.patriot = {