From 732a343ac692926c720b7faf191fe04527c94182 Mon Sep 17 00:00:00 2001 From: vali Date: Wed, 10 Apr 2024 17:44:54 +0200 Subject: [PATCH] fixed file structore --- flake.lock | 108 +++++++++++++++++--- hosts/{vali => }/configuration.nix | 0 hosts/default.nix | 22 ++-- hosts/{vali => }/hardware-configuration.nix | 0 hosts/{vali => }/profile.nix | 0 hosts/{vali => }/programs.nix | 0 hosts/vali/default.nix | 8 -- modules/{vali => }/cli/default.nix | 0 modules/{vali => }/cli/git.nix | 0 modules/{vali => }/cli/starship.nix | 0 modules/{vali => }/cli/zsh.nix | 0 modules/{vali => }/default.nix | 0 modules/{vali => }/graphics/default.nix | 0 modules/{vali => }/graphics/wms/i3wm.nix | 0 modules/{vali => }/gui/cursor.nix | 0 modules/{vali => }/gui/default.nix | 0 modules/{vali => }/gui/gtk.nix | 0 modules/{vali => }/gui/mpv.nix | 0 modules/{vali => }/gui/qt.nix | 0 modules/{vali => }/gui/schizofox.nix | 0 modules/{vali => }/other/default.nix | 0 modules/{vali => }/other/home-manager.nix | 0 modules/{vali => }/other/system.nix | 0 modules/{vali => }/other/xdg.nix | 0 modules/{vali => }/services/default.nix | 0 modules/{vali => }/services/pipewire.nix | 0 modules/{vali => }/terminal/st.nix | 0 modules/{vali => }/terminal/starship.nix | 0 modules/{vali => }/terminal/zsh.nix | 0 modules/{vali => }/tui/btop.nix | 0 modules/{vali => }/tui/default.nix | 0 modules/{vali => }/tui/neovim.nix | 0 32 files changed, 102 insertions(+), 36 deletions(-) rename hosts/{vali => }/configuration.nix (100%) rename hosts/{vali => }/hardware-configuration.nix (100%) rename hosts/{vali => }/profile.nix (100%) rename hosts/{vali => }/programs.nix (100%) delete mode 100644 hosts/vali/default.nix rename modules/{vali => }/cli/default.nix (100%) rename modules/{vali => }/cli/git.nix (100%) rename modules/{vali => }/cli/starship.nix (100%) rename modules/{vali => }/cli/zsh.nix (100%) rename modules/{vali => }/default.nix (100%) rename modules/{vali => }/graphics/default.nix (100%) rename modules/{vali => }/graphics/wms/i3wm.nix (100%) rename modules/{vali => }/gui/cursor.nix (100%) rename modules/{vali => }/gui/default.nix (100%) rename modules/{vali => }/gui/gtk.nix (100%) rename modules/{vali => }/gui/mpv.nix (100%) rename modules/{vali => }/gui/qt.nix (100%) rename modules/{vali => }/gui/schizofox.nix (100%) rename modules/{vali => }/other/default.nix (100%) rename modules/{vali => }/other/home-manager.nix (100%) rename modules/{vali => }/other/system.nix (100%) rename modules/{vali => }/other/xdg.nix (100%) rename modules/{vali => }/services/default.nix (100%) rename modules/{vali => }/services/pipewire.nix (100%) rename modules/{vali => }/terminal/st.nix (100%) rename modules/{vali => }/terminal/starship.nix (100%) rename modules/{vali => }/terminal/zsh.nix (100%) rename modules/{vali => }/tui/btop.nix (100%) rename modules/{vali => }/tui/default.nix (100%) rename modules/{vali => }/tui/neovim.nix (100%) diff --git a/flake.lock b/flake.lock index 2b0418b..d4890f8 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,26 @@ { "nodes": { + "agenix": { + "inputs": { + "darwin": "darwin", + "home-manager": "home-manager", + "nixpkgs": "nixpkgs", + "systems": "systems" + }, + "locked": { + "lastModified": 1712079060, + "narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=", + "owner": "ryantm", + "repo": "agenix", + "rev": "1381a759b205dff7a6818733118d02253340fd5e", + "type": "github" + }, + "original": { + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, "crane": { "inputs": { "nixpkgs": [ @@ -22,6 +43,28 @@ "type": "github" } }, + "darwin": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -105,6 +148,27 @@ } }, "home-manager": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -124,7 +188,7 @@ "type": "github" } }, - "home-manager_2": { + "home-manager_3": { "inputs": { "nixpkgs": [ "schizofox", @@ -173,15 +237,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1712608508, - "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", - "owner": "nixos", + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -207,11 +271,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1712608508, + "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", "type": "github" }, "original": { @@ -238,8 +302,9 @@ }, "root": { "inputs": { - "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "agenix": "agenix", + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs_2", "nur": "nur", "schizofox": "schizofox" } @@ -248,9 +313,11 @@ "inputs": { "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "home-manager": "home-manager_2", + "home-manager": "home-manager_3", "nixpak": "nixpak", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs" + ], "searx-randomizer": "searx-randomizer" }, "locked": { @@ -289,6 +356,21 @@ "repo": "searx-randomizer", "type": "github" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/hosts/vali/configuration.nix b/hosts/configuration.nix similarity index 100% rename from hosts/vali/configuration.nix rename to hosts/configuration.nix diff --git a/hosts/default.nix b/hosts/default.nix index 3fa13ac..fc2f103 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -1,16 +1,8 @@ -{ inputs, ... }: -let - inherit (inputs) self; - inherit (self) lib; -in { - vali = lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { inherit lib inputs self; }; - }; - modules = [ - ./vali - ../modules/vali - inputs.home-manager.noxosModules.home-manager - inputs.agenix.noxosModules.default - ]; +_: { + imports = [ + ./configuration.nix + ./programs.nix + ./hardware-configuration.nix + ./profile.nix + ]; } diff --git a/hosts/vali/hardware-configuration.nix b/hosts/hardware-configuration.nix similarity index 100% rename from hosts/vali/hardware-configuration.nix rename to hosts/hardware-configuration.nix diff --git a/hosts/vali/profile.nix b/hosts/profile.nix similarity index 100% rename from hosts/vali/profile.nix rename to hosts/profile.nix diff --git a/hosts/vali/programs.nix b/hosts/programs.nix similarity index 100% rename from hosts/vali/programs.nix rename to hosts/programs.nix diff --git a/hosts/vali/default.nix b/hosts/vali/default.nix deleted file mode 100644 index 4110339..0000000 --- a/hosts/vali/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -_: { - imports = [ - ./configuration.nix - ./programs.nix - ./hardware-configuration.nix - ./profile.nix - ] -} diff --git a/modules/vali/cli/default.nix b/modules/cli/default.nix similarity index 100% rename from modules/vali/cli/default.nix rename to modules/cli/default.nix diff --git a/modules/vali/cli/git.nix b/modules/cli/git.nix similarity index 100% rename from modules/vali/cli/git.nix rename to modules/cli/git.nix diff --git a/modules/vali/cli/starship.nix b/modules/cli/starship.nix similarity index 100% rename from modules/vali/cli/starship.nix rename to modules/cli/starship.nix diff --git a/modules/vali/cli/zsh.nix b/modules/cli/zsh.nix similarity index 100% rename from modules/vali/cli/zsh.nix rename to modules/cli/zsh.nix diff --git a/modules/vali/default.nix b/modules/default.nix similarity index 100% rename from modules/vali/default.nix rename to modules/default.nix diff --git a/modules/vali/graphics/default.nix b/modules/graphics/default.nix similarity index 100% rename from modules/vali/graphics/default.nix rename to modules/graphics/default.nix diff --git a/modules/vali/graphics/wms/i3wm.nix b/modules/graphics/wms/i3wm.nix similarity index 100% rename from modules/vali/graphics/wms/i3wm.nix rename to modules/graphics/wms/i3wm.nix diff --git a/modules/vali/gui/cursor.nix b/modules/gui/cursor.nix similarity index 100% rename from modules/vali/gui/cursor.nix rename to modules/gui/cursor.nix diff --git a/modules/vali/gui/default.nix b/modules/gui/default.nix similarity index 100% rename from modules/vali/gui/default.nix rename to modules/gui/default.nix diff --git a/modules/vali/gui/gtk.nix b/modules/gui/gtk.nix similarity index 100% rename from modules/vali/gui/gtk.nix rename to modules/gui/gtk.nix diff --git a/modules/vali/gui/mpv.nix b/modules/gui/mpv.nix similarity index 100% rename from modules/vali/gui/mpv.nix rename to modules/gui/mpv.nix diff --git a/modules/vali/gui/qt.nix b/modules/gui/qt.nix similarity index 100% rename from modules/vali/gui/qt.nix rename to modules/gui/qt.nix diff --git a/modules/vali/gui/schizofox.nix b/modules/gui/schizofox.nix similarity index 100% rename from modules/vali/gui/schizofox.nix rename to modules/gui/schizofox.nix diff --git a/modules/vali/other/default.nix b/modules/other/default.nix similarity index 100% rename from modules/vali/other/default.nix rename to modules/other/default.nix diff --git a/modules/vali/other/home-manager.nix b/modules/other/home-manager.nix similarity index 100% rename from modules/vali/other/home-manager.nix rename to modules/other/home-manager.nix diff --git a/modules/vali/other/system.nix b/modules/other/system.nix similarity index 100% rename from modules/vali/other/system.nix rename to modules/other/system.nix diff --git a/modules/vali/other/xdg.nix b/modules/other/xdg.nix similarity index 100% rename from modules/vali/other/xdg.nix rename to modules/other/xdg.nix diff --git a/modules/vali/services/default.nix b/modules/services/default.nix similarity index 100% rename from modules/vali/services/default.nix rename to modules/services/default.nix diff --git a/modules/vali/services/pipewire.nix b/modules/services/pipewire.nix similarity index 100% rename from modules/vali/services/pipewire.nix rename to modules/services/pipewire.nix diff --git a/modules/vali/terminal/st.nix b/modules/terminal/st.nix similarity index 100% rename from modules/vali/terminal/st.nix rename to modules/terminal/st.nix diff --git a/modules/vali/terminal/starship.nix b/modules/terminal/starship.nix similarity index 100% rename from modules/vali/terminal/starship.nix rename to modules/terminal/starship.nix diff --git a/modules/vali/terminal/zsh.nix b/modules/terminal/zsh.nix similarity index 100% rename from modules/vali/terminal/zsh.nix rename to modules/terminal/zsh.nix diff --git a/modules/vali/tui/btop.nix b/modules/tui/btop.nix similarity index 100% rename from modules/vali/tui/btop.nix rename to modules/tui/btop.nix diff --git a/modules/vali/tui/default.nix b/modules/tui/default.nix similarity index 100% rename from modules/vali/tui/default.nix rename to modules/tui/default.nix diff --git a/modules/vali/tui/neovim.nix b/modules/tui/neovim.nix similarity index 100% rename from modules/vali/tui/neovim.nix rename to modules/tui/neovim.nix