From 80b82185b655dad4056e212f9967fefe602352ce Mon Sep 17 00:00:00 2001 From: Martin Benonisen Date: Mon, 8 Jul 2024 00:05:51 +0200 Subject: [PATCH] nope. --- flake.lock | 200 +---------------------------------- flake.nix | 4 +- hosts/zedd/configuration.nix | 5 +- system/programs.nix | 1 - user/default.nix | 2 - user/packages/default.nix | 2 +- 6 files changed, 4 insertions(+), 210 deletions(-) diff --git a/flake.lock b/flake.lock index 5f12b71..32df989 100644 --- a/flake.lock +++ b/flake.lock @@ -1,23 +1,5 @@ { "nodes": { - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -38,116 +20,7 @@ "type": "github" } }, - "nix-citizen": { - "inputs": { - "nix-gaming": "nix-gaming", - "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs", - "systems": "systems", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1715057822, - "narHash": "sha256-JRRNuUNjbLWu2/jyKE7c4WHK9JioMyDKpuAR2rUVDgI=", - "owner": "LovingMelody", - "repo": "nix-citizen", - "rev": "6b5b307006bcb2ca2375eb02ae698ffbbed76c20", - "type": "github" - }, - "original": { - "owner": "LovingMelody", - "repo": "nix-citizen", - "type": "github" - } - }, - "nix-gaming": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": [ - "nix-citizen", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1720315345, - "narHash": "sha256-B7CRTjGf0Nll2RouHAzLsOt5L0u04JTN4vetrGXXmUk=", - "owner": "fufexan", - "repo": "nix-gaming", - "rev": "96379e6b4d1f234ffd4bbe684d83a3d08a3dd2a7", - "type": "github" - }, - "original": { - "owner": "fufexan", - "repo": "nix-gaming", - "type": "github" - } - }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "nix-citizen", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1703863825, - "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=", - "owner": "nix-community", - "repo": "nix-github-actions", - "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-github-actions", - "type": "github" - } - }, "nixpkgs": { - "locked": { - "lastModified": 1715008058, - "narHash": "sha256-Tdlna0uGWvQzGwc/7kL1ICx/fqJaBfFJAmrkKP+cZS4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "860e65d27036476edfb85dd847d982277880b143", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1719876945, - "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1713537308, "narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=", @@ -163,81 +36,10 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1710534455, - "narHash": "sha256-huQT4Xs0y4EeFKn2BTBVYgEwJSv8SDlm82uWgMnCMmI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9af9c1c87ed3e3ed271934cb896e0cdd33dae212", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "home-manager": "home-manager", - "nix-citizen": "nix-citizen", - "nixpkgs": "nixpkgs_2", - "sops-nix": "sops-nix" - } - }, - "sops-nix": { - "inputs": { - "nixpkgs": "nixpkgs_3", - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1720321395, - "narHash": "sha256-kcI8q9Nh8/CSj0ygfWq1DLckHl8IHhFarL8ie6g7OEk=", - "owner": "Mic92", - "repo": "sops-nix", - "rev": "c184aca4db5d71c3db0c8cbfcaaec337a5d065ea", - "type": "github" - }, - "original": { - "id": "sops-nix", - "type": "indirect" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "id": "systems", - "type": "indirect" - } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nix-citizen", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1714058656, - "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 5407148..be0a068 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,6 @@ # ... - nix-citizen.url = "github:LovingMelody/nix-citizen"; # Optional - updates underlying without waiting for nix-citizen to update @@ -20,7 +19,7 @@ outputs = { self , nixpkgs - , sops-nix + , home-manager , ... }@inputs: let @@ -35,7 +34,6 @@ modules = [ ({ config, pkgs, ... }: { }) ./hosts/zedd - sops-nix.nixosModules.sops ]; }; }; diff --git a/hosts/zedd/configuration.nix b/hosts/zedd/configuration.nix index e02b2ed..099a6d7 100644 --- a/hosts/zedd/configuration.nix +++ b/hosts/zedd/configuration.nix @@ -5,6 +5,7 @@ environment.pathsToLink = [ "/libexec" ]; users.users.mbeno.extraGroups = [ "adbusers" ]; programs.adb.enable = true; + system.autoUpgrade.enable = true; # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -59,10 +60,6 @@ # Allow unfree packages nixpkgs.config.allowUnfree = true; nix.settings.experimental-features = [ "nix-command" "flakes" ]; - nix.settings = { - substituters = [ "https://nix-gaming.cachix.org" ]; - trusted-public-keys = [ "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" ]; - }; virtualisation.docker.enable = true; virtualisation.docker.liveRestore = false; system.stateVersion = "23.11"; # Did you read the comment? diff --git a/system/programs.nix b/system/programs.nix index 52e2fa7..c9a13fc 100644 --- a/system/programs.nix +++ b/system/programs.nix @@ -57,7 +57,6 @@ nil nixpkgs-fmt curl - jellyfin-media-player git libnotify usbutils diff --git a/user/default.nix b/user/default.nix index 48baa07..68453dd 100644 --- a/user/default.nix +++ b/user/default.nix @@ -6,8 +6,6 @@ extraSpecialArgs = { inherit pkgs inputs user; }; users.${user} = { pkgs, ... }: { imports = [ - inputs.sops-nix.homeManagerModules.sops - ./sops ./programs/neovim ./programs/firefox ./programs/tmux diff --git a/user/packages/default.nix b/user/packages/default.nix index 8ddf70f..9fa0060 100644 --- a/user/packages/default.nix +++ b/user/packages/default.nix @@ -1,9 +1,9 @@ { pkgs, inputs, ... }: { home.packages = with pkgs; [ # Generic tools - inputs.nix-citizen.packages.${system}.star-citizen age discord + jellyfin-media-player pdfpc qpwgraph mixxx