From 860eba085f38e759fae81d2ad9f3f13686f4ce5d Mon Sep 17 00:00:00 2001 From: Aner Zakobar Date: Fri, 23 Aug 2024 05:39:44 +0300 Subject: [PATCH] Reorganized --- .gitignore | 5 ++++- home-manager/base/default.nix | 13 +++++++++++++ home-manager/{ => base}/gpg-agent.conf | 0 home-manager/{ => base}/gpg-agent.nix | 0 home-manager/base/name.nix | 4 ++++ home-manager/home.nix | 18 ++++++------------ 6 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 home-manager/base/default.nix rename home-manager/{ => base}/gpg-agent.conf (100%) rename home-manager/{ => base}/gpg-agent.nix (100%) create mode 100644 home-manager/base/name.nix diff --git a/.gitignore b/.gitignore index e2f5dd2..820090a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ -result \ No newline at end of file +result +.#* +*.qcow2 + diff --git a/home-manager/base/default.nix b/home-manager/base/default.nix new file mode 100644 index 0000000..abbf974 --- /dev/null +++ b/home-manager/base/default.nix @@ -0,0 +1,13 @@ +#https://xeiaso.net/talks/asg-2023-nixos/ example +{ lib, config, pkgs, ... }:{ + imports = [./gpg-agent.nix + ./name.nix]; + + #OPTIONS + options.azos.name = lib.mkOption{ + default = "YOUR NAME HERE"; + type = lib.types.str; + description = "Your full name."; + }; + +} diff --git a/home-manager/gpg-agent.conf b/home-manager/base/gpg-agent.conf similarity index 100% rename from home-manager/gpg-agent.conf rename to home-manager/base/gpg-agent.conf diff --git a/home-manager/gpg-agent.nix b/home-manager/base/gpg-agent.nix similarity index 100% rename from home-manager/gpg-agent.nix rename to home-manager/base/gpg-agent.nix diff --git a/home-manager/base/name.nix b/home-manager/base/name.nix new file mode 100644 index 0000000..b25a809 --- /dev/null +++ b/home-manager/base/name.nix @@ -0,0 +1,4 @@ +#https://xeiaso.net/talks/asg-2023-nixos/ example +{ lib, config, pkgs, ... }:{ + home.file."name.txt".text = ''${config.azos.name}''; +} diff --git a/home-manager/home.nix b/home-manager/home.nix index 600cdcc..adbb4a4 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -18,7 +18,10 @@ # You can also split up your configuration and import pieces of it here: # ./nvim.nix - ./gpg-agent.nix + # ./gpg-agent.nix + # ./options.nix + # ./name.nix + ./base ]; nixpkgs = { @@ -49,26 +52,18 @@ }; azos.gpgagent.enable = true; + azos.name = "Aner Zakobar"; # TODO: Set your username home = { username = "aner"; homeDirectory = "/home/aner"; - - }; - # config = { - # #My config stuff - # azos.gpg-agent.enable = true; - # }; - # home.config.azos.gpg-agent.enable = true; - - # Add stuff for your user as you see fit: # programs.neovim.enable = true; home.packages = with pkgs; [ - steam + # steam emacs pandoc offlineimap #emailing @@ -84,7 +79,6 @@ programs.home-manager.enable = true; programs.git.enable = true; - # Nicely reload system units when changing configs systemd.user.startServices = "sd-switch";