diff --git a/README.md b/README.md index 81b5dae..9ea6276 100755 --- a/README.md +++ b/README.md @@ -62,6 +62,6 @@ This defines flake-based development environment templates for projects written This defines the core of the NixOS configuration using helper functions from `lib/`, which is organized as a flake-parts-based structure for better modularity: 1. `inputs`: Declares all external dependencies including, such as core Nix components (`nixpkgs`, `flake-parts`, `systems`) and user environment components (`home-manager`, `sops-nix`). -2. `outputs`: Uses flake-parts to organize system configurations for multiple machines (`mars`, `venus`, `deimos`, `charon`, and `ceres`) and shared modules (`core`, `mantle`, `crust`) imported across systems. +2. `outputs`: Uses flake-parts to organize system configurations for multiple machines (`mars`, `deimos`, `phobos` and `ceres`) and shared modules (`core`, `mantle`, `crust`) imported across systems. Each system imports specialized modules and user profiles based on its intended purpose and users, creating a flexible but consistent configuration framework across multiple machines. diff --git a/modules/home/cli/files/yazi/default.nix b/modules/home/cli/files/yazi/default.nix index fd7c888..3f3fd9e 100755 --- a/modules/home/cli/files/yazi/default.nix +++ b/modules/home/cli/files/yazi/default.nix @@ -1,8 +1,3 @@ -{ - flake, - pkgs, - ... -}: { programs.yazi = let diff --git a/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/flake/selfHosted.nix b/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/flake/selfHosted.nix index 298c24e..4fabdbd 100755 --- a/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/flake/selfHosted.nix +++ b/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/flake/selfHosted.nix @@ -28,12 +28,6 @@ let "chat" "ai" ]; - owncastTags = [ - instances.owncast.name - "own" - "cast" - "stream" - ]; syncthingTags = [ instances.syncthing.name "sync" diff --git a/modules/home/gui/apps/code/zed/default.nix b/modules/home/gui/apps/code/zed/default.nix index 7d2d81f..2bb79f5 100755 --- a/modules/home/gui/apps/code/zed/default.nix +++ b/modules/home/gui/apps/code/zed/default.nix @@ -18,7 +18,7 @@ let ; }; extraPackagesPath = import (configPath + /extraPackages) { inherit pkgs; }; - packagePath = flake.inputs.zed-editor.packages.${pkgs.system}.default; + # packagePath = flake.inputs.zed-editor.packages.${pkgs.system}.default; in { programs.zed-editor = { diff --git a/modules/home/gui/apps/tools/flameshot/default.nix b/modules/home/gui/apps/tools/flameshot/default.nix index 0761a97..a00684e 100755 --- a/modules/home/gui/apps/tools/flameshot/default.nix +++ b/modules/home/gui/apps/tools/flameshot/default.nix @@ -28,8 +28,8 @@ in }; }; home.packages = builtins.attrValues { - inherit (pkgs) - # flameshot - ; + # inherit (pkgs) + # # flameshot + # ; }; } diff --git a/modules/home/gui/desktop/niri/config/binds.nix b/modules/home/gui/desktop/niri/config/binds.nix index 9584bff..7022817 100755 --- a/modules/home/gui/desktop/niri/config/binds.nix +++ b/modules/home/gui/desktop/niri/config/binds.nix @@ -2,7 +2,6 @@ config, flake, osConfig, - workspaceStrings, ... }: let diff --git a/modules/home/gui/desktop/niri/default.nix b/modules/home/gui/desktop/niri/default.nix index c9e4b8d..63ed4d2 100755 --- a/modules/home/gui/desktop/niri/default.nix +++ b/modules/home/gui/desktop/niri/default.nix @@ -53,7 +53,7 @@ let }; startup = import (configPath + /startup.nix) { inherit lib pkgs; }; style = import (configPath + /style.nix) { inherit flake; }; - windowrules = import (configPath + /windowrules.nix) { inherit flake workspaceStrings; }; + windowrules = import (configPath + /windowrules.nix) { inherit flake; }; workspaces = import (configPath + /workspaces.nix) { inherit workspaceStrings; }; in binds // layout // main // outputs // startup // style // windowrules // workspaces; diff --git a/modules/home/gui/desktop/river/default.nix b/modules/home/gui/desktop/river/default.nix index 5746df6..b881b13 100755 --- a/modules/home/gui/desktop/river/default.nix +++ b/modules/home/gui/desktop/river/default.nix @@ -5,7 +5,6 @@ ... }: let - inherit (flake.config.aesthetics.themes) cursor; configPath = ./config; settingsPath = { spawn = import (configPath + /spawn.nix) { inherit config flake; }; diff --git a/modules/nixos/core/doas/default.nix b/modules/nixos/core/doas/default.nix index eb13aa8..37fd07b 100755 --- a/modules/nixos/core/doas/default.nix +++ b/modules/nixos/core/doas/default.nix @@ -1,8 +1,4 @@ -{ - flake, - config, - ... -}: +{ flake, ... }: let inherit (flake.config.people) user0 diff --git a/modules/nixos/core/environment/default.nix b/modules/nixos/core/environment/default.nix index 40ec512..a4bfb16 100755 --- a/modules/nixos/core/environment/default.nix +++ b/modules/nixos/core/environment/default.nix @@ -1,8 +1,4 @@ -{ - pkgs, - config, - ... -}: +{ pkgs, ... }: { environment = { enableAllTerminfo = true; diff --git a/modules/nixos/desktop/hypr/idle/default.nix b/modules/nixos/desktop/hypr/idle/default.nix index 12c71f9..ffbb5be 100755 --- a/modules/nixos/desktop/hypr/idle/default.nix +++ b/modules/nixos/desktop/hypr/idle/default.nix @@ -1,8 +1,3 @@ -{ - flake, - pkgs, - ... -}: { services.hypridle = { enable = true; diff --git a/modules/nixos/desktop/hypr/land/default.nix b/modules/nixos/desktop/hypr/land/default.nix index 4038bdd..e3a7033 100755 --- a/modules/nixos/desktop/hypr/land/default.nix +++ b/modules/nixos/desktop/hypr/land/default.nix @@ -1,8 +1,3 @@ -{ - pkgs, - flake, - ... -}: { programs.hyprland = { enable = true; diff --git a/modules/nixos/desktop/wayland/greetd/default.nix b/modules/nixos/desktop/wayland/greetd/default.nix index dbb163d..a526e77 100755 --- a/modules/nixos/desktop/wayland/greetd/default.nix +++ b/modules/nixos/desktop/wayland/greetd/default.nix @@ -1,7 +1,6 @@ { config, flake, - lib, pkgs, ... }: diff --git a/modules/nixos/desktop/wayland/portals/default.nix b/modules/nixos/desktop/wayland/portals/default.nix index 0a99cee..ae85cf1 100755 --- a/modules/nixos/desktop/wayland/portals/default.nix +++ b/modules/nixos/desktop/wayland/portals/default.nix @@ -1,4 +1,4 @@ -{ pkgs, flake, ... }: +{ pkgs, ... }: { environment.sessionVariables.NIXOS_OZONE_WL = "1"; diff --git a/modules/nixos/services/audiobookshelf/default.nix b/modules/nixos/services/audiobookshelf/default.nix index 3ca62e4..32ad1ec 100755 --- a/modules/nixos/services/audiobookshelf/default.nix +++ b/modules/nixos/services/audiobookshelf/default.nix @@ -1,4 +1,4 @@ -{ flake, config, ... }: +{ flake, ... }: let inherit (flake.config.services.instances) audiobookshelf web; inherit (flake.config.machines.devices) ceres; diff --git a/modules/nixos/services/glance/default.nix b/modules/nixos/services/glance/default.nix index 18511e9..c600215 100755 --- a/modules/nixos/services/glance/default.nix +++ b/modules/nixos/services/glance/default.nix @@ -1,8 +1,6 @@ { config, flake, ... }: let - inherit (flake.config.people) user0; - inherit (flake.config.services.instances) glance jellyfin web; - inherit (flake.config.machines.devices) ceres; + inherit (flake.config.services.instances) glance jellyfin; service = glance; configPath = ./config; configImports = { diff --git a/modules/nixos/services/kanboard/default.nix b/modules/nixos/services/kanboard/default.nix index 85de06d..7429d7a 100755 --- a/modules/nixos/services/kanboard/default.nix +++ b/modules/nixos/services/kanboard/default.nix @@ -1,13 +1,6 @@ -{ - flake, - config, - ... -}: +{ flake, ... }: let - inherit (flake.config.machines.devices) - ceres - ; - inherit (flake.config.services.instances) smtp kanboard web; + inherit (flake.config.services.instances) kanboard web; service = kanboard; localhost = web.localhost.address0; host = service.domains.url0; diff --git a/modules/nixos/services/ollama/default.nix b/modules/nixos/services/ollama/default.nix index d82ccd0..78108cd 100755 --- a/modules/nixos/services/ollama/default.nix +++ b/modules/nixos/services/ollama/default.nix @@ -1,9 +1,4 @@ -{ - flake, - config, - pkgs, - ... -}: +{ flake, config, ... }: let inherit (flake.config.machines.devices) mars diff --git a/modules/nixos/services/syncthing/default.nix b/modules/nixos/services/syncthing/default.nix index f94abc2..bbed92e 100755 --- a/modules/nixos/services/syncthing/default.nix +++ b/modules/nixos/services/syncthing/default.nix @@ -3,7 +3,6 @@ let inherit (flake.config.machines.devices) synology phone - tablet ; inherit (flake.config.services.instances) syncthing diff --git a/modules/nixos/sops/default.nix b/modules/nixos/sops/default.nix index d5092dd..123602f 100755 --- a/modules/nixos/sops/default.nix +++ b/modules/nixos/sops/default.nix @@ -1,8 +1,4 @@ -{ - flake, - config, - ... -}: +{ flake, ... }: let inherit (flake.config.people) user0; in diff --git a/systems/deimos/config/sops.nix b/systems/deimos/config/sops.nix index 1dfe6f7..90298ee 100755 --- a/systems/deimos/config/sops.nix +++ b/systems/deimos/config/sops.nix @@ -1,5 +1,3 @@ -{ flake, ... }: - { sops = { secrets = { diff --git a/templates/elm/flake.nix b/templates/elm/flake.nix index 4da66f2..176cb0d 100755 --- a/templates/elm/flake.nix +++ b/templates/elm/flake.nix @@ -4,21 +4,22 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11"; }; - outputs = inputs @ { - flake-parts, - self, - ... - }: let - system = "x86_64-linux"; - in - flake-parts.lib.mkFlake {inherit inputs;} { + outputs = + inputs@{ + flake-parts, + ... + }: + let + system = "x86_64-linux"; + in + flake-parts.lib.mkFlake { inherit inputs; } { imports = [ ./parts ]; systems = [ system ]; - perSystem = {pkgs, ...}: { + perSystem = { _module.args.pkgs = import inputs.nixpkgs { inherit system; }; diff --git a/templates/elm/parts/default.nix b/templates/elm/parts/default.nix index 27fb3cf..25b3a1c 100755 --- a/templates/elm/parts/default.nix +++ b/templates/elm/parts/default.nix @@ -1,20 +1,14 @@ -{ - perSystem = { - pkgs, - lib, - config, - self', - ... - }: let - configPath = ./config; +let + configPath = ./config; - devshellImports = let + devshellImports = + let files = builtins.attrNames (builtins.readDir configPath); in - map - (name: configPath + "/${name}") - (builtins.filter (name: builtins.match ".*\\.nix$" name != null) files); - in { - imports = devshellImports; - }; + map (name: configPath + "/${name}") ( + builtins.filter (name: builtins.match ".*\\.nix$" name != null) files + ); +in +{ + imports = devshellImports; } diff --git a/templates/haskell/flake.nix b/templates/haskell/flake.nix index d729ace..7d6da48 100755 --- a/templates/haskell/flake.nix +++ b/templates/haskell/flake.nix @@ -4,13 +4,13 @@ nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; pre-commit-hooks-nix.url = "github:cachix/pre-commit-hooks.nix"; }; - outputs = inputs @ { - self, - nixpkgs, - flake-parts, - ... - }: - flake-parts.lib.mkFlake {inherit inputs;} { + outputs = + inputs@{ + nixpkgs, + flake-parts, + ... + }: + flake-parts.lib.mkFlake { inherit inputs; } { imports = [ inputs.haskell-flake.flakeModule inputs.pre-commit-hooks-nix.flakeModule diff --git a/templates/haskell/parts/default.nix b/templates/haskell/parts/default.nix index 27fb3cf..87acc4b 100755 --- a/templates/haskell/parts/default.nix +++ b/templates/haskell/parts/default.nix @@ -1,20 +1,15 @@ -{ - perSystem = { - pkgs, - lib, - config, - self', - ... - }: let - configPath = ./config; +let + configPath = ./config; - devshellImports = let + devshellImports = + let files = builtins.attrNames (builtins.readDir configPath); in - map - (name: configPath + "/${name}") - (builtins.filter (name: builtins.match ".*\\.nix$" name != null) files); - in { - imports = devshellImports; - }; + map (name: configPath + "/${name}") ( + builtins.filter (name: builtins.match ".*\\.nix$" name != null) files + ); +in +{ + imports = devshellImports; + } diff --git a/templates/typst/flake.nix b/templates/typst/flake.nix index 5115b35..2219c52 100755 --- a/templates/typst/flake.nix +++ b/templates/typst/flake.nix @@ -12,7 +12,6 @@ inputs@{ nixpkgs, flake-parts, - self, ... }: flake-parts.lib.mkFlake { inherit inputs; } { diff --git a/templates/typst/parts/default.nix b/templates/typst/parts/default.nix index 93ccb77..87acc4b 100755 --- a/templates/typst/parts/default.nix +++ b/templates/typst/parts/default.nix @@ -1,24 +1,15 @@ -{ - perSystem = - { - pkgs, - lib, - config, - self', - ... - }: - let - configPath = ./config; +let + configPath = ./config; - devshellImports = - let - files = builtins.attrNames (builtins.readDir configPath); - in - map (name: configPath + "/${name}") ( - builtins.filter (name: builtins.match ".*\\.nix$" name != null) files - ); + devshellImports = + let + files = builtins.attrNames (builtins.readDir configPath); in - { - imports = devshellImports; - }; + map (name: configPath + "/${name}") ( + builtins.filter (name: builtins.match ".*\\.nix$" name != null) files + ); +in +{ + imports = devshellImports; + } diff --git a/templates/website/flake.nix b/templates/website/flake.nix index 63da19c..7d6da48 100755 --- a/templates/website/flake.nix +++ b/templates/website/flake.nix @@ -6,7 +6,6 @@ }; outputs = inputs@{ - self, nixpkgs, flake-parts, ... diff --git a/templates/website/parts/default.nix b/templates/website/parts/default.nix index 93ccb77..25b3a1c 100755 --- a/templates/website/parts/default.nix +++ b/templates/website/parts/default.nix @@ -1,24 +1,14 @@ -{ - perSystem = - { - pkgs, - lib, - config, - self', - ... - }: - let - configPath = ./config; +let + configPath = ./config; - devshellImports = - let - files = builtins.attrNames (builtins.readDir configPath); - in - map (name: configPath + "/${name}") ( - builtins.filter (name: builtins.match ".*\\.nix$" name != null) files - ); + devshellImports = + let + files = builtins.attrNames (builtins.readDir configPath); in - { - imports = devshellImports; - }; + map (name: configPath + "/${name}") ( + builtins.filter (name: builtins.match ".*\\.nix$" name != null) files + ); +in +{ + imports = devshellImports; }