diff options
| -rw-r--r-- | common/modules/mango/waybar.nix | 6 | ||||
| -rw-r--r-- | flake.lock | 176 | ||||
| -rw-r--r-- | flake.nix | 3 | ||||
| -rw-r--r-- | hosts/common.nix | 1 | ||||
| -rw-r--r-- | users/bee/default.nix | 4 | ||||
| -rw-r--r-- | users/common.nix | 21 |
6 files changed, 114 insertions, 97 deletions
diff --git a/common/modules/mango/waybar.nix b/common/modules/mango/waybar.nix index 0ee4a83..e980bbf 100644 --- a/common/modules/mango/waybar.nix +++ b/common/modules/mango/waybar.nix @@ -15,9 +15,9 @@ in enable = config.beeMods.mango.waybar; systemd.enable = true; systemd.target = "mango-session.target"; - package = pkgs.waybar.overrideAttrs (oldAttrs: { - mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; - }); + # package = pkgs.waybar.overrideAttrs (oldAttrs: { + # mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; + # }); settings = { mainBar = { @@ -33,11 +33,11 @@ "plugins-rustaceanvim": "plugins-rustaceanvim" }, "locked": { - "lastModified": 1774382882, - "narHash": "sha256-W8GsWUgOqpSiaV/GdB8Xgyc4lTUEHBzS2n7cTOi7ZNI=", + "lastModified": 1775129363, + "narHash": "sha256-6r69/3QtLrjrJmUJNqJJhYSLKLElr1kKc3ddbqH+7ZI=", "ref": "refs/heads/main", - "rev": "3d42c365e6a99f8c611f77946d2112efb159db85", - "revCount": 14, + "rev": "eb3348c2c0234b99a5ff37ccfcefd5ef1486b5dd", + "revCount": 16, "type": "git", "url": "https://codeberg.org/brustybee/beeVim" }, @@ -89,11 +89,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", "type": "github" }, "original": { @@ -112,11 +112,11 @@ ] }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", "type": "github" }, "original": { @@ -130,11 +130,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1769939035, - "narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=", + "lastModified": 1774104215, + "narHash": "sha256-EAtviqz0sEAxdHS4crqu7JGR5oI3BwaqG0mw7CmXkO8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a8ca480175326551d6c4121498316261cbb5b260", + "rev": "f799ae951fde0627157f40aec28dec27b22076d0", "type": "github" }, "original": { @@ -248,11 +248,11 @@ ] }, "locked": { - "lastModified": 1774584114, - "narHash": "sha256-uWR9fC+4NykFJVn4GN4Ini9LX+w8Llj7BnWKKp0N6bw=", + "lastModified": 1775104157, + "narHash": "sha256-rm/7k0D2J9SP30pyZ2C1HqarDncZDN6KAUI0gzgg4TA=", "owner": "nix-community", "repo": "home-manager", - "rev": "4b1be5c38be350ee9452a4847945ce71d950dc31", + "rev": "41e6e2ab37763c09db4e639033392cf40900440a", "type": "github" }, "original": { @@ -286,11 +286,11 @@ "scenefx": "scenefx" }, "locked": { - "lastModified": 1774567878, - "narHash": "sha256-3qDIaMzQRTkuDFIjZ6cHuVXFeo7TxlfhZIlDOieBWhA=", + "lastModified": 1774866937, + "narHash": "sha256-y0gRNhn61f52Kq7cFXEDhRn5A66e4qlqlaeLTYaw9Ac=", "owner": "mangowm", "repo": "mango", - "rev": "f94ddc671e1d01ad85ffd6f1cf2f09811c2629c8", + "rev": "52676492fe22356b45f9cbda9d24d887f4039f02", "type": "github" }, "original": { @@ -326,11 +326,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1774051512, - "narHash": "sha256-6IlLcSU4DJx6N+iIkorPa5/IGQ/sJLoVWQcqlsxWM98=", + "lastModified": 1775076062, + "narHash": "sha256-ruqxqJtdmNm/fmjuAdwtSBNcbBeMgE1hwELlUnAFgyU=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "1db9d29916c326e55f2e7435a7692b5695090b81", + "rev": "215965fbe5b5dbd61bf33c8bda4a20c2b32c3df2", "type": "github" }, "original": { @@ -346,11 +346,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1770509107, - "narHash": "sha256-YsfKRbd5fbcb2VTxywzAGpc4txXApMXfG0vtxEldt7Q=", + "lastModified": 1774742707, + "narHash": "sha256-a3FjZJxDOn0t18VwtIAgpNuUNaIEl6T+Awu5tXifQQw=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "0bb52596f3ea543781d2c20b1c2ee495a174a7d5", + "rev": "7966a9c203276bea3b7e8dd2e125fd2b4c8b6753", "type": "github" }, "original": { @@ -362,11 +362,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1774050147, - "narHash": "sha256-wgd3Jglqc1XSxWyXIHMs0eSmDM5ib+bHpxtlcYG7CT8=", + "lastModified": 1774915197, + "narHash": "sha256-yor+eo8CVi7wBp7CjAMQnVoK+m197gsl7MvUzaqicns=", "owner": "neovim", "repo": "neovim", - "rev": "3c90cc1234ac66806b7da1e2fd9b0880c959521e", + "rev": "dbc4800dda2b0dc3290dc79955f857256e0694e2", "type": "github" }, "original": { @@ -378,11 +378,11 @@ "neovim-src_2": { "flake": false, "locked": { - "lastModified": 1770505476, - "narHash": "sha256-HvlTxVEso/hl9lwweHerBRLtI/q05SQTxDr2l0Njfig=", + "lastModified": 1774725909, + "narHash": "sha256-aOiiQCmjCrvo+jAUDO2oMa377FvOtU97aqvTm74ZRGU=", "owner": "neovim", "repo": "neovim", - "rev": "ed8fbd2e2992cb264cb62585098a1c7acc5c4585", + "rev": "d5516daf121aa718e79bcd423ee24c24492893c0", "type": "github" }, "original": { @@ -393,11 +393,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": { @@ -408,11 +408,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773628058, - "narHash": "sha256-hpXH0z3K9xv0fHaje136KY872VT2T5uwxtezlAskQgY=", + "lastModified": 1774701658, + "narHash": "sha256-CIS/4AMUSwUyC8X5g+5JsMRvIUL3YUfewe8K4VrbsSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f8573b9c935cfaa162dd62cc9e75ae2db86f85df", + "rev": "b63fe7f000adcfa269967eeff72c64cafecbbebe", "type": "github" }, "original": { @@ -424,11 +424,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1769909678, - "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", + "lastModified": 1772328832, + "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "72716169fe93074c333e8d0173151350670b824c", + "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", "type": "github" }, "original": { @@ -439,11 +439,11 @@ }, "nixpkgs-lib_2": { "locked": { - "lastModified": 1772328832, - "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", + "lastModified": 1774748309, + "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", + "rev": "333c4e0545a6da976206c74db8773a1645b5870a", "type": "github" }, "original": { @@ -469,11 +469,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1770380644, - "narHash": "sha256-P7dWMHRUWG5m4G+06jDyThXO7kwSk46C1kgjEWcybkE=", + "lastModified": 1774610258, + "narHash": "sha256-HaThtroVD9wRdx7KQk0B75JmFcXlMUoEdDFNOMOlsOs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae67888ff7ef9dff69b3cf0cc0fbfbcd3a722abe", + "rev": "832efc09b4caf6b4569fbf9dc01bec3082a00611", "type": "github" }, "original": { @@ -485,11 +485,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1770380644, - "narHash": "sha256-P7dWMHRUWG5m4G+06jDyThXO7kwSk46C1kgjEWcybkE=", + "lastModified": 1774610258, + "narHash": "sha256-HaThtroVD9wRdx7KQk0B75JmFcXlMUoEdDFNOMOlsOs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ae67888ff7ef9dff69b3cf0cc0fbfbcd3a722abe", + "rev": "832efc09b4caf6b4569fbf9dc01bec3082a00611", "type": "github" }, "original": { @@ -501,15 +501,15 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1774386573, - "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", - "owner": "nixos", + "lastModified": 1775036866, + "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", + "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -523,11 +523,11 @@ ] }, "locked": { - "lastModified": 1774382611, - "narHash": "sha256-ZWFwBUYjPaZrBI5VapISxz45ec3Xec6VOokvOmmdGas=", + "lastModified": 1774755469, + "narHash": "sha256-sO6h2JLu7eaxILkHQgdAo7oDc8soqJbIShzlzH79tUw=", "ref": "refs/heads/master", - "rev": "783a58d95487a1a8e97f1cc5f2fc58016e695b7e", - "revCount": 73, + "rev": "6b8a278b4f2973391b256eedf6add3d6a3516bc0", + "revCount": 79, "shallow": false, "type": "git", "url": "https://git.bwaaa.monster/omnisearch" @@ -541,11 +541,11 @@ "plugins-base46-nvim": { "flake": false, "locked": { - "lastModified": 1773606507, - "narHash": "sha256-JfhmtphN4n9UHPV2gHuj8igaYNq8GUTO0SMxwYVGzwk=", + "lastModified": 1774439058, + "narHash": "sha256-+FNEJBBa33onbq+BCQA1kO9dXDhGEUYbVIMnhrpr98U=", "owner": "AvengeMedia", "repo": "base46", - "rev": "358dba7d0fb10af5671cf3427178e8057102bc6c", + "rev": "0f57acc24500694d0253b63c9fc6aaeb1a2b6696", "type": "github" }, "original": { @@ -557,11 +557,11 @@ "plugins-lze": { "flake": false, "locked": { - "lastModified": 1773555725, - "narHash": "sha256-Ii/mrCHw8kw1IN0GIROm7O0NSz1jtDligb/qDNq1P3U=", + "lastModified": 1774875775, + "narHash": "sha256-oYetArRkSVg4fa7RTV36sT2/w8Fz9ijRYXiB7/9dtk4=", "owner": "BirdeeHub", "repo": "lze", - "rev": "1d05835370e841c1605ec88d0541195c9410c34e", + "rev": "a09a8291d7b4c48e2af6a8cd3ef55bb8f3c181cd", "type": "github" }, "original": { @@ -573,11 +573,11 @@ "plugins-lzextras": { "flake": false, "locked": { - "lastModified": 1773555737, - "narHash": "sha256-fG8glvgoeFRHU6fgfBTb5GUxY+2YY3QfqzVYERa7ogs=", + "lastModified": 1774897220, + "narHash": "sha256-6ULOHXri/VAeRR+XwZ23YwN5xqOnBTBb+SBDgsIIFc8=", "owner": "BirdeeHub", "repo": "lzextras", - "rev": "88f70fe95e3a6c4dc841ebed3b23c1f92c5cde42", + "rev": "e04b92af006e0357099f2ce023094b22ae4d105d", "type": "github" }, "original": { @@ -589,11 +589,11 @@ "plugins-neogit": { "flake": false, "locked": { - "lastModified": 1773501204, - "narHash": "sha256-bGU2buVzYRAJZFQhNoOOux6oSAT8k6uCm3c/wu3NxDg=", + "lastModified": 1774862475, + "narHash": "sha256-2A1IYTkdXB+ctGC+vLvpxzmXNmfUhMD3JYh2ywDoPt4=", "owner": "NeogitOrg", "repo": "neogit", - "rev": "d3890fc3cdf0859845a86b2be306bba01458df1a", + "rev": "5a7fca171e3ad07380745d573d791e95268b8f3f", "type": "github" }, "original": { @@ -605,11 +605,11 @@ "plugins-opencode-nvim": { "flake": false, "locked": { - "lastModified": 1773858130, - "narHash": "sha256-lfsKTKs1urx/idXqc9KKlsWCyk1SUYmhr3C4QQGdiRY=", + "lastModified": 1775086798, + "narHash": "sha256-FRwzLXxIAuAbcdA5d2iRbEiHIgh8ie7SH9Ul17hyAdM=", "owner": "NickvanDyke", "repo": "opencode.nvim", - "rev": "5067c80ee1f37b5f8a54244e184df44944175a84", + "rev": "78b720dfa6a55c3e2d167165320adc5c0ae87471", "type": "github" }, "original": { @@ -628,11 +628,11 @@ "vimcats": "vimcats" }, "locked": { - "lastModified": 1772653557, - "narHash": "sha256-7UTu+AKuGqPqZzM1WJ9s4qQklE27LEilaHO9vpCgC1o=", + "lastModified": 1774990989, + "narHash": "sha256-Nf1PoJfOOtdHx3WTEM3MZSnWSAJwp0eTvSr1jm1pAJ8=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "f2f0c1231a5b019dbc1fd6dafac1751c878925a3", + "rev": "f69c85a955b9a83d495e3dc8d43adb6364a0b765", "type": "github" }, "original": { @@ -682,11 +682,11 @@ ] }, "locked": { - "lastModified": 1774303811, - "narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=", + "lastModified": 1774910634, + "narHash": "sha256-B+rZDPyktGEjOMt8PcHKYmgmKoF+GaNAFJhguktXAo0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042", + "rev": "19bf3d8678fbbfbc173beaa0b5b37d37938db301", "type": "github" }, "original": { @@ -714,11 +714,11 @@ ] }, "locked": { - "lastModified": 1767630708, - "narHash": "sha256-i2QZbDqaIMfYQfXZtbvsu2wcgfDYR8Kb19ZMagtCZg8=", + "lastModified": 1774148878, + "narHash": "sha256-z+v8Ndsn9ggZQucQjOuBMSzrdPh+r985g2VCraFgOfc=", "owner": "mrcjkb", "repo": "vimcats", - "rev": "869ee28be8f056e2482fd8bbfbaa23dd237aafd4", + "rev": "c94be722ee016b33fb244bfef5cc08723ff626bb", "type": "github" }, "original": { @@ -734,11 +734,11 @@ ] }, "locked": { - "lastModified": 1773722260, - "narHash": "sha256-U8MsSiqqYZHR3oKE+cCZ2AJt3b4LcXs+oQuNLipaO78=", + "lastModified": 1774759885, + "narHash": "sha256-Y3D2GnZTO6BhGWeVcO6qUkiO5g0dDL2tmokLVWNC1WY=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "0e6e43342fb3e9a3439fafa777d8cdf98e4ffc49", + "rev": "16e3f4cd221a030186a96015d82dcb3fb4afa4d6", "type": "github" }, "original": { @@ -8,7 +8,8 @@ inputs = { flake-parts.url = "github:hercules-ci/flake-parts"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; beeVim.url = "git+https://codeberg.org/brustybee/beeVim"; # beeVim.url = "git+file:/home/bee/beeVim"; beeVim.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/common.nix b/hosts/common.nix index 80e70d5..5ea1619 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -201,7 +201,6 @@ ioskeley-input # maple-mono.NF nerd-fonts.jetbrains-mono - nerd-fonts.sauce-code-pro ]; fonts.fontconfig.defaultFonts.monospace = [ "JetBrainsMono Nerd Font" diff --git a/users/bee/default.nix b/users/bee/default.nix index 5bf1b63..518c3df 100644 --- a/users/bee/default.nix +++ b/users/bee/default.nix @@ -23,8 +23,8 @@ waybar = true; window = { blur.enable = true; - blur.radius = 8; - blur.passes = 3; + blur.radius = 10; + blur.passes = 2; shadows = true; }; }; diff --git a/users/common.nix b/users/common.nix index 7f264c6..ddd3312 100644 --- a/users/common.nix +++ b/users/common.nix @@ -97,15 +97,32 @@ shellWrapperName = "yy"; }; + programs.mpv = { + enable = true; + package = pkgs.mpv-unwrapped.override { + javascriptSupport = false; + }; + config = { + # hwdec = "nvdec"; + hwdec = "auto"; + profile = "high-quality"; + save-position-on-quit = "yes"; + sub-font = "IosevkaInput Heavy"; + sub-font-size = 25; + sub-shadow-offset = 0; + sub-border-size = 1; + sub-ass-override = "force"; + }; + }; + home.packages = with pkgs; [ nautilus opencode - totem imv gnome-calculator papers cava - element-desktop + # clapper wlsunset thunderbird quickshell |
