mirror of
https://gitlab.com/upRootNutrition/dotfiles.git
synced 2025-06-16 18:15:13 -05:00
feat: fuck alejandra
This commit is contained in:
Nick
parent
b6a40c8225
commit
b07db5670d
7 changed files with 88 additions and 168 deletions
1
.pre-commit-config_old.yaml
Symbolic link
1
.pre-commit-config_old.yaml
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
/nix/store/rxlbrr44rzapz6sm807awg3ac0z6f4d6-pre-commit-config.json
|
||||
|
|
@ -1,49 +1,48 @@
|
|||
{mapColour, ...}: {
|
||||
# background0 =
|
||||
# mapColour "editor_bg" # ayu dark
|
||||
# "editor_bg" # ayu light
|
||||
# "editor_bg" # ayu mirage
|
||||
# "crust" # catppuccin-frappe
|
||||
# "crust" # catppuccin-latte
|
||||
# "crust" # catppuccin-macchiato
|
||||
# "crust" # catppuccin-mocha
|
||||
# "background" # dracula
|
||||
# "" # gruvbox dark
|
||||
# "" # gruvbox light
|
||||
# "" # houston
|
||||
# "" # kanagawa dragon
|
||||
# "" # kanagawa lotus
|
||||
# "" # kanagawa wave
|
||||
# "" # laserwave
|
||||
# "" # lunar
|
||||
# "" # material darker
|
||||
# "" # material deep ocean
|
||||
# "" # material forest
|
||||
# "" # material lighter
|
||||
# "" # material oceanic
|
||||
# "" # material palenight
|
||||
# "" # material sandy beach
|
||||
# "" # material sky blue
|
||||
# "" # material space
|
||||
# "" # material volcano
|
||||
# "" # monokai
|
||||
# "" # night owl
|
||||
# "" # nord
|
||||
# "" # ocean next
|
||||
# "" # one dark
|
||||
# "" # plastic
|
||||
# "" # poimandres base
|
||||
# "" # poimandres storm
|
||||
# "highlight0" # rosepine base
|
||||
# "highlight0" # rosepine dawn
|
||||
# "highlight0" # rosepine moon
|
||||
# "" # solarized dark
|
||||
# "" # solarized light
|
||||
# "" # synthwave 84
|
||||
# "" # tokyo night day
|
||||
# "" # tokyo night night
|
||||
# "" # tokyo night storm
|
||||
# "" # vesper
|
||||
# "" # wasp dark
|
||||
# ""; # wasp light
|
||||
{ mapColour, ... }: {
|
||||
background0 = mapColour "editor_bg" # ayu dark
|
||||
"editor_bg" # ayu light
|
||||
"editor_bg" # ayu mirage
|
||||
"crust" # catppuccin-frappe
|
||||
"crust" # catppuccin-latte
|
||||
"crust" # catppuccin-macchiato
|
||||
"crust" # catppuccin-mocha
|
||||
"background" # dracula
|
||||
"" # gruvbox dark
|
||||
"" # gruvbox light
|
||||
"" # houston
|
||||
"" # kanagawa dragon
|
||||
"" # kanagawa lotus
|
||||
"" # kanagawa wave
|
||||
"" # laserwave
|
||||
"" # lunar
|
||||
"" # material darker
|
||||
"" # material deep ocean
|
||||
"" # material forest
|
||||
"" # material lighter
|
||||
"" # material oceanic
|
||||
"" # material palenight
|
||||
"" # material sandy beach
|
||||
"" # material sky blue
|
||||
"" # material space
|
||||
"" # material volcano
|
||||
"" # monokai
|
||||
"" # night owl
|
||||
"" # nord
|
||||
"" # ocean next
|
||||
"" # one dark
|
||||
"" # plastic
|
||||
"" # poimandres base
|
||||
"" # poimandres storm
|
||||
"highlight0" # rosepine base
|
||||
"highlight0" # rosepine dawn
|
||||
"highlight0" # rosepine moon
|
||||
"" # solarized dark
|
||||
"" # solarized light
|
||||
"" # synthwave 84
|
||||
"" # tokyo night day
|
||||
"" # tokyo night night
|
||||
"" # tokyo night storm
|
||||
"" # vesper
|
||||
"" # wasp dark
|
||||
""; # wasp light
|
||||
}
|
||||
|
|
|
|||
19
flake.nix
19
flake.nix
|
|
@ -4,7 +4,8 @@
|
|||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
lix-module = {
|
||||
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz";
|
||||
url =
|
||||
"https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
flake-parts = {
|
||||
|
|
@ -15,9 +16,7 @@
|
|||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
ghostty = {
|
||||
url = "github:ghostty-org/ghostty";
|
||||
};
|
||||
ghostty = { url = "github:ghostty-org/ghostty"; };
|
||||
nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic";
|
||||
edgedb = {
|
||||
url = "github:edgedb/packages-nix";
|
||||
|
|
@ -74,15 +73,9 @@
|
|||
};
|
||||
|
||||
outputs = inputs:
|
||||
inputs.flake-parts.lib.mkFlake
|
||||
{
|
||||
inherit
|
||||
inputs
|
||||
;
|
||||
}
|
||||
{
|
||||
inputs.flake-parts.lib.mkFlake { inherit inputs; } {
|
||||
imports = [
|
||||
# inputs.pre-commit-hooks-nix.flakeModule
|
||||
inputs.pre-commit-hooks-nix.flakeModule
|
||||
./home
|
||||
./lib
|
||||
./nixos
|
||||
|
|
@ -90,7 +83,7 @@
|
|||
./config
|
||||
];
|
||||
|
||||
flake = {config, ...}: {
|
||||
flake = { config, ... }: {
|
||||
nixosConfigurations = {
|
||||
desktop = inputs.self.lib.mkLinuxSystem [
|
||||
./systems/desktop
|
||||
|
|
|
|||
|
|
@ -1,69 +1,34 @@
|
|||
let
|
||||
modulesPath = ./modules;
|
||||
moduleImport = path: nameTransform:
|
||||
builtins.listToAttrs (
|
||||
map
|
||||
(name: {
|
||||
builtins.listToAttrs (map (name: {
|
||||
name = nameTransform name;
|
||||
value = import (path + "/${name}");
|
||||
})
|
||||
(
|
||||
builtins.filter
|
||||
(name: (builtins.readDir path).${name} == "regular" && builtins.match ".*\\.nix$" name != null)
|
||||
(builtins.attrNames (builtins.readDir path))
|
||||
)
|
||||
);
|
||||
modules =
|
||||
moduleImport modulesPath (name:
|
||||
builtins.replaceStrings [
|
||||
".nix"
|
||||
] [
|
||||
""
|
||||
]
|
||||
name)
|
||||
// (path:
|
||||
builtins.listToAttrs (
|
||||
map
|
||||
(name: {
|
||||
}) (builtins.filter (name:
|
||||
(builtins.readDir path).${name} == "regular"
|
||||
&& builtins.match ".*\\.nix$" name != null)
|
||||
(builtins.attrNames (builtins.readDir path))));
|
||||
modules = moduleImport modulesPath
|
||||
(name: builtins.replaceStrings [ ".nix" ] [ "" ] name) // (path:
|
||||
builtins.listToAttrs (map (name: {
|
||||
name = name;
|
||||
value = import (path + "/${name}");
|
||||
})
|
||||
(
|
||||
builtins.filter
|
||||
(name: (builtins.readDir path).${name} == "directory")
|
||||
(builtins.attrNames (builtins.readDir path))
|
||||
)
|
||||
))
|
||||
modulesPath;
|
||||
}) (builtins.filter (name: (builtins.readDir path).${name} == "directory")
|
||||
(builtins.attrNames (builtins.readDir path))))) modulesPath;
|
||||
in {
|
||||
flake.nixosModules = {
|
||||
personal = {
|
||||
imports = builtins.attrValues {
|
||||
inherit
|
||||
(modules)
|
||||
android
|
||||
audio
|
||||
bluetooth
|
||||
corectrl
|
||||
dconf
|
||||
disks
|
||||
firejail
|
||||
flatpak
|
||||
fonts
|
||||
printing
|
||||
steam
|
||||
sysstat
|
||||
virtualization
|
||||
;
|
||||
inherit (modules)
|
||||
android audio bluetooth corectrl dconf disks firejail flatpak fonts
|
||||
printing steam sysstat virtualization;
|
||||
};
|
||||
};
|
||||
|
||||
desktop = {
|
||||
imports = builtins.attrValues {
|
||||
inherit
|
||||
(modules)
|
||||
syncthing
|
||||
ollama
|
||||
inherit (modules)
|
||||
syncthing ollama
|
||||
# plasma
|
||||
# sddm
|
||||
;
|
||||
|
|
@ -71,40 +36,16 @@ in {
|
|||
};
|
||||
|
||||
hyprland = {
|
||||
imports = builtins.attrValues {
|
||||
inherit
|
||||
(modules)
|
||||
hyprland
|
||||
;
|
||||
};
|
||||
imports = builtins.attrValues { inherit (modules) hyprland; };
|
||||
};
|
||||
|
||||
server = {
|
||||
imports = builtins.attrValues {
|
||||
inherit
|
||||
(modules)
|
||||
services
|
||||
;
|
||||
};
|
||||
};
|
||||
server = { imports = builtins.attrValues { inherit (modules) services; }; };
|
||||
|
||||
shared = {
|
||||
imports = builtins.attrValues {
|
||||
inherit
|
||||
(modules)
|
||||
accounts
|
||||
doas
|
||||
environment
|
||||
gvfs
|
||||
home-manager
|
||||
locale
|
||||
nix
|
||||
rsyncd
|
||||
sops
|
||||
ssh
|
||||
system
|
||||
xserver
|
||||
;
|
||||
inherit (modules)
|
||||
accounts doas environment gvfs home-manager locale nh nix rsyncd sops
|
||||
ssh system xserver;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
1
nixos/modules/nh.nix
Executable file
1
nixos/modules/nh.nix
Executable file
|
|
@ -0,0 +1 @@
|
|||
{ programs.nh = { enable = true; }; }
|
||||
|
|
@ -1,26 +1,11 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
{ pkgs, config, ... }: {
|
||||
devShells = {
|
||||
default = pkgs.mkShell {
|
||||
packages = builtins.attrValues {
|
||||
inherit
|
||||
(pkgs)
|
||||
age
|
||||
just
|
||||
nil
|
||||
nixd
|
||||
sops
|
||||
ssh-to-age
|
||||
;
|
||||
inherit
|
||||
(pkgs.haskellPackages)
|
||||
nixfmt
|
||||
;
|
||||
inherit (pkgs) age just nil nixd sops ssh-to-age;
|
||||
inherit (pkgs.haskellPackages) nixfmt;
|
||||
};
|
||||
# shellHook = "${config.pre-commit.installationScript}";
|
||||
shellHook = "${config.pre-commit.installationScript}";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
# pre-commit.settings.hooks = {
|
||||
# nixfmt.enable = true;
|
||||
# commitizen.enable = true;
|
||||
# # statix.enable = true;
|
||||
# };
|
||||
pre-commit.settings.hooks = {
|
||||
nixfmt-rfc-style.enable = true;
|
||||
commitizen.enable = true;
|
||||
# statix.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue