diff --git a/flake.lock b/flake.lock index 1969f98..f7ec999 100644 --- a/flake.lock +++ b/flake.lock @@ -48,15 +48,16 @@ ] }, "locked": { - "lastModified": 1772852754, - "narHash": "sha256-rYmaW2+zmFXM7Mp+B/fsBkzbAoeApj04F1fSmiS3mXU=", + "lastModified": 1772954046, + "narHash": "sha256-yCTjpnXhx44tsuOW9VolMiP/ckQNwO6wQST5vmXE7ig=", "owner": "cry128", "repo": "cerulean", - "rev": "ef5bc338566670380ceec75eb692697c9e81fb7e", + "rev": "6c7f335fbde5b6f1931d79d287bf03ee642ba7f5", "type": "github" }, "original": { "owner": "cry128", + "ref": "v0.2.5-alpha", "repo": "cerulean", "type": "github" } @@ -164,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": { @@ -308,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": { @@ -456,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": { @@ -487,11 +488,11 @@ }, "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": { @@ -503,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": { @@ -546,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": { @@ -586,7 +587,8 @@ "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "plasma-manager": "plasma-manager", - "systems": "systems_3" + "systems": "systems_3", + "zen-browser": "zen-browser" } }, "sops-nix": { @@ -597,11 +599,11 @@ ] }, "locked": { - "lastModified": 1772495394, - "narHash": "sha256-hmIvE/slLKEFKNEJz27IZ8BKlAaZDcjIHmkZ7GCEjfw=", + "lastModified": 1775365543, + "narHash": "sha256-f50qrK0WwZ9z5EdaMGWOTtALgSF7yb7XwuE7LjCuDmw=", "owner": "Mic92", "repo": "sops-nix", - "rev": "1d9b98a29a45abe9c4d3174bd36de9f28755e3ff", + "rev": "a4ee2de76efb759fe8d4868c33dec9937897916f", "type": "github" }, "original": { @@ -729,6 +731,29 @@ "type": "github" } }, + "zen-browser": { + "inputs": { + "home-manager": [ + "home-manager-unstable" + ], + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1775453133, + "narHash": "sha256-VIlMG985ONqVqF+OnPuS5Shbz5k6tqbOWnDL7EH+IT4=", + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "rev": "8d0508ffceba8ad785ae442591dd115080a55142", + "type": "github" + }, + "original": { + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "type": "github" + } + }, "zlib-src": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 3d5fc91..2479289 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ home-manager-unstable.url = "github:nix-community/home-manager"; home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable"; - cerulean.url = "github:cry128/cerulean"; + cerulean.url = "github:cry128/cerulean/v0.2.5-alpha"; cerulean.inputs.systems.follows = "systems"; cerulean.inputs.nixpkgs.follows = "nixpkgs-unstable"; @@ -26,6 +26,16 @@ 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"; }; outputs = {cerulean, ...} @ inputs: diff --git a/groups/yezelhlev/programs.nix b/groups/yezelhlev/programs.nix index ec7d9b6..e47ac0e 100644 --- a/groups/yezelhlev/programs.nix +++ b/groups/yezelhlev/programs.nix @@ -10,58 +10,59 @@ # ====================== # sudo nixos-rebuild switch --flake . environment.systemPackages = with upkgs; [ - wget - lunarvim - vscode - python3 - p7zip - unzip - chawan # tui browser cha + # CLI tools git + wget + unzip + p7zip + kitty # terminal + starship # shell customizer + btop-cuda # system monitoring + croc # e2ee file transfer + chawan # tui browser cha + shellcheck # sh warning + calcure # calendar app TODO: remove & fork calendar.vim + + # editors + #lunarvim + vscode + + # languages gcc gdb glibc.static + python3 nixfmt - kitty # terminal + # window management wayland - emacs # calander/todo list - - nemo # file browser - monophony # yt music tryout - + # programs + vivaldi # TODO: switch to zen later vesktop # discord-canary equibop # equibop 3.1.7 - - vivaldi # vivaldi install requires qt5 - qt5.qtbase - - starship # shell customizer - + element-desktop # element 4 matrix + monophony # yt music tryout + syncplay + qbittorrent libreoffice-qt # libreoffice - hunspell + notepad-next # notepad++ + # notepadqq # TODO: which is better? + sqlitebrowser + bottles # windows emulation + + # dependencies + qt5.qtbase # vivaldi + others + libsForQt5.qtstyleplugin-kvantum # libs for Qt5 + libsForQt5.qt5ct + libsForQt5.qt5.qtbase + + hunspell # spellcheck for libreoffice hunspellDicts.uk_UA hunspellDicts.th_TH openjdk - notepad-next # notepad++ - sqlitebrowser - - ffmpeg-full + ffmpeg-full # mpv + syncplay yt-dlp - qbittorrent - - bottles # windows emulation - - element-desktop # element 4 matrix - - libsForQt5.qtstyleplugin-kvantum # libs for Qt5 - libsForQt5.qt5ct - libsForQt5.qt5.qtbase - btop-cuda - - croc - syncplay ]; } diff --git a/homes/dea/default.nix b/homes/dea/default.nix index 25991bb..e3595dc 100644 --- a/homes/dea/default.nix +++ b/homes/dea/default.nix @@ -5,12 +5,13 @@ ... }: { imports = [ - inputs.plasma-manager.homeModules.plasma-manager + inputs.plasma-manager.homeModules.plasma-manager # /${root}/homes/modules/bash /${root}/homes/modules/starship /${root}/homes/modules/vim /${root}/homes/modules/mpv + /${root}/homes/modules/zen ]; home.username = "dea"; diff --git a/homes/modules/vim/lua/lsp/indentation.lua b/homes/modules/vim/lua/lsp/indentation.lua index df7c2a8..edab845 100644 --- a/homes/modules/vim/lua/lsp/indentation.lua +++ b/homes/modules/vim/lua/lsp/indentation.lua @@ -7,6 +7,15 @@ vim.api.nvim_create_autocmd("FileType", { end, }) +vim.api.nvim_create_autocmd("FileType", { + pattern = "hs", + callback = function() + vim.opt_local.shiftwidth = 2 + vim.opt_local.tabstop = 2 + vim.opt_local.expandtab = true + end, +}) + vim.api.nvim_create_autocmd("FileType", { pattern = "nix", callback = function() diff --git a/homes/modules/vim/nixcats.nix b/homes/modules/vim/nixcats.nix index 32b54cc..b45a388 100644 --- a/homes/modules/vim/nixcats.nix +++ b/homes/modules/vim/nixcats.nix @@ -85,6 +85,7 @@ in nvim-web-devicons base16-nvim mini-nvim + calendar-vim (pkgs.vimUtils.buildVimPlugin { pname = "candyland-nvim"; diff --git a/homes/modules/zen/default.nix b/homes/modules/zen/default.nix new file mode 100644 index 0000000..3044c4e --- /dev/null +++ b/homes/modules/zen/default.nix @@ -0,0 +1,15 @@ +{ + inputs, + ... +}: + +{ + imports = [ + inputs.zen-browser.homeModules.twilight + ]; + + programs.zen-browser = { + enable = true; + # policies = {}; + }; +} 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", {