From b37781ef9042094eeaa3a86d4eb7b4c6e2b91151 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Sun, 9 Jun 2024 20:24:49 +0200 Subject: [PATCH] xps sops 09 --- flake.lock | 87 +++++++++++++++-------------------------- system-modules/boot.nix | 2 +- system-modules/sops.nix | 9 ++--- 3 files changed, 35 insertions(+), 63 deletions(-) diff --git a/flake.lock b/flake.lock index cfa5b98..1b0ab8e 100755 --- a/flake.lock +++ b/flake.lock @@ -42,16 +42,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1717646600, - "narHash": "sha256-yHNeUEOU8/n+ULrsokW5aCLDWg/mEVbPCOyhTIorZns=", + "lastModified": 1717931498, + "narHash": "sha256-8j6h9gZmAngPXLFRRtd8ySRb0I43f0rRW0puU8IBwKA=", "owner": "rycee", "repo": "nur-expressions", - "rev": "bdbbd8c2cb03b23b586fea14a8a680b218ab363c", - "lastModified": 1717128197, - "narHash": "sha256-jUObiEzZXl07D1JYsZr86TJOFFeJw3rJD3OUOCHicP0=", - "owner": "rycee", - "repo": "nur-expressions", - "rev": "179e0cecb2c8a663fcf9acfaff067cd2dd0da66b", + "rev": "3b7b7d83b3561269c2d8f20b5d4d4496bb36b2e6", "type": "gitlab" }, "original": { @@ -190,11 +185,11 @@ ] }, "locked": { - "lastModified": 1716576411, - "narHash": "sha256-FIN1wMoyePBTtibCbaeJaoKNLuAYIGwLCWAYC1DJanw=", + "lastModified": 1717181720, + "narHash": "sha256-yv+QZWsusu/NWjydkxixHC2g+tIJ9v+xkE2EiVpJj6g=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "57298fc4f13c807e50ada2c986a3114b7fc2e621", + "rev": "9e27a2c2ceb1e0b85bd55b0afefad196056fe87c", "type": "github" }, "original": { @@ -213,11 +208,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1717605046, - "narHash": "sha256-1oVVblacE6uQztHTTPG6NoUzj5RErIRbmDoVNWnG6xg=", + "lastModified": 1717946608, + "narHash": "sha256-YtqFGpsbPXBp8hvuzYYTrxVrBuxb+MNcPVsOeebLvxY=", "ref": "refs/heads/main", - "rev": "c95845b1488b4bd63e901cbdc4cb68c27a45971b", - "revCount": 4766, + "rev": "4168b8c17b12b90873fab1ca73c2981b53f48bf5", + "revCount": 4786, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -240,11 +235,11 @@ ] }, "locked": { - "lastModified": 1717171694, - "narHash": "sha256-LN2lrcGdAMpkooleWSOV+/q1+wx1f3pSBs1TWeoMCkA=", + "lastModified": 1717837954, + "narHash": "sha256-chdXRv+JoiLQ9xwwq4q14X14em94VQaxk+tzkxRnQ5c=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "e0cad229c3d799c7f72b1217ab2eb300ceecf3ac", + "rev": "8571aa9badf7db9c4911018a5611c038cc776256", "type": "github" }, "original": { @@ -317,11 +312,11 @@ ] }, "locked": { - "lastModified": 1716058375, - "narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=", + "lastModified": 1717784906, + "narHash": "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "3afed4364790aebe0426077631af1e164a9650cc", + "rev": "0f30f9eca6e404130988554accbb64d1c9ec877d", "type": "github" }, "original": { @@ -357,11 +352,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1717602782, + "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", "type": "github" }, "original": { @@ -389,16 +384,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1717265169, - "narHash": "sha256-IITcGd6xpNoyq9SZBigCkv4+qMHSqot0RDPR4xsZ2CA=", + "lastModified": 1717880976, + "narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3b1b4895b2c5f9f5544d02132896aeb9ceea77bc", - "lastModified": 1716655032, - "narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "59a450646ec8ee0397f5fa54a08573e8240eb91f", + "rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c", "type": "github" }, "original": { @@ -410,16 +400,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1717196966, - "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", + "lastModified": 1717786204, + "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", - "lastModified": 1716948383, - "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", + "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", "type": "github" }, "original": { @@ -446,16 +431,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1717555607, - "narHash": "sha256-WZ1s48OODmRJ3DHC+I/DtM3tDRuRJlNqMvxvAPTD7ec=", + "lastModified": 1717696253, + "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0b8e7a1ae5a94da2e1ee3f3030a32020f6254105", - "lastModified": 1716991068, - "narHash": "sha256-Av0UWCCiIGJxsZ6TFc+OiKCJNqwoxMNVYDBChmhjNpo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "25cf937a30bf0801447f6bf544fc7486c6309234", + "rev": "9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b", "type": "github" }, "original": { @@ -540,16 +520,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1717455931, - "narHash": "sha256-8Q6mKSsto8gaGczXd4G0lvawdAYLa5Dlh3/g4hl5CaM=", + "lastModified": 1717902109, + "narHash": "sha256-OQTjaEZcByyVmHwJlKp/8SE9ikC4w+mFd3X0jJs6wiA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d4555e80d80d2fa77f0a44201ca299f9602492a0", - "lastModified": 1716692524, - "narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=", - "owner": "Mic92", - "repo": "sops-nix", - "rev": "962797a8d7f15ed7033031731d0bb77244839960", + "rev": "f0922ad001829b400f0160ba85b47d252fa3d925", "type": "github" }, "original": { diff --git a/system-modules/boot.nix b/system-modules/boot.nix index 1c09650..da24739 100755 --- a/system-modules/boot.nix +++ b/system-modules/boot.nix @@ -25,7 +25,7 @@ #theme = grub-theme-ascii-diana; #font = "${grub-theme-ascii-diana}/unicode.pf2"; fontSize = 50; - splashImage = null; + # splashImage = null; extraEntries = if host == "NxXPS" then '' menuentry 'Windows 11' --class windows --class os $menuentry_id_option 'osprober-efi-0A97-7A2D' { diff --git a/system-modules/sops.nix b/system-modules/sops.nix index 4a00376..717f9ff 100644 --- a/system-modules/sops.nix +++ b/system-modules/sops.nix @@ -9,12 +9,8 @@ defaultSopsFile = ../sops-secrets.yaml; defaultSopsFormat = "yaml"; # age = { - # # keyFile = "/home/${user}/.config/sops/age/keys.txt"; - # # keyFile = "/var/lib/sops-nix/key.txt"; - # # keyFile = "/home/${user}/.config/sops/age/age-public-key-from-ssh-A-subkey.txt"; - # sshKeyPaths = [ ]; - # # sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; - # # generateKey = true; + # sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; + # generateKey = true; # }; # gnupg = { # sshKeyPaths = []; @@ -23,3 +19,4 @@ secrets.example = {}; }; } +