Compare commits

..

No commits in common. "2c69e1f1161bcd568018530cd72ff3502ca841a3" and "8b1a6aca390057f7919d2ae80821b6c3edc634d8" have entirely different histories.

22 changed files with 508 additions and 541 deletions

View file

@ -8,7 +8,8 @@
root, root,
system, system,
... ...
}: { }:
{
imports = [ imports = [
inputs.zen.homeModules.twilight inputs.zen.homeModules.twilight
@ -76,7 +77,8 @@
fonts.fontconfig.enable = true; 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 # some packages are enabled from their own module in ./modules
home.packages = with upkgs; [ home.packages = with upkgs; [

View file

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

View file

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

View file

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

View file

@ -1,53 +1,8 @@
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 -- docs -> https://github.com/stevearc/conform.nvim
return { return {
{ {
"conform.nvim", "conform.nvim",
enabled = nixCats("format") or false, enabled = nixCats("format") or false,
event = "User ConformProject", -- also will load when we format the entire project yayayayy :333
keys = { keys = {
{ "<leader>p", desc = "Format File (pretty :3)" }, { "<leader>p", desc = "Format File (pretty :3)" },
}, },

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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