diff --git a/flake.lock b/flake.lock index f7f8c3c..68f335b 100644 --- a/flake.lock +++ b/flake.lock @@ -19,9 +19,7 @@ "agenix": { "inputs": { "darwin": "darwin", - "home-manager": [ - "home-manager" - ], + "home-manager": "home-manager", "nixpkgs": [ "nixpkgs" ], @@ -150,16 +148,14 @@ }, "dzgui-nix": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1718144257, - "narHash": "sha256-rgRnU05sgqdDpxF3n6oaGUOGbW0xehijrBNr3DJnN3U=", + "lastModified": 1715128199, + "narHash": "sha256-mj23cBtiDKy3pgg+J26UA8giZgmJApO8IQlC6+XTAx8=", "owner": "lelgenio", "repo": "dzgui-nix", - "rev": "c0aa386e8c08946dc2b8713e59a77cb6079a0b62", + "rev": "03968bade43d23c47e8b4f102c711c171c446645", "type": "github" }, "original": { @@ -376,6 +372,27 @@ } }, "home-manager": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -419,9 +436,7 @@ "nix-software-center": { "inputs": { "nixos-appstream-data": "nixos-appstream-data", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_2", "utils": "utils" }, "locked": { @@ -467,9 +482,7 @@ "nixos-conf-editor": { "inputs": { "flake-compat": "flake-compat_2", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_3", "snowfall-lib": "snowfall-lib" }, "locked": { @@ -493,9 +506,7 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-24_05": [ - "nixpkgs" - ], + "nixpkgs-24_05": "nixpkgs-24_05", "utils": "utils_2" }, "locked": { @@ -514,6 +525,68 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1714562304, + "narHash": "sha256-Mr3U37Rh6tH0FbaDFu0aZDwk9mPAe7ASaqDOGgLqqLU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "bcd44e224fd68ce7d269b4f44d24c2220fd821e7", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixpkgs-unstable", + "type": "indirect" + } + }, + "nixpkgs-24_05": { + "locked": { + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-24.05", + "type": "indirect" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1692638711, + "narHash": "sha256-J0LgSFgJVGCC1+j5R2QndadWI1oumusg6hCtYAzLID4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "91a22f76cd1716f9d0149e8a5c68424bb691de15", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1698318101, + "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1717281328, "narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=", @@ -566,12 +639,12 @@ "demoji": "demoji", "dhist": "dhist", "dzgui-nix": "dzgui-nix", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "nix-index-database": "nix-index-database", "nix-software-center": "nix-software-center", "nixos-conf-editor": "nixos-conf-editor", "nixos-mailserver": "nixos-mailserver", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_4", "plymouth-themes": "plymouth-themes", "ranger-icons": "ranger-icons", "tlauncher": "tlauncher", diff --git a/flake.nix b/flake.nix index efe0d7a..ae7eea7 100644 --- a/flake.nix +++ b/flake.nix @@ -19,18 +19,15 @@ agenix = { url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.home-manager.follows = "home-manager"; }; nixos-mailserver = { url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.nixpkgs-24_05.follows = "nixpkgs"; }; dzgui-nix = { url = "github:lelgenio/dzgui-nix"; - inputs.nixpkgs.follows = "nixpkgs"; }; tlauncher = { @@ -53,14 +50,8 @@ }; # gnome stuff - nixos-conf-editor = { - url = "github:vlinkz/nixos-conf-editor"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nix-software-center = { - url = "github:vlinkz/nix-software-center"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + nixos-conf-editor.url = "github:vlinkz/nixos-conf-editor"; + nix-software-center.url = "github:vlinkz/nix-software-center"; }; outputs = inputs: diff --git a/system/containers.nix b/system/containers.nix index 19698e5..377647d 100644 --- a/system/containers.nix +++ b/system/containers.nix @@ -1,18 +1,10 @@ { pkgs, ... }: { services.flatpak.enable = true; - - virtualisation.docker = { - enable = true; - autoPrune = { - enable = true; - dates = "monthly"; - flags = [ - "--all" - "--volumes" - ]; - }; - }; + virtualisation.docker.enable = true; + virtualisation.docker.autoPrune.enable = true; + virtualisation.docker.autoPrune.dates = "monthly"; + virtualisation.docker.autoPrune.flags = [ "--all --volumes" ]; programs.extra-container.enable = true; diff --git a/user/firefox.nix b/user/firefox.nix index 0fab5dd..207ebb6 100644 --- a/user/firefox.nix +++ b/user/firefox.nix @@ -54,12 +54,6 @@ in url = "https://addons.mozilla.org/firefox/downloads/file/4050795/youtube_recommended_videos-1.6.2.xpi"; hash = "sha256-xMuglNassZb9WqjfEGg6WeuhMACRuYqQor+iX1dEdsE="; }) - (pkgs.fetchFirefoxAddon { - name = "return_youtube_dislikes"; - url = "https://addons.mozilla.org/firefox/downloads/file/4208483/return_youtube_dislikes-3.0.0.14.xpi"; - hash = "sha256-oxqyNUmEa36rkqCU6S34NJBHtIu9gH8GnRKAg8Oyf2E="; - }) - (pkgs.fetchFirefoxAddon { name = "mastodon_simplified_federation"; url = "https://addons.mozilla.org/firefox/downloads/file/4215691/mastodon_simplified_federation-2.2.xpi";