feat: fuck alejandra

This commit is contained in:
Nick 2025-01-16 16:14:09 -06:00
parent b6a40c8225
commit b07db5670d
7 changed files with 88 additions and 168 deletions

1
.pre-commit-config_old.yaml Symbolic link
View file

@ -0,0 +1 @@
/nix/store/rxlbrr44rzapz6sm807awg3ac0z6f4d6-pre-commit-config.json

View file

@ -1,49 +1,48 @@
{mapColour, ...}: { { mapColour, ... }: {
# background0 = background0 = mapColour "editor_bg" # ayu dark
# mapColour "editor_bg" # ayu dark "editor_bg" # ayu light
# "editor_bg" # ayu light "editor_bg" # ayu mirage
# "editor_bg" # ayu mirage "crust" # catppuccin-frappe
# "crust" # catppuccin-frappe "crust" # catppuccin-latte
# "crust" # catppuccin-latte "crust" # catppuccin-macchiato
# "crust" # catppuccin-macchiato "crust" # catppuccin-mocha
# "crust" # catppuccin-mocha "background" # dracula
# "background" # dracula "" # gruvbox dark
# "" # gruvbox dark "" # gruvbox light
# "" # gruvbox light "" # houston
# "" # houston "" # kanagawa dragon
# "" # kanagawa dragon "" # kanagawa lotus
# "" # kanagawa lotus "" # kanagawa wave
# "" # kanagawa wave "" # laserwave
# "" # laserwave "" # lunar
# "" # lunar "" # material darker
# "" # material darker "" # material deep ocean
# "" # material deep ocean "" # material forest
# "" # material forest "" # material lighter
# "" # material lighter "" # material oceanic
# "" # material oceanic "" # material palenight
# "" # material palenight "" # material sandy beach
# "" # material sandy beach "" # material sky blue
# "" # material sky blue "" # material space
# "" # material space "" # material volcano
# "" # material volcano "" # monokai
# "" # monokai "" # night owl
# "" # night owl "" # nord
# "" # nord "" # ocean next
# "" # ocean next "" # one dark
# "" # one dark "" # plastic
# "" # plastic "" # poimandres base
# "" # poimandres base "" # poimandres storm
# "" # poimandres storm "highlight0" # rosepine base
# "highlight0" # rosepine base "highlight0" # rosepine dawn
# "highlight0" # rosepine dawn "highlight0" # rosepine moon
# "highlight0" # rosepine moon "" # solarized dark
# "" # solarized dark "" # solarized light
# "" # solarized light "" # synthwave 84
# "" # synthwave 84 "" # tokyo night day
# "" # tokyo night day "" # tokyo night night
# "" # tokyo night night "" # tokyo night storm
# "" # tokyo night storm "" # vesper
# "" # vesper "" # wasp dark
# "" # wasp dark ""; # wasp light
# ""; # wasp light
} }

View file

@ -4,7 +4,8 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
lix-module = { 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"; inputs.nixpkgs.follows = "nixpkgs";
}; };
flake-parts = { flake-parts = {
@ -15,9 +16,7 @@
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
ghostty = { ghostty = { url = "github:ghostty-org/ghostty"; };
url = "github:ghostty-org/ghostty";
};
nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic";
edgedb = { edgedb = {
url = "github:edgedb/packages-nix"; url = "github:edgedb/packages-nix";
@ -74,15 +73,9 @@
}; };
outputs = inputs: outputs = inputs:
inputs.flake-parts.lib.mkFlake inputs.flake-parts.lib.mkFlake { inherit inputs; } {
{
inherit
inputs
;
}
{
imports = [ imports = [
# inputs.pre-commit-hooks-nix.flakeModule inputs.pre-commit-hooks-nix.flakeModule
./home ./home
./lib ./lib
./nixos ./nixos
@ -90,7 +83,7 @@
./config ./config
]; ];
flake = {config, ...}: { flake = { config, ... }: {
nixosConfigurations = { nixosConfigurations = {
desktop = inputs.self.lib.mkLinuxSystem [ desktop = inputs.self.lib.mkLinuxSystem [
./systems/desktop ./systems/desktop

View file

@ -1,69 +1,34 @@
let let
modulesPath = ./modules; modulesPath = ./modules;
moduleImport = path: nameTransform: moduleImport = path: nameTransform:
builtins.listToAttrs ( builtins.listToAttrs (map (name: {
map
(name: {
name = nameTransform name; name = nameTransform name;
value = import (path + "/${name}"); value = import (path + "/${name}");
}) }) (builtins.filter (name:
( (builtins.readDir path).${name} == "regular"
builtins.filter && builtins.match ".*\\.nix$" name != null)
(name: (builtins.readDir path).${name} == "regular" && builtins.match ".*\\.nix$" name != null) (builtins.attrNames (builtins.readDir path))));
(builtins.attrNames (builtins.readDir path)) modules = moduleImport modulesPath
) (name: builtins.replaceStrings [ ".nix" ] [ "" ] name) // (path:
); builtins.listToAttrs (map (name: {
modules =
moduleImport modulesPath (name:
builtins.replaceStrings [
".nix"
] [
""
]
name)
// (path:
builtins.listToAttrs (
map
(name: {
name = name; name = name;
value = import (path + "/${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 { in {
flake.nixosModules = { flake.nixosModules = {
personal = { personal = {
imports = builtins.attrValues { imports = builtins.attrValues {
inherit inherit (modules)
(modules) android audio bluetooth corectrl dconf disks firejail flatpak fonts
android printing steam sysstat virtualization;
audio
bluetooth
corectrl
dconf
disks
firejail
flatpak
fonts
printing
steam
sysstat
virtualization
;
}; };
}; };
desktop = { desktop = {
imports = builtins.attrValues { imports = builtins.attrValues {
inherit inherit (modules)
(modules) syncthing ollama
syncthing
ollama
# plasma # plasma
# sddm # sddm
; ;
@ -71,40 +36,16 @@ in {
}; };
hyprland = { hyprland = {
imports = builtins.attrValues { imports = builtins.attrValues { inherit (modules) hyprland; };
inherit
(modules)
hyprland
;
};
}; };
server = { server = { imports = builtins.attrValues { inherit (modules) services; }; };
imports = builtins.attrValues {
inherit
(modules)
services
;
};
};
shared = { shared = {
imports = builtins.attrValues { imports = builtins.attrValues {
inherit inherit (modules)
(modules) accounts doas environment gvfs home-manager locale nh nix rsyncd sops
accounts ssh system xserver;
doas
environment
gvfs
home-manager
locale
nix
rsyncd
sops
ssh
system
xserver
;
}; };
}; };
}; };

1
nixos/modules/nh.nix Executable file
View file

@ -0,0 +1 @@
{ programs.nh = { enable = true; }; }

View file

@ -1,26 +1,11 @@
{ { pkgs, config, ... }: {
pkgs,
config,
...
}: {
devShells = { devShells = {
default = pkgs.mkShell { default = pkgs.mkShell {
packages = builtins.attrValues { packages = builtins.attrValues {
inherit inherit (pkgs) age just nil nixd sops ssh-to-age;
(pkgs) inherit (pkgs.haskellPackages) nixfmt;
age
just
nil
nixd
sops
ssh-to-age
;
inherit
(pkgs.haskellPackages)
nixfmt
;
}; };
# shellHook = "${config.pre-commit.installationScript}"; shellHook = "${config.pre-commit.installationScript}";
}; };
}; };
} }

View file

@ -1,7 +1,7 @@
{ {
# pre-commit.settings.hooks = { pre-commit.settings.hooks = {
# nixfmt.enable = true; nixfmt-rfc-style.enable = true;
# commitizen.enable = true; commitizen.enable = true;
# # statix.enable = true; # statix.enable = true;
# }; };
} }