diff --git a/flake.lock b/flake.lock index db709a1..71cdaaa 100644 --- a/flake.lock +++ b/flake.lock @@ -3,7 +3,9 @@ "agenix": { "inputs": { "darwin": "darwin", - "home-manager": "home-manager", + "home-manager": [ + "home-manager" + ], "nixpkgs": [ "nixpkgs" ], @@ -104,36 +106,15 @@ "home-manager": { "inputs": { "nixpkgs": [ - "agenix", "nixpkgs" ] }, "locked": { - "lastModified": 1745494811, - "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", + "lastModified": 1750730235, + "narHash": "sha256-rZErlxiV7ssvI8t7sPrKU+fRigNc2KvoKZG3gtUtK50=", "owner": "nix-community", "repo": "home-manager", - "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1750654717, - "narHash": "sha256-YXlhTUGaLAY1rSosaRXO5RSGriEyF9BGdLkpKV+9jyI=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "4c9e99e8e8e36bcdfa9cdb102e45e4dc95aa5c5b", + "rev": "d07e9cceb4994ed64a22b9b36f8b76923e87ac38", "type": "github" }, "original": { @@ -226,11 +207,11 @@ }, "nixpkgs-small": { "locked": { - "lastModified": 1750666157, - "narHash": "sha256-5xSV9MLO0pqsaoGEDx2um0gvEZhMg0uIsR68NrQbiY8=", + "lastModified": 1750752886, + "narHash": "sha256-pP1ZBxEo44HbLDyXVPPK8BQO882eGKpW9zzXliGFA/8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3233bc422b7c868fe5c853e82888d5dbbbd9f0c6", + "rev": "83685a4ccd44d2d4c09f2e5f7773d2f3f2156121", "type": "github" }, "original": { @@ -246,7 +227,7 @@ "devshell": "devshell", "flake-registry": "flake-registry", "flake-utils": "flake-utils", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "homepage": "homepage", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", diff --git a/flake.nix b/flake.nix index 0cc4b5c..6ccece0 100644 --- a/flake.nix +++ b/flake.nix @@ -20,6 +20,7 @@ agenix = { url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.home-manager.follows = "home-manager"; }; devshell = { url = "github:numtide/devshell"; diff --git a/home/pkgs.nix b/home/pkgs.nix index 1a073ce..7a707e1 100644 --- a/home/pkgs.nix +++ b/home/pkgs.nix @@ -48,7 +48,6 @@ with pkgs; h # Manage git repos hexyl # hex viewer htop - http-prompt httpie hub hyperfine # A command-line benchmarking tool. diff --git a/nixos/gorgon/configuration.nix b/nixos/gorgon/configuration.nix index 9c8b8e3..0f14aa9 100644 --- a/nixos/gorgon/configuration.nix +++ b/nixos/gorgon/configuration.nix @@ -70,11 +70,10 @@ in }; }; }; - kernel.sysctl = { - "vm.swappiness" = 90; - }; }; + zramSwap.enable = true; + networking.hostName = "gorgon"; dadada = { @@ -136,14 +135,14 @@ in ]; }; - hardware.printers.ensurePrinters = [ - { - name = "Brother_HL-L2300D"; - model = "everywhere"; - location = "BS"; - deviceUri = "ipp://192.168.101.29:631/printers/Brother_HL-L2300D"; - } - ]; + #hardware.printers.ensurePrinters = [ + # { + # name = "Brother_HL-L2300D"; + # model = "everywhere"; + # location = "BS"; + # deviceUri = "ipp://192.168.101.29:631/printers/Brother_HL-L2300D"; + # } + #]; environment.systemPackages = with pkgs; [ android-studio