mirror of
https://gitlab.com/upRootNutrition/dotfiles.git
synced 2025-08-08 04:44:39 -05:00
chore: removed dead imports
This commit is contained in:
parent
7b29b69fd1
commit
0814b03d1f
29 changed files with 76 additions and 160 deletions
|
@ -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:
|
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`).
|
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.
|
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.
|
||||||
|
|
|
@ -1,8 +1,3 @@
|
||||||
{
|
|
||||||
flake,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
{
|
||||||
programs.yazi =
|
programs.yazi =
|
||||||
let
|
let
|
||||||
|
|
|
@ -28,12 +28,6 @@ let
|
||||||
"chat"
|
"chat"
|
||||||
"ai"
|
"ai"
|
||||||
];
|
];
|
||||||
owncastTags = [
|
|
||||||
instances.owncast.name
|
|
||||||
"own"
|
|
||||||
"cast"
|
|
||||||
"stream"
|
|
||||||
];
|
|
||||||
syncthingTags = [
|
syncthingTags = [
|
||||||
instances.syncthing.name
|
instances.syncthing.name
|
||||||
"sync"
|
"sync"
|
||||||
|
|
|
@ -18,7 +18,7 @@ let
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
extraPackagesPath = import (configPath + /extraPackages) { inherit pkgs; };
|
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
|
in
|
||||||
{
|
{
|
||||||
programs.zed-editor = {
|
programs.zed-editor = {
|
||||||
|
|
|
@ -28,8 +28,8 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
home.packages = builtins.attrValues {
|
home.packages = builtins.attrValues {
|
||||||
inherit (pkgs)
|
# inherit (pkgs)
|
||||||
# flameshot
|
# # flameshot
|
||||||
;
|
# ;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
config,
|
config,
|
||||||
flake,
|
flake,
|
||||||
osConfig,
|
osConfig,
|
||||||
workspaceStrings,
|
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
|
|
|
@ -53,7 +53,7 @@ let
|
||||||
};
|
};
|
||||||
startup = import (configPath + /startup.nix) { inherit lib pkgs; };
|
startup = import (configPath + /startup.nix) { inherit lib pkgs; };
|
||||||
style = import (configPath + /style.nix) { inherit flake; };
|
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; };
|
workspaces = import (configPath + /workspaces.nix) { inherit workspaceStrings; };
|
||||||
in
|
in
|
||||||
binds // layout // main // outputs // startup // style // windowrules // workspaces;
|
binds // layout // main // outputs // startup // style // windowrules // workspaces;
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (flake.config.aesthetics.themes) cursor;
|
|
||||||
configPath = ./config;
|
configPath = ./config;
|
||||||
settingsPath = {
|
settingsPath = {
|
||||||
spawn = import (configPath + /spawn.nix) { inherit config flake; };
|
spawn = import (configPath + /spawn.nix) { inherit config flake; };
|
||||||
|
|
|
@ -1,8 +1,4 @@
|
||||||
{
|
{ flake, ... }:
|
||||||
flake,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
let
|
||||||
inherit (flake.config.people)
|
inherit (flake.config.people)
|
||||||
user0
|
user0
|
||||||
|
|
|
@ -1,8 +1,4 @@
|
||||||
{
|
{ pkgs, ... }:
|
||||||
pkgs,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
{
|
||||||
environment = {
|
environment = {
|
||||||
enableAllTerminfo = true;
|
enableAllTerminfo = true;
|
||||||
|
|
|
@ -1,8 +1,3 @@
|
||||||
{
|
|
||||||
flake,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
{
|
||||||
services.hypridle = {
|
services.hypridle = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -1,8 +1,3 @@
|
||||||
{
|
|
||||||
pkgs,
|
|
||||||
flake,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
{
|
||||||
programs.hyprland = {
|
programs.hyprland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
flake,
|
flake,
|
||||||
lib,
|
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs, flake, ... }:
|
{ pkgs, ... }:
|
||||||
{
|
{
|
||||||
environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ flake, config, ... }:
|
{ flake, ... }:
|
||||||
let
|
let
|
||||||
inherit (flake.config.services.instances) audiobookshelf web;
|
inherit (flake.config.services.instances) audiobookshelf web;
|
||||||
inherit (flake.config.machines.devices) ceres;
|
inherit (flake.config.machines.devices) ceres;
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
{ config, flake, ... }:
|
{ config, flake, ... }:
|
||||||
let
|
let
|
||||||
inherit (flake.config.people) user0;
|
inherit (flake.config.services.instances) glance jellyfin;
|
||||||
inherit (flake.config.services.instances) glance jellyfin web;
|
|
||||||
inherit (flake.config.machines.devices) ceres;
|
|
||||||
service = glance;
|
service = glance;
|
||||||
configPath = ./config;
|
configPath = ./config;
|
||||||
configImports = {
|
configImports = {
|
||||||
|
|
|
@ -1,13 +1,6 @@
|
||||||
{
|
{ flake, ... }:
|
||||||
flake,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
let
|
||||||
inherit (flake.config.machines.devices)
|
inherit (flake.config.services.instances) kanboard web;
|
||||||
ceres
|
|
||||||
;
|
|
||||||
inherit (flake.config.services.instances) smtp kanboard web;
|
|
||||||
service = kanboard;
|
service = kanboard;
|
||||||
localhost = web.localhost.address0;
|
localhost = web.localhost.address0;
|
||||||
host = service.domains.url0;
|
host = service.domains.url0;
|
||||||
|
|
|
@ -1,9 +1,4 @@
|
||||||
{
|
{ flake, config, ... }:
|
||||||
flake,
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
let
|
||||||
inherit (flake.config.machines.devices)
|
inherit (flake.config.machines.devices)
|
||||||
mars
|
mars
|
||||||
|
|
|
@ -3,7 +3,6 @@ let
|
||||||
inherit (flake.config.machines.devices)
|
inherit (flake.config.machines.devices)
|
||||||
synology
|
synology
|
||||||
phone
|
phone
|
||||||
tablet
|
|
||||||
;
|
;
|
||||||
inherit (flake.config.services.instances)
|
inherit (flake.config.services.instances)
|
||||||
syncthing
|
syncthing
|
||||||
|
|
|
@ -1,8 +1,4 @@
|
||||||
{
|
{ flake, ... }:
|
||||||
flake,
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
let
|
||||||
inherit (flake.config.people) user0;
|
inherit (flake.config.people) user0;
|
||||||
in
|
in
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
{ flake, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
sops = {
|
sops = {
|
||||||
secrets = {
|
secrets = {
|
||||||
|
|
|
@ -4,21 +4,22 @@
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11";
|
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11";
|
||||||
};
|
};
|
||||||
outputs = inputs @ {
|
outputs =
|
||||||
flake-parts,
|
inputs@{
|
||||||
self,
|
flake-parts,
|
||||||
...
|
...
|
||||||
}: let
|
}:
|
||||||
system = "x86_64-linux";
|
let
|
||||||
in
|
system = "x86_64-linux";
|
||||||
flake-parts.lib.mkFlake {inherit inputs;} {
|
in
|
||||||
|
flake-parts.lib.mkFlake { inherit inputs; } {
|
||||||
imports = [
|
imports = [
|
||||||
./parts
|
./parts
|
||||||
];
|
];
|
||||||
systems = [
|
systems = [
|
||||||
system
|
system
|
||||||
];
|
];
|
||||||
perSystem = {pkgs, ...}: {
|
perSystem = {
|
||||||
_module.args.pkgs = import inputs.nixpkgs {
|
_module.args.pkgs = import inputs.nixpkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,20 +1,14 @@
|
||||||
{
|
let
|
||||||
perSystem = {
|
configPath = ./config;
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
config,
|
|
||||||
self',
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
configPath = ./config;
|
|
||||||
|
|
||||||
devshellImports = let
|
devshellImports =
|
||||||
|
let
|
||||||
files = builtins.attrNames (builtins.readDir configPath);
|
files = builtins.attrNames (builtins.readDir configPath);
|
||||||
in
|
in
|
||||||
map
|
map (name: configPath + "/${name}") (
|
||||||
(name: configPath + "/${name}")
|
builtins.filter (name: builtins.match ".*\\.nix$" name != null) files
|
||||||
(builtins.filter (name: builtins.match ".*\\.nix$" name != null) files);
|
);
|
||||||
in {
|
in
|
||||||
imports = devshellImports;
|
{
|
||||||
};
|
imports = devshellImports;
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,13 +4,13 @@
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
||||||
pre-commit-hooks-nix.url = "github:cachix/pre-commit-hooks.nix";
|
pre-commit-hooks-nix.url = "github:cachix/pre-commit-hooks.nix";
|
||||||
};
|
};
|
||||||
outputs = inputs @ {
|
outputs =
|
||||||
self,
|
inputs@{
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
flake-parts,
|
flake-parts,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
flake-parts.lib.mkFlake {inherit inputs;} {
|
flake-parts.lib.mkFlake { inherit inputs; } {
|
||||||
imports = [
|
imports = [
|
||||||
inputs.haskell-flake.flakeModule
|
inputs.haskell-flake.flakeModule
|
||||||
inputs.pre-commit-hooks-nix.flakeModule
|
inputs.pre-commit-hooks-nix.flakeModule
|
||||||
|
|
|
@ -1,20 +1,15 @@
|
||||||
{
|
let
|
||||||
perSystem = {
|
configPath = ./config;
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
config,
|
|
||||||
self',
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
configPath = ./config;
|
|
||||||
|
|
||||||
devshellImports = let
|
devshellImports =
|
||||||
|
let
|
||||||
files = builtins.attrNames (builtins.readDir configPath);
|
files = builtins.attrNames (builtins.readDir configPath);
|
||||||
in
|
in
|
||||||
map
|
map (name: configPath + "/${name}") (
|
||||||
(name: configPath + "/${name}")
|
builtins.filter (name: builtins.match ".*\\.nix$" name != null) files
|
||||||
(builtins.filter (name: builtins.match ".*\\.nix$" name != null) files);
|
);
|
||||||
in {
|
in
|
||||||
imports = devshellImports;
|
{
|
||||||
};
|
imports = devshellImports;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,6 @@
|
||||||
inputs@{
|
inputs@{
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
flake-parts,
|
flake-parts,
|
||||||
self,
|
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
flake-parts.lib.mkFlake { inherit inputs; } {
|
flake-parts.lib.mkFlake { inherit inputs; } {
|
||||||
|
|
|
@ -1,24 +1,15 @@
|
||||||
{
|
let
|
||||||
perSystem =
|
configPath = ./config;
|
||||||
{
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
config,
|
|
||||||
self',
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
configPath = ./config;
|
|
||||||
|
|
||||||
devshellImports =
|
devshellImports =
|
||||||
let
|
let
|
||||||
files = builtins.attrNames (builtins.readDir configPath);
|
files = builtins.attrNames (builtins.readDir configPath);
|
||||||
in
|
|
||||||
map (name: configPath + "/${name}") (
|
|
||||||
builtins.filter (name: builtins.match ".*\\.nix$" name != null) files
|
|
||||||
);
|
|
||||||
in
|
in
|
||||||
{
|
map (name: configPath + "/${name}") (
|
||||||
imports = devshellImports;
|
builtins.filter (name: builtins.match ".*\\.nix$" name != null) files
|
||||||
};
|
);
|
||||||
|
in
|
||||||
|
{
|
||||||
|
imports = devshellImports;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
};
|
};
|
||||||
outputs =
|
outputs =
|
||||||
inputs@{
|
inputs@{
|
||||||
self,
|
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
flake-parts,
|
flake-parts,
|
||||||
...
|
...
|
||||||
|
|
|
@ -1,24 +1,14 @@
|
||||||
{
|
let
|
||||||
perSystem =
|
configPath = ./config;
|
||||||
{
|
|
||||||
pkgs,
|
|
||||||
lib,
|
|
||||||
config,
|
|
||||||
self',
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
configPath = ./config;
|
|
||||||
|
|
||||||
devshellImports =
|
devshellImports =
|
||||||
let
|
let
|
||||||
files = builtins.attrNames (builtins.readDir configPath);
|
files = builtins.attrNames (builtins.readDir configPath);
|
||||||
in
|
|
||||||
map (name: configPath + "/${name}") (
|
|
||||||
builtins.filter (name: builtins.match ".*\\.nix$" name != null) files
|
|
||||||
);
|
|
||||||
in
|
in
|
||||||
{
|
map (name: configPath + "/${name}") (
|
||||||
imports = devshellImports;
|
builtins.filter (name: builtins.match ".*\\.nix$" name != null) files
|
||||||
};
|
);
|
||||||
|
in
|
||||||
|
{
|
||||||
|
imports = devshellImports;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue