Compare commits

...

3 commits

22 changed files with 540 additions and 507 deletions

View file

@ -8,8 +8,7 @@
root,
system,
...
}:
{
}: {
imports = [
inputs.zen.homeModules.twilight
@ -77,8 +76,7 @@
fonts.fontconfig.enable = true;
home.file.".mozilla/native-messaging-hosts/tridactyl.json".source =
"${upkgs.tridactyl-native}/lib/mozilla/native-messaging-hosts/tridactyl.json";
home.file.".mozilla/native-messaging-hosts/tridactyl.json".source = "${upkgs.tridactyl-native}/lib/mozilla/native-messaging-hosts/tridactyl.json";
# some packages are enabled from their own module in ./modules
home.packages = with upkgs; [

View file

@ -14,7 +14,8 @@
"hyprland/workspaces" = {
format = "{id}";
};
"ext/workspaces" = { # not enabled yet, hyprland and mango need two different configs ;-;
"ext/workspaces" = {
# not enabled yet, hyprland and mango need two different configs ;-;
format = "{id}";
ignore-hidden = true;
on-click = "activate";

View file

@ -1,5 +1,4 @@
{ upkgs, ... }:
{
{upkgs, ...}: {
programs.alacritty = {
enable = true;
package = upkgs.alacritty-graphics;

View file

@ -8,10 +8,18 @@ vim.opt.colorcolumn = "80"
require("plugins")
require("lsp")
vim.keymap.set('n', '<A-h>', function() vim.cmd('wincmd h') end)
vim.keymap.set('n', '<A-j>', function() vim.cmd('wincmd j') end)
vim.keymap.set('n', '<A-k>', function() vim.cmd('wincmd k') end)
vim.keymap.set('n', '<A-l>', function() vim.cmd('wincmd l') end)
vim.keymap.set("n", "<A-h>", function()
vim.cmd("wincmd h")
end)
vim.keymap.set("n", "<A-j>", function()
vim.cmd("wincmd j")
end)
vim.keymap.set("n", "<A-k>", function()
vim.cmd("wincmd k")
end)
vim.keymap.set("n", "<A-l>", function()
vim.cmd("wincmd l")
end)
local uv = vim.loop
local colorscheme_filepath = "/home/aurora/.cache/nvim/neovim-colors"

View file

@ -1,8 +1,53 @@
vim.keymap.set("n", "<leader>P", function()
vim.api.nvim_exec_autocmds("User", { pattern = "ConformProject" })
vim.cmd("ConformProject")
end, { noremap = true, silent = true })
vim.api.nvim_create_user_command("ConformProject", function()
local conform = require("conform")
local root = vim.fn.getcwd()
-- respects .gitignore
local handle = io.popen(string.format("cd %s && git ls-files --cached --others --exclude-standard", root))
if not handle then
vim.notify("Failed to scan project files", vim.log.levels.ERROR)
return
end
local files = {}
for file in handle:lines() do
table.insert(files, vim.fn.fnamemodify(file, ":p"))
end
handle:close()
-- format each file
-- TODO: maybe run each formatter on the directory instead as it may be faster
-- although that would actually mean we can't count what files were formatted so i don't know
local formatted_count = 0
for _, filepath in ipairs(files) do
local bufnr = vim.fn.bufadd(filepath)
vim.fn.bufload(bufnr)
local ok, err = conform.format({ bufnr = bufnr })
if ok then
formatted_count = formatted_count + 1
-- Save the buffer
vim.api.nvim_buf_call(bufnr, function()
vim.cmd("write")
end)
end
end
vim.notify(string.format("Formatted %d files", formatted_count), vim.log.levels.INFO)
end, {})
-- docs -> https://github.com/stevearc/conform.nvim
return {
{
"conform.nvim",
enabled = nixCats("format") or false,
event = "User ConformProject", -- also will load when we format the entire project yayayayy :333
keys = {
{ "<leader>p", desc = "Format File (pretty :3)" },
},

View file

@ -4,13 +4,12 @@
inputs,
mpkgs,
...
}:
let
inherit (inputs.nixcats)
}: let
inherit
(inputs.nixcats)
utils
;
in
{
in {
imports = [
inputs.nixcats.homeModule
];
@ -38,8 +37,7 @@ in
# the .replace vs .merge options are for modules based on existing configurations,
# they refer to how multiple categoryDefinitions get merged together by the module.
# for useage of this section, refer to :h nixCats.flake.outputs.categories
categoryDefinitions.replace =
{
categoryDefinitions.replace = {
pkgs,
settings,
categories,
@ -47,8 +45,7 @@ in
name,
mkNvimPlugin,
...
}@packageDef:
{
} @ packageDef: {
lspsAndRuntimeDeps = with pkgs; {
general = [
ripgrep
@ -205,9 +202,7 @@ in
packageDefinitions.replace = {
# these are the names of your packages
# you can include as many as you wish.
auroranvim =
{ pkgs, ... }:
{
auroranvim = {pkgs, ...}: {
# they contain a settings set defined above
# see :help nixCats.flake.outputs.settings
settings = {

View file

@ -1,5 +1,4 @@
{ inputs, ... }:
{
{inputs, ...}: {
imports = [
inputs.nixcord.homeModules.nixcord
];

View file

@ -1,5 +1,4 @@
{ upkgs, ... }:
{
{upkgs, ...}: {
# optional dependencies can be found here:
# https://yazi-rs.github.io/docs/installation/
home.packages = with upkgs; [

View file

@ -1,5 +1,4 @@
{ upkgs, ... }:
{
{upkgs, ...}: {
programs.zsh = {
enable = true;
enableCompletion = true;

View file

@ -1,5 +1,4 @@
{ ... }:
{
{...}: {
wayland.windowManager.hyprland = {
enable = true;
package = null;

View file

@ -1,5 +1,4 @@
{ inputs, ... }:
{
{inputs, ...}: {
imports = [
inputs.mango.hmModules.mango
];

View file

@ -1,22 +1,17 @@
{ ... }:
{
wayland.windowManager.river =
let
{...}: {
wayland.windowManager.river = let
layout = "rivertile";
in
{
in {
enable = true;
xwayland.enable = true;
settings =
let
settings = let
main = "Super";
# applications
terminal = "alacritty";
browser = "firefox";
in
{
in {
default-layout = "${layout}";
output-layout = "${layout}";
border-width = 1;

View file

@ -1,5 +1,4 @@
{ config, ... }:
{
{config, ...}: {
wayland.windowManager.sway = {
enable = true;
config = rec {
@ -18,13 +17,11 @@
{command = "waybar";}
];
keybindings =
let
keybindings = let
main = config.wayland.windowManager.sway.config.modifier;
terminal = config.wayland.windowManager.sway.config.terminal;
browser = "firefox";
in
{
in {
"${main}+c" = "kill"; # close focused window
"${main}+Alt+Delete" = "exit"; # exit sway

View file

@ -1,5 +1,4 @@
{ config, lib, pkgs, ... }:
{
{pkgs, ...}: {
imports = [
./hardware-configuration.nix
];

View file

@ -1,11 +1,14 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
config,
lib,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = ["ahci" "ehci_pci" "megaraid_sas" "usb_storage" "usbhid" "sd_mod" "sr_mod"];
@ -13,19 +16,19 @@
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/7f22e35f-7536-49c4-9c04-88874e87f266";
fileSystems."/" = {
device = "/dev/disk/by-uuid/7f22e35f-7536-49c4-9c04-88874e87f266";
fsType = "btrfs";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/0213-F9A0";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/0213-F9A0";
fsType = "vfat";
options = ["fmask=0077" "dmask=0077"];
};
swapDevices =
[ { device = "/dev/disk/by-uuid/0d04172b-aed8-42ea-9cb8-e5dcbf960200"; }
swapDevices = [
{device = "/dev/disk/by-uuid/0d04172b-aed8-42ea-9cb8-e5dcbf960200";}
];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

View file

@ -1,5 +1,4 @@
{ config, lib, pkgs, ... }:
{
{pkgs, ...}: {
imports = [
./hardware-configuration.nix
];
@ -91,4 +90,3 @@
system.stateVersion = "25.11";
}

View file

@ -1,11 +1,14 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
config,
lib,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = ["ahci" "xhci_pci" "megaraid_sas" "usb_storage" "usbhid" "sd_mod"];
@ -13,19 +16,19 @@
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/1bc53888-6db8-46df-aa28-975b710c5de8";
fileSystems."/" = {
device = "/dev/disk/by-uuid/1bc53888-6db8-46df-aa28-975b710c5de8";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/12CE-A600";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/12CE-A600";
fsType = "vfat";
options = ["fmask=0077" "dmask=0077"];
};
swapDevices =
[ { device = "/dev/disk/by-uuid/60643004-6916-46b3-8655-66fdc28cf5ad"; }
swapDevices = [
{device = "/dev/disk/by-uuid/60643004-6916-46b3-8655-66fdc28cf5ad";}
];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

View file

@ -3,8 +3,7 @@
root,
upkgs,
...
}:
{
}: {
imports = [
./hardware-configuration.nix
@ -214,8 +213,7 @@
};
};
systemd.tmpfiles.rules =
let
systemd.tmpfiles.rules = let
imagePath = root + "/homes/aurora/profile.png";
in
lib.mkIf (builtins.pathExists imagePath) [

View file

@ -12,13 +12,12 @@ cerulean.mkNexus ./. (self: {
servers = {};
};
nodes =
let
inherit (self.nexus)
nodes = let
inherit
(self.nexus)
groups
;
in
{
in {
nixarawrui = {
system = "x86_64-linux";

View file

@ -1,5 +1,4 @@
{ config, lib, pkgs, ... }:
{
{pkgs, ...}: {
services.home-assistant = {
enable = true;
configDir = "/var/lib/hass/hass";
@ -21,7 +20,8 @@
"mobile_app"
];
extraPackages = python3Packages: with python3Packages; [
extraPackages = python3Packages:
with python3Packages; [
getmac
aiohue
numpy