diff --git a/flake.lock b/flake.lock index 9f252c7..f7ec999 100644 --- a/flake.lock +++ b/flake.lock @@ -48,16 +48,16 @@ ] }, "locked": { - "lastModified": 1772502315, - "narHash": "sha256-DHE6jU97GZ+QfUdPi4plZRnXtAvtGubOxqA5sQ4DD9M=", + "lastModified": 1772954046, + "narHash": "sha256-yCTjpnXhx44tsuOW9VolMiP/ckQNwO6wQST5vmXE7ig=", "owner": "cry128", "repo": "cerulean", - "rev": "9bab917d8cc3b16f3c73b1980fcb55a4b5ce5239", + "rev": "6c7f335fbde5b6f1931d79d287bf03ee642ba7f5", "type": "github" }, "original": { "owner": "cry128", - "ref": "v0.2.4-alpha", + "ref": "v0.2.5-alpha", "repo": "cerulean", "type": "github" } @@ -141,24 +141,6 @@ "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": { @@ -183,11 +165,11 @@ ] }, "locked": { - "lastModified": 1772845525, - "narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=", + "lastModified": 1775598298, + "narHash": "sha256-FZRwskiertE+8wgFKjLoc/41UrVqzR2V3QseMBHuo/g=", "owner": "nix-community", "repo": "home-manager", - "rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0", + "rev": "98b4d61cfaf825c8b691afae0b6e152f0cc05c86", "type": "github" }, "original": { @@ -281,28 +263,6 @@ "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": [ @@ -349,11 +309,11 @@ }, "locked": { "dir": "packages/nix", - "lastModified": 1772390578, - "narHash": "sha256-3yQlDZz9JZqPFiYYj8fQkpCXUzjlAw4s7zaZ2n0wFmE=", + "lastModified": 1774491538, + "narHash": "sha256-11rgTocaXAIFYVEcbb6ju/sDN6sZpxjneXj9FSbgwrA=", "owner": "SteamClientHomebrew", "repo": "millennium", - "rev": "41d8c701e1f1ed4362e8378d12bbe5cb0cb811d6", + "rev": "bf8b0cd016fcc4168c4e348cbcbfd237de4c01c8", "type": "github" }, "original": { @@ -497,11 +457,11 @@ }, "nixcats": { "locked": { - "lastModified": 1770584904, - "narHash": "sha256-9Zaz8lbKF2W9pwXZEnbiGsicHdBoU+dHt3Wv3mCJoZ8=", + "lastModified": 1774835836, + "narHash": "sha256-6ok7iv/9R82vl6MYe3Lwyyb6S5bmW2PxEZtmjzlqyPs=", "owner": "BirdeeHub", "repo": "nixCats-nvim", - "rev": "538fdde784d2909700d97a8ef307783b33a86fb1", + "rev": "ebb9f279a55ca60ff4e37e4accf6518dc627aa8d", "type": "github" }, "original": { @@ -526,28 +486,13 @@ "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": 1772624091, - "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=", + "lastModified": 1775423009, + "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353", + "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", "type": "github" }, "original": { @@ -559,11 +504,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1772850137, - "narHash": "sha256-GDnE1loEXvdsj14OSg2Z2yn49fHAM9NyIy0Rzrfv/sk=", + "lastModified": 1775608838, + "narHash": "sha256-2ySoGH+SAi34U0PeuQgABC0WiH9LQ3tkyHTiE93KUeg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e6ed9890eade044129cacd3205fb7eb44e0be92", + "rev": "9a01fad67a57e44e1b3e1d905c6881bcfb209e8a", "type": "github" }, "original": { @@ -602,11 +547,11 @@ ] }, "locked": { - "lastModified": 1770766818, - "narHash": "sha256-12RCFLyAedyMOdenUi7cN3ioJPEGjA/ZG1BLjugfUVs=", + "lastModified": 1774915545, + "narHash": "sha256-COT4l/+ZddGBvrDVfPf7MEOJxV8EDKame6/aRnNIKcY=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "44b928068359b7d2310a34de39555c63c93a2c90", + "rev": "f3177b3c69fb3f03201098d7fe8ab6422cce7fc1", "type": "github" }, "original": { @@ -636,7 +581,6 @@ "inputs": { "cerulean": "cerulean", "home-manager-unstable": "home-manager-unstable", - "mangowm": "mangowm", "millennium": "millennium", "nix-flatpak": "nix-flatpak", "nixcats": "nixcats", @@ -647,27 +591,6 @@ "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": [ @@ -676,11 +599,11 @@ ] }, "locked": { - "lastModified": 1773096132, - "narHash": "sha256-M3zEnq9OElB7zqc+mjgPlByPm1O5t2fbUrH3t/Hm5Ag=", + "lastModified": 1775365543, + "narHash": "sha256-f50qrK0WwZ9z5EdaMGWOTtALgSF7yb7XwuE7LjCuDmw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d1ff3b1034d5bab5d7d8086a7803c5a5968cd784", + "rev": "a4ee2de76efb759fe8d4868c33dec9937897916f", "type": "github" }, "original": { @@ -818,11 +741,11 @@ ] }, "locked": { - "lastModified": 1772945022, - "narHash": "sha256-Fv14NttjL/7xfi6eVwrSEBAyBvDjI00RLiRNqA5apcw=", + "lastModified": 1775453133, + "narHash": "sha256-VIlMG985ONqVqF+OnPuS5Shbz5k6tqbOWnDL7EH+IT4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "3a6a5ca7fb48cc8fd8183386506a06579d1d79dc", + "rev": "8d0508ffceba8ad785ae442591dd115080a55142", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9e16ae7..2479289 100644 --- a/flake.nix +++ b/flake.nix @@ -9,35 +9,30 @@ home-manager-unstable.url = "github:nix-community/home-manager"; home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable"; - cerulean.url = "github:cry128/cerulean/v0.2.4-alpha"; + cerulean.url = "github:cry128/cerulean/v0.2.5-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"; }; - mangowm = { - url = "github:mangowm/mango"; + millennium = { + url = "github:SteamClientHomebrew/millennium?dir=packages/nix"; 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"; diff --git a/groups/yezelhlev/default.nix b/groups/yezelhlev/default.nix index 579feb1..e257e3b 100644 --- a/groups/yezelhlev/default.nix +++ b/groups/yezelhlev/default.nix @@ -64,10 +64,6 @@ 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; diff --git a/groups/yezelhlev/programs.nix b/groups/yezelhlev/programs.nix index c179b7c..e47ac0e 100644 --- a/groups/yezelhlev/programs.nix +++ b/groups/yezelhlev/programs.nix @@ -12,7 +12,6 @@ environment.systemPackages = with upkgs; [ # CLI tools git - lazygit wget unzip p7zip @@ -25,7 +24,7 @@ calcure # calendar app TODO: remove & fork calendar.vim # editors - lunarvim + #lunarvim vscode # languages @@ -37,8 +36,6 @@ # window management wayland - waywall - pipewire # programs vivaldi # TODO: switch to zen later diff --git a/homes/dea/default.nix b/homes/dea/default.nix index 0a41632..e3595dc 100644 --- a/homes/dea/default.nix +++ b/homes/dea/default.nix @@ -7,13 +7,11 @@ 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"; diff --git a/homes/modules/wm/default.nix b/homes/modules/wm/default.nix deleted file mode 100644 index 452c844..0000000 --- a/homes/modules/wm/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ lib, ... }: - -{ - options = { - deaFiles.wm = lib.mkOption { - type = lib.types.enum [lib.listDir ./ |> builtins.toString]; - default = null; - }; - }; - - config = { - deaFiles.wm = "mangowc"; - }; -} diff --git a/homes/modules/wm/mango.conf b/homes/modules/wm/mango.conf deleted file mode 100644 index ab4bd54..0000000 --- a/homes/modules/wm/mango.conf +++ /dev/null @@ -1,39 +0,0 @@ -# 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= - diff --git a/homes/modules/wm/mangowc/default.nix b/homes/modules/wm/mangowc/default.nix deleted file mode 100644 index d5928f6..0000000 --- a/homes/modules/wm/mangowc/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ inputs, ... }: - -{ - wayland.windowManager.mango = { - enable = true; - }; - - systemd = { - enable = true; - xdgAutostart = true; - }; - - settings = builtins.readFile ./mango.conf; -} diff --git a/hosts/sandalphon/mcsr/ninjabrain.nix b/hosts/sandalphon/mcsr/ninjabrain.nix index cfb94f6..be14045 100644 --- a/hosts/sandalphon/mcsr/ninjabrain.nix +++ b/hosts/sandalphon/mcsr/ninjabrain.nix @@ -11,11 +11,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "ninjabrain-bot"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { url = "https://github.com/Ninjabrain1/Ninjabrain-Bot/releases/download/${finalAttrs.version}/Ninjabrain-Bot-${finalAttrs.version}.jar"; - hash = "sha256-Rxu9A2EiTr69fLBUImRv+RLC2LmosawIDyDPIaRcrdw="; + hash = "sha256-mAmfYyGpDUrOwTQA6G0F96+NYOVjnC84Qn6WjccUUP8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/hosts/sandalphon/mcsr/waywall.lua b/hosts/sandalphon/mcsr/waywall.lua index aae7329..1297ea3 100644 --- a/hosts/sandalphon/mcsr/waywall.lua +++ b/hosts/sandalphon/mcsr/waywall.lua @@ -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", { diff --git a/nixpkgs.nix b/nixpkgs.nix index 161619b..46b6e92 100644 --- a/nixpkgs.nix +++ b/nixpkgs.nix @@ -3,11 +3,9 @@ system, ... } @ args: { - nixpkgs.channels = rec { - base = spkgs; - spkgs= { + nixpkgs.channels = { + default = { inherit system; - source = inputs.nixpkgs; overlays = [ (import ./overlays args) ]; diff --git a/snow.nix b/snow.nix index 9690722..f132e1a 100644 --- a/snow.nix +++ b/snow.nix @@ -6,7 +6,6 @@ args = {inherit inputs;}; modules = [ inputs.nix-flatpak.nixosModules.nix-flatpak - inputs.mangowm.nixosModules.mango ]; groups = {