summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accounts/gkleen@sif/default.nix2
-rw-r--r--flake.lock18
-rw-r--r--flake.nix2
-rw-r--r--overlays/lego.nix35
-rw-r--r--shell.nix2
-rw-r--r--user-profiles/utils.nix10
6 files changed, 25 insertions, 44 deletions
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 2048cbfb..dc71af22 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -7,7 +7,7 @@ let
7 genericName = "Text Editor"; 7 genericName = "Text Editor";
8 desktopName = "emacsclient"; 8 desktopName = "emacsclient";
9 icon = "emacs"; 9 icon = "emacs";
10 mimeType = "text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;"; 10 mimeTypes = ["text/english" "text/plain" "text/x-makefile" "text/x-c++hdr" "text/x-c++src" "text/x-chdr" "text/x-csrc" "text/x-java" "text/x-moc" "text/x-pascal" "text/x-tcl" "text/x-tex" "application/x-shellscript" "text/x-c" "text/x-c++"];
11 exec = "${config.home-manager.users.${userName}.programs.emacs.package}/bin/emacsclient -a \"\" %F"; 11 exec = "${config.home-manager.users.${userName}.programs.emacs.package}/bin/emacsclient -a \"\" %F";
12 }; 12 };
13 emacsScratch = pkgs.stdenv.mkDerivation rec { 13 emacsScratch = pkgs.stdenv.mkDerivation rec {
diff --git a/flake.lock b/flake.lock
index f1aee748..78909d51 100644
--- a/flake.lock
+++ b/flake.lock
@@ -46,11 +46,11 @@
46 ] 46 ]
47 }, 47 },
48 "locked": { 48 "locked": {
49 "lastModified": 1644534280, 49 "lastModified": 1645924784,
50 "narHash": "sha256-Gzf/Jq/F1vvTp6XkzPU+pBCj3OSAFLiR7f0ptwRseiI=", 50 "narHash": "sha256-mpwIohyuc3RAHmVXEm/vUHGMu2V9SLr4P3kh0xckwpI=",
51 "owner": "nix-community", 51 "owner": "nix-community",
52 "repo": "home-manager", 52 "repo": "home-manager",
53 "rev": "6d9d9294d09b5e88df65f8c6651efb8a4d7d2476", 53 "rev": "2499b916921adde8a694117bc007efdde8bbd918",
54 "type": "github" 54 "type": "github"
55 }, 55 },
56 "original": { 56 "original": {
@@ -62,11 +62,11 @@
62 }, 62 },
63 "nixpkgs": { 63 "nixpkgs": {
64 "locked": { 64 "locked": {
65 "lastModified": 1644687442, 65 "lastModified": 1645958901,
66 "narHash": "sha256-s9zQQ4MSY7LGrtcDK+ZPC6h2POuRiZdpneCZZsKbpHU=", 66 "narHash": "sha256-vcPuKbeJemK+a7Oce4fSMsGt9n99Ogwv/At0Oy/aW6E=",
67 "owner": "NixOS", 67 "owner": "NixOS",
68 "repo": "nixpkgs", 68 "repo": "nixpkgs",
69 "rev": "b74e0ecf6d4b2b18afc8c919f45470210a411afa", 69 "rev": "6896623f630ce8703e2201625eabd9f01dfcc5e0",
70 "type": "github" 70 "type": "github"
71 }, 71 },
72 "original": { 72 "original": {
@@ -91,11 +91,11 @@
91 ] 91 ]
92 }, 92 },
93 "locked": { 93 "locked": {
94 "lastModified": 1644599065, 94 "lastModified": 1645891244,
95 "narHash": "sha256-oFLRb9p954wiUGn8iU5wOCY/7yBrT4Xvg7Ew07MvSKs=", 95 "narHash": "sha256-Pu3a97Zn0PpWi/prTyD9TulCmxyeVnlqofor+yScRD8=",
96 "owner": "Mic92", 96 "owner": "Mic92",
97 "repo": "sops-nix", 97 "repo": "sops-nix",
98 "rev": "fc22eff3205e9742c1b0fd229c267bf237f0c43e", 98 "rev": "afb0d686dced029ea720c466f693c12ebfd4107b",
99 "type": "github" 99 "type": "github"
100 }, 100 },
101 "original": { 101 "original": {
diff --git a/flake.nix b/flake.nix
index e6ce4b05..1ef81d4c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -111,7 +111,7 @@
111 // outputs 111 // outputs
112 // { imports = [self.nixosModules.users.${userName} or ({...}: { imports = defaultUserProfiles userName; })] ++ (outputs.imports or []); }); 112 // { imports = [self.nixosModules.users.${userName} or ({...}: { imports = defaultUserProfiles userName; })] ++ (outputs.imports or []); });
113 113
114 systemsSelector = "(x86_64|i686)-linux"; 114 systemsSelector = "x86_64-linux";
115 forAllSystems = f: mapAttrs f (filterAttrs (system: _systemPkgs: !(isNull (builtins.match systemsSelector system))) nixpkgs.legacyPackages); 115 forAllSystems = f: mapAttrs f (filterAttrs (system: _systemPkgs: !(isNull (builtins.match systemsSelector system))) nixpkgs.legacyPackages);
116 forAllUsers = genAttrs (unique (map accountUserName (attrNames self.nixosModules.accounts))); 116 forAllUsers = genAttrs (unique (map accountUserName (attrNames self.nixosModules.accounts)));
117 117
diff --git a/overlays/lego.nix b/overlays/lego.nix
index 2a6ef548..80e9bd4b 100644
--- a/overlays/lego.nix
+++ b/overlays/lego.nix
@@ -1,29 +1,10 @@
1prev: final: let 1final: prev: {
2 zerossl = prev.fetchpatch { 2 lego = prev.lego.override {
3 url = "https://patch-diff.githubusercontent.com/raw/go-acme/lego/pull/1501.patch"; 3 buildGoModule = args: prev.buildGoModule (args // {
4 hash = "sha256-hLuWX607T8tcqljpBzEADViZd2FABkCgjNCLXMyWpuA="; 4 patches = (args.patches or []) ++ prev.lib.lists.singleton (prev.fetchpatch {
5 }; 5 url = "https://patch-diff.githubusercontent.com/raw/go-acme/lego/pull/1501.patch";
6in { 6 hash = "sha256-hLuWX607T8tcqljpBzEADViZd2FABkCgjNCLXMyWpuA=";
7 lego = prev.buildGoModule rec { 7 });
8 pname = "lego"; 8 });
9 version = "4.6.0";
10
11 src = prev.fetchFromGitHub {
12 owner = "go-acme";
13 repo = pname;
14 rev = "v${version}";
15 sha256 = "sha256-FisQS/qbl7f4aszc2Ft6nmuHNrDreOQdN0jrWMOvaAk=";
16 };
17 patches = [zerossl];
18
19 vendorSha256 = "sha256-cLM4YGguQf7lO5PUPmd/at1Aqrp9m8zFG6GWqcduJmw=";
20
21 doCheck = false;
22
23 subPackages = [ "cmd/lego" ];
24
25 ldflags = [
26 "-X main.version=${version}"
27 ];
28 }; 9 };
29} 10}
diff --git a/shell.nix b/shell.nix
index d7d42460..233d1cbe 100644
--- a/shell.nix
+++ b/shell.nix
@@ -17,7 +17,7 @@ in pkgs.mkShell {
17 nativeBuildInputs = with pkgs; [ 17 nativeBuildInputs = with pkgs; [
18 nixWithFlakes 18 nixWithFlakes
19 sops 19 sops
20 wireguard 20 wireguard-tools
21 gup 21 gup
22 nftables 22 nftables
23 deploy-rs 23 deploy-rs
diff --git a/user-profiles/utils.nix b/user-profiles/utils.nix
index 5407276a..2e8a22f7 100644
--- a/user-profiles/utils.nix
+++ b/user-profiles/utils.nix
@@ -15,11 +15,11 @@
15 }; 15 };
16 16
17 home.packages = with pkgs; [ 17 home.packages = with pkgs; [
18 autossh usbutils pciutils exa ag pwgen unzip magic-wormhole 18 autossh usbutils pciutils exa silver-searcher pwgen unzip
19 qrencode tty-clock dnsutils openssl sshfs psmisc mosh tree 19 magic-wormhole qrencode tty-clock dnsutils openssl sshfs psmisc
20 vnstat file pv bc fast-cli zip nmap aspell aspellDicts.de 20 mosh tree vnstat file pv bc fast-cli zip nmap aspell
21 aspellDicts.en borgbackup man-pages rsync socat telnet yq 21 aspellDicts.de aspellDicts.en borgbackup man-pages rsync socat
22 cached-nix-shell persistent-nix-shell rage 22 inetutils yq cached-nix-shell persistent-nix-shell rage
23 ]; 23 ];
24 }; 24 };
25} 25}