Compare commits

..

14 commits

Author SHA1 Message Date
Dea
486025d4ec updating mango config 2026-04-13 00:13:59 -04:00
Dea
37ae5f9cfb some mango changes 2026-04-03 17:41:50 -04:00
Dea
26a436c2df added inputs for mangowc 2026-03-29 23:26:41 -04:00
Dea
8d53402dd9 initial mangowm commit 2026-03-19 02:16:57 -04:00
Dea
22533772fc fix pipe operators 2026-03-14 13:19:17 -04:00
Dea
bd59398017 haskell indentation 2026-03-12 14:45:31 -04:00
Dea
0f93db239a basic zen 2026-03-09 11:42:03 -04:00
Dea
3799239786 add calendar programs 2026-03-07 12:08:23 -05:00
Dea
0c9e417a25 cleanup of program order 2026-03-07 12:07:16 -05:00
Dea
1f9b3c2e36 removed emacs 2026-03-07 11:52:40 -05:00
1f92e5d648 Merge pull request 'migrate/cerulean' (#2) from cry/flake-dea:migrate/cerulean into main
Reviewed-on: #2
2026-03-07 14:08:12 +10:00
a4465e1295
fix users.users.dea not created 2026-03-07 14:07:12 +10:00
b53b34a85c
update shellAliases 2026-03-07 13:17:58 +10:00
f7de9f7a23
cerulean 2026-03-07 13:08:30 +10:00
12 changed files with 205 additions and 44 deletions

133
flake.lock generated
View file

@ -48,16 +48,16 @@
]
},
"locked": {
"lastModified": 1772954046,
"narHash": "sha256-yCTjpnXhx44tsuOW9VolMiP/ckQNwO6wQST5vmXE7ig=",
"lastModified": 1772502315,
"narHash": "sha256-DHE6jU97GZ+QfUdPi4plZRnXtAvtGubOxqA5sQ4DD9M=",
"owner": "cry128",
"repo": "cerulean",
"rev": "6c7f335fbde5b6f1931d79d287bf03ee642ba7f5",
"rev": "9bab917d8cc3b16f3c73b1980fcb55a4b5ce5239",
"type": "github"
},
"original": {
"owner": "cry128",
"ref": "v0.2.5-alpha",
"ref": "v0.2.4-alpha",
"repo": "cerulean",
"type": "github"
}
@ -141,6 +141,24 @@
"type": "github"
}
},
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1749398372,
"narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"fmt-src": {
"flake": false,
"locked": {
@ -165,11 +183,11 @@
]
},
"locked": {
"lastModified": 1775598298,
"narHash": "sha256-FZRwskiertE+8wgFKjLoc/41UrVqzR2V3QseMBHuo/g=",
"lastModified": 1772845525,
"narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "98b4d61cfaf825c8b691afae0b6e152f0cc05c86",
"rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0",
"type": "github"
},
"original": {
@ -263,6 +281,28 @@
"type": "github"
}
},
"mangowm": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": [
"nixpkgs-unstable"
],
"scenefx": "scenefx"
},
"locked": {
"lastModified": 1774751083,
"narHash": "sha256-I7M4j2w2X61qA4U+6El7q08Ay0+nweJl4jDlKa1UQFQ=",
"owner": "mangowm",
"repo": "mango",
"rev": "254eb8a4d4dd6a3f34ebcf4565132f5e5523b954",
"type": "github"
},
"original": {
"owner": "mangowm",
"repo": "mango",
"type": "github"
}
},
"microvm": {
"inputs": {
"nixpkgs": [
@ -309,11 +349,11 @@
},
"locked": {
"dir": "packages/nix",
"lastModified": 1774491538,
"narHash": "sha256-11rgTocaXAIFYVEcbb6ju/sDN6sZpxjneXj9FSbgwrA=",
"lastModified": 1772390578,
"narHash": "sha256-3yQlDZz9JZqPFiYYj8fQkpCXUzjlAw4s7zaZ2n0wFmE=",
"owner": "SteamClientHomebrew",
"repo": "millennium",
"rev": "bf8b0cd016fcc4168c4e348cbcbfd237de4c01c8",
"rev": "41d8c701e1f1ed4362e8378d12bbe5cb0cb811d6",
"type": "github"
},
"original": {
@ -457,11 +497,11 @@
},
"nixcats": {
"locked": {
"lastModified": 1774835836,
"narHash": "sha256-6ok7iv/9R82vl6MYe3Lwyyb6S5bmW2PxEZtmjzlqyPs=",
"lastModified": 1770584904,
"narHash": "sha256-9Zaz8lbKF2W9pwXZEnbiGsicHdBoU+dHt3Wv3mCJoZ8=",
"owner": "BirdeeHub",
"repo": "nixCats-nvim",
"rev": "ebb9f279a55ca60ff4e37e4accf6518dc627aa8d",
"rev": "538fdde784d2909700d97a8ef307783b33a86fb1",
"type": "github"
},
"original": {
@ -486,13 +526,28 @@
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1748740939,
"narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "656a64127e9d791a334452c6b6606d17539476e2",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1775423009,
"narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
"lastModified": 1772624091,
"narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
"rev": "80bdc1e5ce51f56b19791b52b2901187931f5353",
"type": "github"
},
"original": {
@ -504,11 +559,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1775608838,
"narHash": "sha256-2ySoGH+SAi34U0PeuQgABC0WiH9LQ3tkyHTiE93KUeg=",
"lastModified": 1772850137,
"narHash": "sha256-GDnE1loEXvdsj14OSg2Z2yn49fHAM9NyIy0Rzrfv/sk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9a01fad67a57e44e1b3e1d905c6881bcfb209e8a",
"rev": "6e6ed9890eade044129cacd3205fb7eb44e0be92",
"type": "github"
},
"original": {
@ -547,11 +602,11 @@
]
},
"locked": {
"lastModified": 1774915545,
"narHash": "sha256-COT4l/+ZddGBvrDVfPf7MEOJxV8EDKame6/aRnNIKcY=",
"lastModified": 1770766818,
"narHash": "sha256-12RCFLyAedyMOdenUi7cN3ioJPEGjA/ZG1BLjugfUVs=",
"owner": "nix-community",
"repo": "plasma-manager",
"rev": "f3177b3c69fb3f03201098d7fe8ab6422cce7fc1",
"rev": "44b928068359b7d2310a34de39555c63c93a2c90",
"type": "github"
},
"original": {
@ -581,6 +636,7 @@
"inputs": {
"cerulean": "cerulean",
"home-manager-unstable": "home-manager-unstable",
"mangowm": "mangowm",
"millennium": "millennium",
"nix-flatpak": "nix-flatpak",
"nixcats": "nixcats",
@ -591,6 +647,27 @@
"zen-browser": "zen-browser"
}
},
"scenefx": {
"inputs": {
"nixpkgs": [
"mangowm",
"nixpkgs"
]
},
"locked": {
"lastModified": 1750785057,
"narHash": "sha256-tGX6j4W91rcb+glXJo43sjPI9zQvPotonknG1BdihR4=",
"owner": "wlrfx",
"repo": "scenefx",
"rev": "3a6cfb12e4ba97b43326357d14f7b3e40897adfc",
"type": "github"
},
"original": {
"owner": "wlrfx",
"repo": "scenefx",
"type": "github"
}
},
"sops-nix": {
"inputs": {
"nixpkgs": [
@ -599,11 +676,11 @@
]
},
"locked": {
"lastModified": 1775365543,
"narHash": "sha256-f50qrK0WwZ9z5EdaMGWOTtALgSF7yb7XwuE7LjCuDmw=",
"lastModified": 1773096132,
"narHash": "sha256-M3zEnq9OElB7zqc+mjgPlByPm1O5t2fbUrH3t/Hm5Ag=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "a4ee2de76efb759fe8d4868c33dec9937897916f",
"rev": "d1ff3b1034d5bab5d7d8086a7803c5a5968cd784",
"type": "github"
},
"original": {
@ -741,11 +818,11 @@
]
},
"locked": {
"lastModified": 1775453133,
"narHash": "sha256-VIlMG985ONqVqF+OnPuS5Shbz5k6tqbOWnDL7EH+IT4=",
"lastModified": 1772945022,
"narHash": "sha256-Fv14NttjL/7xfi6eVwrSEBAyBvDjI00RLiRNqA5apcw=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"rev": "8d0508ffceba8ad785ae442591dd115080a55142",
"rev": "3a6a5ca7fb48cc8fd8183386506a06579d1d79dc",
"type": "github"
},
"original": {

View file

@ -9,30 +9,35 @@
home-manager-unstable.url = "github:nix-community/home-manager";
home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable";
cerulean.url = "github:cry128/cerulean/v0.2.5-alpha";
cerulean.url = "github:cry128/cerulean/v0.2.4-alpha";
cerulean.inputs.systems.follows = "systems";
cerulean.inputs.nixpkgs.follows = "nixpkgs-unstable";
zen-browser = {
url = "github:0xc000022070/zen-browser-flake";
inputs.nixpkgs.follows = "nixpkgs-unstable";
inputs.home-manager.follows = "home-manager-unstable";
};
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
nixcats.url = "github:BirdeeHub/nixCats-nvim";
millennium = {
url = "github:SteamClientHomebrew/millennium?dir=packages/nix";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
plasma-manager = {
url = "github:nix-community/plasma-manager";
inputs.nixpkgs.follows = "nixpkgs-unstable";
inputs.home-manager.follows = "home-manager-unstable";
};
millennium = {
url = "github:SteamClientHomebrew/millennium?dir=packages/nix";
mangowm = {
url = "github:mangowm/mango";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
zen-browser = {
url = "github:0xc000022070/zen-browser-flake";
inputs.nixpkgs.follows = "nixpkgs-unstable";
inputs.home-manager.follows = "home-manager-unstable";
};
};
};
nixConfig = {
extra-experimental-features = "pipe-operators";

View file

@ -64,6 +64,10 @@
flake = "/home/dea/dea-files"; # sets NH_OS_FLAKE variable for you
};
programs.mangowm = {
enable = false; # TODO: enable mango after configuring
};
users.users.dea = {
description = "dea";
isNormalUser = true;

View file

@ -12,6 +12,7 @@
environment.systemPackages = with upkgs; [
# CLI tools
git
lazygit
wget
unzip
p7zip
@ -24,7 +25,7 @@
calcure # calendar app TODO: remove & fork calendar.vim
# editors
#lunarvim
lunarvim
vscode
# languages
@ -36,6 +37,8 @@
# window management
wayland
waywall
pipewire
# programs
vivaldi # TODO: switch to zen later

View file

@ -7,11 +7,13 @@
imports = [
inputs.plasma-manager.homeModules.plasma-manager #
#/${root}/homes/modules/shell
/${root}/homes/modules/bash
/${root}/homes/modules/starship
/${root}/homes/modules/vim
/${root}/homes/modules/mpv
/${root}/homes/modules/zen
/${root}/homes/modules/wm
];
home.username = "dea";

View file

@ -0,0 +1,14 @@
{ lib, ... }:
{
options = {
deaFiles.wm = lib.mkOption {
type = lib.types.enum [lib.listDir ./ |> builtins.toString];
default = null;
};
};
config = {
deaFiles.wm = "mangowc";
};
}

View file

@ -0,0 +1,39 @@
# Monitors
# main monitor
# monitorrule = name:
# Startup
# exec-once waybar
# exec-once awww-daemon
exec-once = playerctld daemon
exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY DISPLAY XDG_SESSION_TYPE=wayland XDG_CURRENT_DESKTOP=wlroots PATH
# Keyboard/mouse
repeat_rate = 20
repeat_delay = 200
xkb_rules_layout = us
xkb_rules_variant = basic
trackpad_natural_scrolling = 0
scroll_method = 1
disable_while_typing = 0
mouse_natural_scrolling = 0
accel_profile = 0
# https://github.com/fcitx/fcitx5 (chinese pinyin)
env=GTK_IM_MODULE,fcitx
env=QT_IM_MODULE,fcitx
env=QT_IM_MODULES,wayland;fcitx
env=SDL_IM_MODULE,fcitx
env=XMODIFIERS,@im=fcitx
env=GLFW_IM_MODULE,ibus
# Screenshare
# TODO: pipewire, pipewire-pulse, xdg-desktop-portal-wlr
#
# #source=

View file

@ -0,0 +1,14 @@
{ inputs, ... }:
{
wayland.windowManager.mango = {
enable = true;
};
systemd = {
enable = true;
xdgAutostart = true;
};
settings = builtins.readFile ./mango.conf;
}

View file

@ -11,11 +11,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "ninjabrain-bot";
version = "1.5.2";
version = "1.5.1";
src = fetchurl {
url = "https://github.com/Ninjabrain1/Ninjabrain-Bot/releases/download/${finalAttrs.version}/Ninjabrain-Bot-${finalAttrs.version}.jar";
hash = "sha256-mAmfYyGpDUrOwTQA6G0F96+NYOVjnC84Qn6WjccUUP8=";
hash = "sha256-Rxu9A2EiTr69fLBUImRv+RLC2LmosawIDyDPIaRcrdw=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -33,7 +33,7 @@ local mc_eye_y = (tall_h - mc_eye_h) / 2
-- https://github.com/Esensats/mcsr-calcsens
local normal_sens = 4.699455756166794
local tall_sens = 0.31702247418659996
-- 0.0229116492
local left_middle = (resolution.w - thin_w) / 4
scene:register("e_counter", {

View file

@ -3,9 +3,11 @@
system,
...
} @ args: {
nixpkgs.channels = {
default = {
nixpkgs.channels = rec {
base = spkgs;
spkgs= {
inherit system;
source = inputs.nixpkgs;
overlays = [
(import ./overlays args)
];

View file

@ -6,6 +6,7 @@
args = {inherit inputs;};
modules = [
inputs.nix-flatpak.nixosModules.nix-flatpak
inputs.mangowm.nixosModules.mango
];
groups = {