diff --git a/modules/.examples/umport.nix b/modules/.examples/umport.nix deleted file mode 100755 index 489e604..0000000 --- a/modules/.examples/umport.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - imports = inputs.nypkgs.legacyPackages.${pkgs.system}.lib.umport { - path = ./.; - include = [ - ./somed4/somef3.nix - ]; - exclude = [ - ./somed4 - ./somef4.nix - ]; - }; -} diff --git a/modules/essentials/default.nix b/modules/essentials/default.nix index 519c375..eddbfce 100755 --- a/modules/essentials/default.nix +++ b/modules/essentials/default.nix @@ -5,7 +5,6 @@ { imports = [ ./packages.nix - ./programs.nix ./services.nix ./settings.nix ./tty.nix diff --git a/modules/essentials/packages.nix b/modules/essentials/packages.nix index 27b6643..6e89811 100755 --- a/modules/essentials/packages.nix +++ b/modules/essentials/packages.nix @@ -60,4 +60,31 @@ nftables ]; }; + programs = { + git = { + enable = true; + config = { + user = { + name = "oqyude"; + email = "oqyude@gmail.com"; + }; + }; + }; + lazygit.enable = true; + yazi = { + enable = true; + }; + bat.enable = true; + command-not-found.enable = false; + nix-index.enable = true; + nh = { + enable = true; + flake = "/etc/nixos"; + clean = { + enable = true; + extraArgs = "--keep 3 --keep-since 2d"; + dates = "daily"; + }; + }; + }; } diff --git a/modules/essentials/programs.nix b/modules/essentials/programs.nix deleted file mode 100755 index 19b15ea..0000000 --- a/modules/essentials/programs.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - config, - ... -}: -{ - programs = { - git = { - enable = true; - config = { - user = { - name = "oqyude"; - email = "oqyude@gmail.com"; - }; - }; - }; - lazygit.enable = true; - yazi = { - enable = true; - }; - bat.enable = true; - command-not-found.enable = false; - nix-index.enable = true; - nh = { - enable = true; - flake = "/etc/nixos"; - clean = { - enable = true; - extraArgs = "--keep 3 --keep-since 2d"; - dates = "daily"; - }; - }; - }; -}