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:
Nick
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:
|
||||
|
||||
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.
|
||||
|
|
|
|||
|
|
@ -1,8 +1,3 @@
|
|||
{
|
||||
flake,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
programs.yazi =
|
||||
let
|
||||
|
|
|
|||
|
|
@ -28,12 +28,6 @@ let
|
|||
"chat"
|
||||
"ai"
|
||||
];
|
||||
owncastTags = [
|
||||
instances.owncast.name
|
||||
"own"
|
||||
"cast"
|
||||
"stream"
|
||||
];
|
||||
syncthingTags = [
|
||||
instances.syncthing.name
|
||||
"sync"
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@ in
|
|||
};
|
||||
};
|
||||
home.packages = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
# flameshot
|
||||
;
|
||||
# inherit (pkgs)
|
||||
# # flameshot
|
||||
# ;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
config,
|
||||
flake,
|
||||
osConfig,
|
||||
workspaceStrings,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
inherit (flake.config.aesthetics.themes) cursor;
|
||||
configPath = ./config;
|
||||
settingsPath = {
|
||||
spawn = import (configPath + /spawn.nix) { inherit config flake; };
|
||||
|
|
|
|||
|
|
@ -1,8 +1,4 @@
|
|||
{
|
||||
flake,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{ flake, ... }:
|
||||
let
|
||||
inherit (flake.config.people)
|
||||
user0
|
||||
|
|
|
|||
|
|
@ -1,8 +1,4 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment = {
|
||||
enableAllTerminfo = true;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,3 @@
|
|||
{
|
||||
flake,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
services.hypridle = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,3 @@
|
|||
{
|
||||
pkgs,
|
||||
flake,
|
||||
...
|
||||
}:
|
||||
{
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
config,
|
||||
flake,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, flake, ... }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.sessionVariables.NIXOS_OZONE_WL = "1";
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ flake, config, ... }:
|
||||
{ flake, ... }:
|
||||
let
|
||||
inherit (flake.config.services.instances) audiobookshelf web;
|
||||
inherit (flake.config.machines.devices) ceres;
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
flake,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{ flake, config, ... }:
|
||||
let
|
||||
inherit (flake.config.machines.devices)
|
||||
mars
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ let
|
|||
inherit (flake.config.machines.devices)
|
||||
synology
|
||||
phone
|
||||
tablet
|
||||
;
|
||||
inherit (flake.config.services.instances)
|
||||
syncthing
|
||||
|
|
|
|||
|
|
@ -1,8 +1,4 @@
|
|||
{
|
||||
flake,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{ flake, ... }:
|
||||
let
|
||||
inherit (flake.config.people) user0;
|
||||
in
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
{ flake, ... }:
|
||||
|
||||
{
|
||||
sops = {
|
||||
secrets = {
|
||||
|
|
|
|||
|
|
@ -4,21 +4,22 @@
|
|||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.11";
|
||||
};
|
||||
outputs = inputs @ {
|
||||
outputs =
|
||||
inputs@{
|
||||
flake-parts,
|
||||
self,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
in
|
||||
flake-parts.lib.mkFlake {inherit inputs;} {
|
||||
flake-parts.lib.mkFlake { inherit inputs; } {
|
||||
imports = [
|
||||
./parts
|
||||
];
|
||||
systems = [
|
||||
system
|
||||
];
|
||||
perSystem = {pkgs, ...}: {
|
||||
perSystem = {
|
||||
_module.args.pkgs = import inputs.nixpkgs {
|
||||
inherit system;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,20 +1,14 @@
|
|||
{
|
||||
perSystem = {
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
self',
|
||||
...
|
||||
}: let
|
||||
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 {
|
||||
map (name: configPath + "/${name}") (
|
||||
builtins.filter (name: builtins.match ".*\\.nix$" name != null) files
|
||||
);
|
||||
in
|
||||
{
|
||||
imports = devshellImports;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
outputs =
|
||||
inputs@{
|
||||
nixpkgs,
|
||||
flake-parts,
|
||||
...
|
||||
}:
|
||||
flake-parts.lib.mkFlake {inherit inputs;} {
|
||||
flake-parts.lib.mkFlake { inherit inputs; } {
|
||||
imports = [
|
||||
inputs.haskell-flake.flakeModule
|
||||
inputs.pre-commit-hooks-nix.flakeModule
|
||||
|
|
|
|||
|
|
@ -1,20 +1,15 @@
|
|||
{
|
||||
perSystem = {
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
self',
|
||||
...
|
||||
}: let
|
||||
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 {
|
||||
map (name: configPath + "/${name}") (
|
||||
builtins.filter (name: builtins.match ".*\\.nix$" name != null) files
|
||||
);
|
||||
in
|
||||
{
|
||||
imports = devshellImports;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@
|
|||
inputs@{
|
||||
nixpkgs,
|
||||
flake-parts,
|
||||
self,
|
||||
...
|
||||
}:
|
||||
flake-parts.lib.mkFlake { inherit inputs; } {
|
||||
|
|
|
|||
|
|
@ -1,13 +1,4 @@
|
|||
{
|
||||
perSystem =
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
self',
|
||||
...
|
||||
}:
|
||||
let
|
||||
let
|
||||
configPath = ./config;
|
||||
|
||||
devshellImports =
|
||||
|
|
@ -17,8 +8,8 @@
|
|||
map (name: configPath + "/${name}") (
|
||||
builtins.filter (name: builtins.match ".*\\.nix$" name != null) files
|
||||
);
|
||||
in
|
||||
{
|
||||
in
|
||||
{
|
||||
imports = devshellImports;
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
};
|
||||
outputs =
|
||||
inputs@{
|
||||
self,
|
||||
nixpkgs,
|
||||
flake-parts,
|
||||
...
|
||||
|
|
|
|||
|
|
@ -1,13 +1,4 @@
|
|||
{
|
||||
perSystem =
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
self',
|
||||
...
|
||||
}:
|
||||
let
|
||||
let
|
||||
configPath = ./config;
|
||||
|
||||
devshellImports =
|
||||
|
|
@ -17,8 +8,7 @@
|
|||
map (name: configPath + "/${name}") (
|
||||
builtins.filter (name: builtins.match ".*\\.nix$" name != null) files
|
||||
);
|
||||
in
|
||||
{
|
||||
in
|
||||
{
|
||||
imports = devshellImports;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue