From f208a8b3733312947b8a31dbd2f1f94bb504d3ed Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Thu, 23 May 2024 18:48:43 +0200 Subject: [PATCH] removing obsolete package and cleaning up --- flake.lock | 75 ++++++++++--------- modules/nixos/apps/onedrive/default.nix | 3 - modules/nixos/home/default.nix | 4 +- modules/nixos/nix/default.nix | 2 +- modules/nixos/security/sops/default.nix | 4 +- .../system/hardware/gpu/nvidia/default.nix | 3 - secrets/secrets.yaml | 5 +- 7 files changed, 45 insertions(+), 51 deletions(-) diff --git a/flake.lock b/flake.lock index 4cf91f4..9d07547 100644 --- a/flake.lock +++ b/flake.lock @@ -88,15 +88,16 @@ "flake-compat_5": { "flake": false, "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { "owner": "edolstra", + "ref": "v1.0.1", "repo": "flake-compat", "type": "github" } @@ -232,16 +233,17 @@ "flake-utils": "flake-utils_7" }, "locked": { - "lastModified": 1696331477, - "narHash": "sha256-YkbRa/1wQWdWkVJ01JvV+75KIdM37UErqKgTf0L54Fk=", + "lastModified": 1715533576, + "narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=", "owner": "gytis-ivaskevicius", "repo": "flake-utils-plus", - "rev": "bfc53579db89de750b25b0c5e7af299e0c06d7d3", + "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", "type": "github" }, "original": { "owner": "gytis-ivaskevicius", "repo": "flake-utils-plus", + "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", "type": "github" } }, @@ -437,11 +439,11 @@ ] }, "locked": { - "lastModified": 1715930644, - "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", + "lastModified": 1716457508, + "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=", "owner": "nix-community", "repo": "home-manager", - "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", + "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05", "type": "github" }, "original": { @@ -539,11 +541,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1715881912, - "narHash": "sha256-e4LJk5uV1wvrRkffGFZekPWvFUx29NnnOahBlLaq8Ek=", + "lastModified": 1716173274, + "narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "ff1be1e3cdf884df0935ab28745ab13c3c26d828", + "rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191", "type": "github" }, "original": { @@ -604,11 +606,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1715458492, - "narHash": "sha256-q0OFeZqKQaik2U8wwGDsELEkgoZMK7gvfF6tTXkpsqE=", + "lastModified": 1716061101, + "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8e47858badee5594292921c2668c11004c3b0142", + "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2", "type": "github" }, "original": { @@ -620,11 +622,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1715787315, - "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", + "lastModified": 1716330097, + "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", + "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", "type": "github" }, "original": { @@ -636,11 +638,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1715413075, - "narHash": "sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4=", + "lastModified": 1716062047, + "narHash": "sha256-OhysviwHQz4p2HZL4g7XGMLoUbWMjkMr/ogaR3VUYNA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4e7a43a9db7e22613accfeb1005cca1b2b1ee0d", + "rev": "02923630b89aa1ab36ef8e422501a6f4fd4b2016", "type": "github" }, "original": { @@ -780,11 +782,11 @@ "snowfall-lib": "snowfall-lib_2" }, "locked": { - "lastModified": 1709228099, - "narHash": "sha256-5CCeUQbIPasl9WIiqZHucHCsf9uFl3VZ7Ay+eNA1GU0=", + "lastModified": 1716444083, + "narHash": "sha256-CRZrai0zuVSncU5+phQ9bIJ3mmgOx75beJHVuVeJsgU=", "owner": "snowfallorg", "repo": "flake", - "rev": "3dbad05e44aaee77342e386238c823733fffad20", + "rev": "b05c4c706f323bd76b3b2827d82bad6b5aafa8cc", "type": "github" }, "original": { @@ -826,15 +828,16 @@ ] }, "locked": { - "lastModified": 1694679207, - "narHash": "sha256-g6lYb6nXMpxYUVRZNRZPZI+L31xWlwF/r/oWZmiSYpo=", + "lastModified": 1716433572, + "narHash": "sha256-JzUSwdANQyTVZiKkTpGVB9rTCu2y8kn3vbrp8kUsozE=", "owner": "snowfallorg", "repo": "lib", - "rev": "8df9cb69f2ee4199c2879baaafce4e13864496a7", + "rev": "c58023878d6720c525446cb67d8fcbe7c3a5d84c", "type": "github" }, "original": { "owner": "snowfallorg", + "ref": "v3.0.0", "repo": "lib", "type": "github" } @@ -848,11 +851,11 @@ ] }, "locked": { - "lastModified": 1715107207, - "narHash": "sha256-Lq38yoHyY8t+zkVdpYlr2Fonb89Id4o5zgIfz8KCB8Y=", + "lastModified": 1716456697, + "narHash": "sha256-05gmA4Kc0nISkRGpWRvVWk+rgukNosnHdEfwObPsRJM=", "owner": "snowfallorg", "repo": "lib", - "rev": "299b24861ebfa98a5b586dfa9ec8138ab6a4c626", + "rev": "34c1697a5346b6e8d6cd123295ae07399f47634d", "type": "github" }, "original": { @@ -867,11 +870,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1715482972, - "narHash": "sha256-y1uMzXNlrVOWYj1YNcsGYLm4TOC2aJrwoUY1NjQs9fM=", + "lastModified": 1716400300, + "narHash": "sha256-0lMkIk9h3AzOHs1dCL9RXvvN4PM8VBKb+cyGsqOKa4c=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b6cb5de2ce57acb10ecdaaf9bbd62a5ff24fa02e", + "rev": "b549832718b8946e875c016a4785d204fcfc2e53", "type": "github" }, "original": { @@ -988,11 +991,11 @@ }, "unstable_2": { "locked": { - "lastModified": 1715787315, - "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", + "lastModified": 1716330097, + "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", + "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", "type": "github" }, "original": { diff --git a/modules/nixos/apps/onedrive/default.nix b/modules/nixos/apps/onedrive/default.nix index 9e28521..cb00866 100644 --- a/modules/nixos/apps/onedrive/default.nix +++ b/modules/nixos/apps/onedrive/default.nix @@ -1,7 +1,6 @@ { lib, config, - pkgs, ... }: with lib; @@ -15,8 +14,6 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ onedrivegui ]; - services.onedrive = { enable = true; }; diff --git a/modules/nixos/home/default.nix b/modules/nixos/home/default.nix index d6cf208..2befa77 100644 --- a/modules/nixos/home/default.nix +++ b/modules/nixos/home/default.nix @@ -1,9 +1,7 @@ { options, config, - pkgs, lib, - inputs, ... }: with lib; @@ -28,7 +26,7 @@ in xdg.configFile = mkAliasDefinitions options.wyrdgard.home.configFile; }; - snowfallorg.user.${config.wyrdgard.user.name}.home.config = config.wyrdgard.home.extraOptions; + snowfallorg.users.${config.wyrdgard.user.name}.home.config = config.wyrdgard.home.extraOptions; home-manager = { useUserPackages = true; diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix index eec9a97..c9fcc39 100644 --- a/modules/nixos/nix/default.nix +++ b/modules/nixos/nix/default.nix @@ -20,7 +20,7 @@ in config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ snowfallorg.flake - nixfmt + nixfmt-rfc-style nix-prefetch-git nix-du ]; diff --git a/modules/nixos/security/sops/default.nix b/modules/nixos/security/sops/default.nix index 8a3db4b..421934b 100644 --- a/modules/nixos/security/sops/default.nix +++ b/modules/nixos/security/sops/default.nix @@ -1,9 +1,7 @@ { - options, config, pkgs, lib, - inputs, ... }: with lib; @@ -23,7 +21,7 @@ in ]; sops = { - defaultSopsFile = ../../../../secrets/secrets.yaml; + defaultSopsFile = lib.snowfall.fs.get-file "secrets/secrets.yaml"; defaultSopsFormat = "yaml"; age.keyFile = "/home/cholli/.config/sops/age/keys.txt"; diff --git a/modules/nixos/system/hardware/gpu/nvidia/default.nix b/modules/nixos/system/hardware/gpu/nvidia/default.nix index 0983f3b..42617ab 100644 --- a/modules/nixos/system/hardware/gpu/nvidia/default.nix +++ b/modules/nixos/system/hardware/gpu/nvidia/default.nix @@ -1,8 +1,6 @@ { lib, - pkgs, config, - options, ... }: with lib; @@ -32,6 +30,5 @@ in }; services.xserver.videoDrivers = [ "nvidia" ]; - services.displayManager.sddm.wayland.enable = lib.mkForce false; }; } diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index d8f1f76..d946f16 100644 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -2,6 +2,7 @@ factorio_username: ENC[AES256_GCM,data:rI7vF0XlaQ==,iv:+d5dD+nawphw+g8zavFXUr87bewTL1d+fuFnYKuYJKc=,tag:B8/6I7zi0b6xo8TFsY35Ug==,type:str] factorio_token: ENC[AES256_GCM,data:0JOQv4UGiz2j2KPEoNm2IuE3qt8XfKuVEBWJ2+fF,iv:EUc8vhrB5NcgFKO7xTCxG2PzUuFCJFIl1KB90NqCOXw=,tag:rCilwxD8sw+Ql5HzvcUEJQ==,type:str] factorio_game_password: ENC[AES256_GCM,data:OWETag==,iv:jkru1eLic7rl5RJVOMfF4cyT3FBGYCj3EKkpvMF22dk=,tag:sypcyM8ixpNdG70xiOzVIg==,type:str] +nixpkgs_review_auth: ENC[AES256_GCM,data:4zd7nThKhMMQxuxVdGZFUyJJ3rDBC29h9ydGmjKBEFy9Lz5X9TCf3w==,iv:u3aasLXSqer50RZDvvwGr0mwEoyywWaMr6q9VhPZieg=,tag:/rfQ4LHfJsvFYH+4hBe4LQ==,type:str] sops: kms: [] gcp_kms: [] @@ -17,8 +18,8 @@ sops: TzdjVjVtWmxNNm96WHhXSGM4WjErMkEKoGtyn6M91h+ye8U/ltOuOQ74RUo/2R37 l5vR47FUyzilUliIK2PDUMXM/S3Yk3Zi6g3XL8OPd53X5I1UYUJmRw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-04-27T18:23:44Z" - mac: ENC[AES256_GCM,data:U1Q5GQKV804mzs91/cgbHbdj96wZSdBQNj6U0Iw3Ybg4kgGbIdIP13gXzX/etoFTJzcy7JB4812KAjwoAFDcMjMtTADHIg8fo4zrSUm/FVVoX+SpVqtAqKprFOGgnX7DzAlUqlseZOZF05gmf7tz6vc2QUY4V8BvfTqfdFVrSHE=,iv:8nxqbUmstmf9nESDzcHtljH879lIyxE+JvnbVo/h3Tg=,tag:3cXhHBaQPc0dC6742ow3wA==,type:str] + lastmodified: "2024-05-22T09:21:53Z" + mac: ENC[AES256_GCM,data:vKJ/Ro7qy6bYr/UqMEpBHA6WPyawuki36kdu1GIpT0SkXT9epvTivi/rNb+BnQp19ahLhIqZ4jS5yzmmEztAHZc9e4QPk6IzFPJeXDt91nLdggwE7s5ZdUT+C+DDO2X0/vw/Pa6VS11NkWZeNAyoT7FdDTFfgCWWv5cGQYFYm8M=,iv:7Hj02cImojjFahxVtRFtdStrjOf/vpgKinKCdetepMg=,tag:n2u2f0P5kU90QJPGUnDzQw==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1