From f7e2c26626403d4c1a235b4f97dd6ebc1a17d3a9 Mon Sep 17 00:00:00 2001 From: gpskwlkr Date: Tue, 26 Mar 2024 23:55:25 +0400 Subject: [PATCH] update & fixes --- flake.nix | 2 +- home/user/gtk.nix | 1 + home/user/packages.nix | 2 ++ home/user/programs.nix | 1 + configuration.nix => system/configuration.nix | 3 ++- .../hardware-configuration.nix | 0 system/modules/nixsettings.nix | 2 ++ 7 files changed, 9 insertions(+), 2 deletions(-) rename configuration.nix => system/configuration.nix (84%) rename hardware-configuration.nix => system/hardware-configuration.nix (100%) diff --git a/flake.nix b/flake.nix index cc97418..687d850 100644 --- a/flake.nix +++ b/flake.nix @@ -30,7 +30,7 @@ nixosConfigurations.nixos-personal = lib.nixosSystem { inherit system; modules = [ - ./configuration.nix + ./system/configuration.nix lanzaboote.nixosModules.lanzaboote ]; specialArgs = { diff --git a/home/user/gtk.nix b/home/user/gtk.nix index 938f1bd..c5a2b6a 100644 --- a/home/user/gtk.nix +++ b/home/user/gtk.nix @@ -1,3 +1,4 @@ +{ pkgs, ... }: { gtk = { enable = true; diff --git a/home/user/packages.nix b/home/user/packages.nix index 5fbda0a..0418a40 100644 --- a/home/user/packages.nix +++ b/home/user/packages.nix @@ -1,3 +1,5 @@ +{ pkgs, pkgs-unstable, ... }: + { nixpkgs = { config = { diff --git a/home/user/programs.nix b/home/user/programs.nix index f2d64d1..accdf18 100644 --- a/home/user/programs.nix +++ b/home/user/programs.nix @@ -1,3 +1,4 @@ +{ inputs, ... }: { programs.firefox = { enable = true; diff --git a/configuration.nix b/system/configuration.nix similarity index 84% rename from configuration.nix rename to system/configuration.nix index d3f28ce..d044195 100644 --- a/configuration.nix +++ b/system/configuration.nix @@ -3,9 +3,10 @@ { imports = [ ./hardware-configuration.nix - ./system/modules + ./modules ]; + system.stateVersion = "23.11"; } diff --git a/hardware-configuration.nix b/system/hardware-configuration.nix similarity index 100% rename from hardware-configuration.nix rename to system/hardware-configuration.nix diff --git a/system/modules/nixsettings.nix b/system/modules/nixsettings.nix index a8215aa..ac1ae54 100644 --- a/system/modules/nixsettings.nix +++ b/system/modules/nixsettings.nix @@ -3,6 +3,8 @@ { documentation.nixos.enable = false; + nixpkgs.config.allowUnfree = true; + nix = { settings = { warn-dirty = false;