diff --git a/flake.nix b/flake.nix index e2f03e9..fe93489 100644 --- a/flake.nix +++ b/flake.nix @@ -15,10 +15,8 @@ system = "x86_64-linux"; username = "opdavies"; - pkgs = inputs.nixpkgs.legacyPackages.${system}; - - mkNixos = import ./lib/nixos {inherit inputs pkgs self system username;}; - mkWsl = import ./lib/wsl2 {inherit inputs pkgs self system username;}; + mkNixos = import ./lib/nixos {inherit inputs self system username;}; + mkWsl = import ./lib/wsl2 {inherit inputs self system username;}; in flake-parts.lib.mkFlake {inherit inputs;} { systems = ["x86_64-linux"]; diff --git a/lib/nixos/configuration.nix b/lib/nixos/configuration.nix index e15cbbc..fd7853e 100644 --- a/lib/nixos/configuration.nix +++ b/lib/nixos/configuration.nix @@ -1,9 +1,8 @@ { inputs, desktop ? false, - pkgs, system, -}: let +}: {pkgs, ...}: let configure-gtk = pkgs.writeTextFile { name = "configure-gtk"; destination = "/bin/configure-gtk"; @@ -20,11 +19,7 @@ username = "opdavies"; in { - nixpkgs = { - config = { - allowUnfree = true; - }; - }; + nixpkgs.config.allowUnfree = true; # Bootloader. boot.loader.systemd-boot.enable = true; @@ -137,6 +132,7 @@ in { arandr dunst libnotify + obsidian rclone rclone-browser diff --git a/lib/nixos/default.nix b/lib/nixos/default.nix index 1ba1d17..ad2718b 100644 --- a/lib/nixos/default.nix +++ b/lib/nixos/default.nix @@ -1,13 +1,12 @@ { inputs, - pkgs, self, system, username, }: { desktop ? false, }: let - configuration = import ./configuration.nix {inherit desktop inputs pkgs system;}; + configuration = import ./configuration.nix {inherit desktop inputs system;}; hardwareConfiguration = import ./hardware-configuration.nix; in inputs.nixpkgs.lib.nixosSystem {