From c3bafeb9e9d94cbac1b9395d4e38a3be9bd1ea28 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Mon, 17 Jul 2023 09:47:42 +0200 Subject: [PATCH] update --- flake.lock | 92 +++++++++++++------------------ flake.nix | 8 ++- nixos/machines/robi/nginx-wkd.nix | 2 +- 3 files changed, 45 insertions(+), 57 deletions(-) diff --git a/flake.lock b/flake.lock index 64c4f20..abbec5e 100644 --- a/flake.lock +++ b/flake.lock @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1688506538, - "narHash": "sha256-h61+DDCkd4g28u6kXL6JAlUV4UQMViQ34kIYtFH9tVg=", + "lastModified": 1689324677, + "narHash": "sha256-83DCDJwBkulQFQESe37+tG0qUb8JkQLJHJ3Qn7iGx7Q=", "owner": "nix-community", "repo": "disko", - "rev": "3200614b9f51c10689212ceb797f252762e62576", + "rev": "7eb09408393faa5b8f3b3524c39cb93d938e8d04", "type": "github" }, "original": { @@ -104,7 +104,6 @@ "doom-snippets": "doom-snippets", "emacs-overlay": "emacs-overlay", "emacs-so-long": "emacs-so-long", - "evil-collection": "evil-collection", "evil-escape": "evil-escape", "evil-markdown": "evil-markdown", "evil-org-mode": "evil-org-mode", @@ -130,11 +129,11 @@ "ws-butler": "ws-butler" }, "locked": { - "lastModified": 1686959076, - "narHash": "sha256-tzwHJ8q9CMpIwxcyCM51i88arntNMARi1mFkAppMgqk=", + "lastModified": 1689075996, + "narHash": "sha256-NwBzz2CHNtT0oDqAGewByQ5OFnAWf+ewHUrK0F44xZk=", "owner": "nix-community", "repo": "nix-doom-emacs", - "rev": "2c4ba0d77fdfa4495929c8aee814936e722715c5", + "rev": "9a5b34d9ba30842eb8f0d7deb08bf03a75930471", "type": "github" }, "original": { @@ -179,11 +178,11 @@ "emacs-overlay_2": { "flake": false, "locked": { - "lastModified": 1688494665, - "narHash": "sha256-wXIBz6NVB1/d+H/nz+6XOrtn5s2jdFEJWuFP1qoHIjY=", + "lastModified": 1689564099, + "narHash": "sha256-Nu5m+sKcV/Hiy0ALNjIW3thZNdOTf3y1qyPLuQdVRZQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "54567ac566cd6bfa2607fbe155f9e009ce72306a", + "rev": "7eda134a8c17ec036ce67a478428d4bac0594aaf", "type": "github" }, "original": { @@ -208,22 +207,6 @@ "type": "github" } }, - "evil-collection": { - "flake": false, - "locked": { - "lastModified": 1686801899, - "narHash": "sha256-wGJWF9t8yaxLyYQRf3hK+5/AIYYAS8qWXPDEvatzBlc=", - "owner": "emacs-evil", - "repo": "evil-collection", - "rev": "4a7d924dbd851ef1b2ccb85778be6e7a6a81ebd4", - "type": "github" - }, - "original": { - "owner": "emacs-evil", - "repo": "evil-collection", - "type": "github" - } - }, "evil-escape": { "flake": false, "locked": { @@ -560,11 +543,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1687153676, - "narHash": "sha256-Q0VJWVBxmmKe55V7Lb+oqoOWWr5vhB46kEzU7v4jVD8=", + "lastModified": 1688896102, + "narHash": "sha256-o8oo0tuRR6eYhh4IYnNaeQ810RdIeF9JJQdJHuzRN3U=", "owner": "kmonad", "repo": "kmonad", - "rev": "2c658f6fddca39686a5448a0207a4aba215f3be5", + "rev": "19cccbf8988a67ff2e1fab14341230b220e4e5c8", "type": "github" }, "original": { @@ -629,11 +612,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1686838567, - "narHash": "sha256-aqKCUD126dRlVSKV6vWuDCitfjFrZlkwNuvj5LtjRRU=", + "lastModified": 1689320556, + "narHash": "sha256-vODUkZLWFVCvo1KPK3dC2CbXjxa9antEn5ozwlcTr48=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "429f232fe1dc398c5afea19a51aad6931ee0fb89", + "rev": "d4ea64f2063820120c05f6ba93ee02e6d4671d6b", "type": "github" }, "original": { @@ -729,11 +712,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1688256355, - "narHash": "sha256-/E+OSabu4ii5+ccWff2k4vxDsXYhpc4hwnm0s6JOz7Y=", + "lastModified": 1689473667, + "narHash": "sha256-41ePf1ylHMTogSPAiufqvBbBos+gtB6zjQlYFSEKFMM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f553c016a31277246f8d3724d3b1eee5e8c0842c", + "rev": "13231eccfa1da771afa5c0807fdd73e05a1ec4e6", "type": "github" }, "original": { @@ -745,11 +728,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1688322751, - "narHash": "sha256-eW62dC5f33oKZL7VWlomttbUnOTHrAbte9yNUNW8rbk=", + "lastModified": 1689534811, + "narHash": "sha256-jnSUdzD/414d94plCyNlvTJJtiTogTep6t7ZgIKIHiE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0fbe93c5a7cac99f90b60bdf5f149383daaa615f", + "rev": "6cee3b5893090b0f5f0a06b4cf42ca4e60e5d222", "type": "github" }, "original": { @@ -792,11 +775,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1688389917, - "narHash": "sha256-RKiK1QeommEsjQ8fLgxt4831x9O6n2gD7wAhVZTrr8M=", + "lastModified": 1689431009, + "narHash": "sha256-hPgQCRWP5q/Xc4qOIP3c2krR9nQua78+t9EDiuey5nc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "aed4b19d312525ae7ca9bceb4e1efe3357d0e2eb", + "rev": "af8279f65fe71ce5a448408034a8c06e2b4b2c66", "type": "github" }, "original": { @@ -822,11 +805,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1688188316, - "narHash": "sha256-CXuQllDKCxtZaB/umnZOvoJ/d4kJguYgffeTA9l1B3o=", + "lastModified": 1689413807, + "narHash": "sha256-exuzOvOhGAEKWQKwDuZAL4N8a1I837hH5eocaTcIbLc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8277b539d371bf4308fc5097911aa58bfac1794f", + "rev": "46ed466081b9cad1125b11f11a2af5cc40b942c7", "type": "github" }, "original": { @@ -974,11 +957,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1632864714, - "narHash": "sha256-aKYFPoMlTVovXk8fM7KZOc1HhusF/PEFEV9haBMJvuA=", + "lastModified": 1688766095, + "narHash": "sha256-SCqXnPol1sRqKK8Oo9LG7355UyD83ACbvJ7f2nRmXr4=", "ref": "refs/heads/develop", - "rev": "a5d6e6ec4348af2c963c4cb5c5d04e1f805a9bc2", - "revCount": 23, + "rev": "10d0198d184ecfad7be0eb1b01ca67682eb53d0a", + "revCount": 24, "type": "git", "url": "https://git.ingolf-wagner.de/palo/polygon-art.git" }, @@ -1005,11 +988,11 @@ }, "retiolum": { "locked": { - "lastModified": 1688281987, - "narHash": "sha256-P0UmNCmiz9iqQmQhS2R3Ihedhtl7qSLYxDsNJ2cLp5o=", + "lastModified": 1688896810, + "narHash": "sha256-GUw+eaHIiVfADRRI/ngGZ/XSm/pOIjfrQ2tmjfvlc1o=", "owner": "Mic92", "repo": "retiolum", - "rev": "b74b9594c8b7d9eee0dc535b9262b5e9b9d0eb2c", + "rev": "966f656268a2d823ee5faf26954640e4b0b29aa7", "type": "github" }, "original": { @@ -1134,11 +1117,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1688268466, - "narHash": "sha256-fArazqgYyEFiNcqa136zVYXihuqzRHNOOeVICayU2Yg=", + "lastModified": 1689534977, + "narHash": "sha256-EB4hasmjKgetTR0My2bS5AwELZFIQ4zANLqHKi7aVXg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5ed3c22c1fa0515e037e36956a67fe7e32c92957", + "rev": "bd695cc4d0a5e1bead703cc1bec5fa3094820a81", "type": "github" }, "original": { @@ -1164,6 +1147,7 @@ }, "original": { "owner": "danth", + "ref": "35cab8eb76c1d3672b2b290a64f357847c30d090", "repo": "stylix", "type": "github" } diff --git a/flake.nix b/flake.nix index 7b3675f..e7ae05d 100644 --- a/flake.nix +++ b/flake.nix @@ -5,8 +5,8 @@ url = "git+ssh://gitea@git.ingolf-wagner.de/palo/nixos-secrets.git?ref=main"; flake = false; }; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-legacy_2211.url = "github:nixos/nixpkgs/nixos-22.11"; nixpkgs-legacy_2205.url = "github:nixos/nixpkgs/nixos-22.05"; nixpkgs-legacy_2105.url = "github:nixos/nixpkgs/nixos-21.05"; @@ -71,7 +71,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nixinate.url = "github:matthewcroughan/nixinate"; - stylix.url = "github:danth/stylix"; + stylix = { + url = "github:danth/stylix?ref=35cab8eb76c1d3672b2b290a64f357847c30d090"; + #inputs.nixpkgs.follows = "nixpkgs"; + #inputs.home-manager.follows = "home-manager"; + }; }; diff --git a/nixos/machines/robi/nginx-wkd.nix b/nixos/machines/robi/nginx-wkd.nix index 2a217f4..78bd195 100644 --- a/nixos/machines/robi/nginx-wkd.nix +++ b/nixos/machines/robi/nginx-wkd.nix @@ -26,5 +26,5 @@ in "= /.well-known/openpgpkey/hu/dj3498u4hyyarh35rkjfnghbjxug6b19" = wkd; }; - # todo openpgpkey.ingolf-wagner.de noch einrichten + # todo openpgpkey.ingolf-wagner.de noch einrichten }