diff --git a/flake.lock b/flake.lock index 13af4bb..72140fa 100644 --- a/flake.lock +++ b/flake.lock @@ -98,11 +98,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1771353108, - "narHash": "sha256-5Xtei4UKrqRC6IYLgI1KEBaPN9Xfef5JeOexdqDWVeg=", + "lastModified": 1772422417, + "narHash": "sha256-TyLPxtYIhHP7QNwVwrDRxaj+XKorVOyA4EKhRjpBI8U=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "98e777cdcc39e6bd0312a9d756507ef9cbd284cb", + "rev": "8ff8842cf58569ebe830f37350c6f1602fa35c39", "type": "github" }, "original": { @@ -114,11 +114,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1771263855, - "narHash": "sha256-akyds1g8cb742d2OrnQ4YciscpynsQ0+0YD2a8aZdvo=", + "lastModified": 1772275362, + "narHash": "sha256-jIQpfzcPBXe1URbf82p/9JxJguZuZZBlMJnW1x7B5jE=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "5ece16c7b4a7d1261da68153cafc318a60b78ce8", + "rev": "4a363451cc86ff5304514c8bf25eac42eb46b8c8", "type": "github" }, "original": { @@ -130,11 +130,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1771246613, - "narHash": "sha256-GftqKiyIgMcSgVkbNqXQq7oNnoL1+EB9V71XG4lPBRs=", + "lastModified": 1772269331, + "narHash": "sha256-DucfJqDGDO7PynT3sRuBfHw5jC0K2Oy0oqpJWueh4xw=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "cb320a13e3c92f32ada27acb1fba8a828a22ae60", + "rev": "6e2a0214de28cf0af1b72a2076bbfc77d12d96e8", "type": "github" }, "original": { @@ -166,6 +166,7 @@ "url": "https://tearforge.net/cry/cerulean" }, "original": { + "rev": "d5211287bd3cb96078f2053488d67d557848a8f2", "type": "git", "url": "https://tearforge.net/cry/cerulean" } @@ -233,11 +234,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1772176312, - "narHash": "sha256-Yjo/QCJvY9GUhAzwac/m6Rx3oxvRyEaiT5DQ5o+T6g4=", + "lastModified": 1772435729, + "narHash": "sha256-7Ln7IuX8nMIqfiDcX8jYkEAsf9oW8GAirvlK5SBPsds=", "owner": "nix-community", "repo": "fenix", - "rev": "92d91250c1acd59beabc51208192adc92f31aeb5", + "rev": "ec69754e35f5b0088645a69e486ac00e90217757", "type": "github" }, "original": { @@ -351,11 +352,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": { @@ -488,11 +489,11 @@ ] }, "locked": { - "lastModified": 1770260404, - "narHash": "sha256-3iVX1+7YUIt23hBx1WZsUllhbmP2EnXrV8tCRbLxHc8=", + "lastModified": 1772380125, + "narHash": "sha256-8C+y46xA9bxcchj9GeDPJaRUDApaA3sy2fhJr1bTbUw=", "owner": "nix-community", "repo": "home-manager", - "rev": "0d782ee42c86b196acff08acfbf41bb7d13eed5b", + "rev": "a07a44a839eb036e950bf397d9b782916f8dcab3", "type": "github" }, "original": { @@ -509,11 +510,11 @@ ] }, "locked": { - "lastModified": 1772164835, - "narHash": "sha256-zRcwrZDeBfYipqv/7K7TqsfPb87LFU6b7JhoNUGSnvQ=", + "lastModified": 1772380461, + "narHash": "sha256-O3ukj3Bb3V0Tiy/4LUfLlBpWypJ9P0JeUgsKl2nmZZY=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a39b0828bbffce0d73769a61e46e780488d098b", + "rev": "f140aa04d7d14f8a50ab27f3691b5766b17ae961", "type": "github" }, "original": { @@ -530,11 +531,11 @@ ] }, "locked": { - "lastModified": 1772020340, - "narHash": "sha256-aqBl3GNpCadMoJ/hVkWTijM1Aeilc278MjM+LA3jK6g=", + "lastModified": 1772380125, + "narHash": "sha256-8C+y46xA9bxcchj9GeDPJaRUDApaA3sy2fhJr1bTbUw=", "owner": "nix-community", "repo": "home-manager", - "rev": "36e38ca0d9afe4c55405fdf22179a5212243eecc", + "rev": "a07a44a839eb036e950bf397d9b782916f8dcab3", "type": "github" }, "original": { @@ -552,11 +553,11 @@ ] }, "locked": { - "lastModified": 1771102945, - "narHash": "sha256-e5NfW8NhC3qChR8bHVni/asrig/ZFzd1wzpq+cEE/tg=", + "lastModified": 1772330611, + "narHash": "sha256-UZjPc/d5XRxvjDbk4veAO4XFdvx6BUum2l40V688Xq8=", "owner": "nix-community", "repo": "home-manager", - "rev": "ff5e5d882c51f9a032479595cbab40fd04f56399", + "rev": "58fd7ff0eec2cda43e705c4c0585729ec471d400", "type": "github" }, "original": { @@ -719,11 +720,11 @@ ] }, "locked": { - "lastModified": 1770899531, - "narHash": "sha256-UBrWjh0DR8db60aLNkTnZTJ9F4kWK0Y7rUDNJC88W7A=", + "lastModified": 1771865848, + "narHash": "sha256-xwNa+1D8WPsDnJtUofDrtyDCZKZotbUymzV/R5s+M0I=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "e03c34ccd51280a44ea6d1f5c040cd81ecca25ed", + "rev": "b85a56b9531013c79f2f3846fd6ee2ff014b8960", "type": "github" }, "original": { @@ -1034,11 +1035,11 @@ "scenefx": "scenefx" }, "locked": { - "lastModified": 1771732288, - "narHash": "sha256-N1H7LMWXYNn7zN9ghp4vHlBs4O/Rw/+ZEoPUpm9ozw4=", + "lastModified": 1772456032, + "narHash": "sha256-QSbTGcfBlcjFYNvxhbV8DDMLP9CEfJJOEckJL34+T48=", "owner": "DreamMaoMao", "repo": "mangowc", - "rev": "6b2d694b234cae9876eb81e27991439eb51860f1", + "rev": "46e867deb9dfd58abb22ec92b19461d3761b1f3d", "type": "github" }, "original": { @@ -1056,11 +1057,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1771365290, - "narHash": "sha256-1XJOslVyF7yzf6yd/yl1VjGLywsbtwmQh3X1LuJcLI4=", + "lastModified": 1772338235, + "narHash": "sha256-9XcwtSIL/c+pkC3SBNuxCJuSktFOBV1TLvvkhekyB8I=", "owner": "microvm-nix", "repo": "microvm.nix", - "rev": "789c90b164b55b4379e7a94af8b9c01489024c18", + "rev": "9d1ff9b53532908a5eba7707931c9093508b6b92", "type": "github" }, "original": { @@ -1077,11 +1078,11 @@ "spectrum": "spectrum_2" }, "locked": { - "lastModified": 1771365290, - "narHash": "sha256-1XJOslVyF7yzf6yd/yl1VjGLywsbtwmQh3X1LuJcLI4=", + "lastModified": 1772338235, + "narHash": "sha256-9XcwtSIL/c+pkC3SBNuxCJuSktFOBV1TLvvkhekyB8I=", "owner": "microvm-nix", "repo": "microvm.nix", - "rev": "789c90b164b55b4379e7a94af8b9c01489024c18", + "rev": "9d1ff9b53532908a5eba7707931c9093508b6b92", "type": "github" }, "original": { @@ -1114,11 +1115,11 @@ }, "locked": { "dir": "packages/nix", - "lastModified": 1770489586, - "narHash": "sha256-JMN7T1ZrQ7PjSsgKobxtEENHiBAxqHNNIAaJcPnCeHM=", + "lastModified": 1771478814, + "narHash": "sha256-BhFWModRCeZXaTPcMbuDKH1M4I7iXjdWn0M54SAttUM=", "owner": "trivaris", "repo": "millennium", - "rev": "19656df9f9c8dfa0b7c6a4d2d25073b78efc4eda", + "rev": "50fcda7794bf32c8edbd30222370e70ac511805c", "type": "github" }, "original": { @@ -1268,11 +1269,11 @@ ] }, "locked": { - "lastModified": 1771375681, - "narHash": "sha256-qDDw0ruBZ1kt63j4uVP5Xrd1OxGKIYrSFnig0z6ozSw=", + "lastModified": 1772266502, + "narHash": "sha256-HBO3W1ooO9UwmxwwwFflnbCrAVHhaxpB8YnxFGPvOsY=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "d030dbb48ab020092681a39c878c1d48a553ffc1", + "rev": "e805e50f0cc8b9f2d950dc81cd9ee1c986899eaf", "type": "github" }, "original": { @@ -1283,11 +1284,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1771309086, - "narHash": "sha256-25aY7PIHMmoVW5w/x8Bs4vsfSV94A5htwiLINJ4KMuY=", + "lastModified": 1772402963, + "narHash": "sha256-+MupheX+ghNTSAg1XNppNApDC+FvvgpUXyU6sJSIsJo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e17f00eb60368a4b4b110a89f1c250f9a12c053", + "rev": "d41521c807dccb71b1b866ac3b7df5a59e726d9d", "type": "github" }, "original": { @@ -1299,11 +1300,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": { @@ -1344,11 +1345,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1771702014, - "narHash": "sha256-/P7uAp8q1xFhaw9Z+OG7lUK3wVz1Q/wreAyeiMyyjLI=", + "lastModified": 1772458868, + "narHash": "sha256-vnqeYbLjtEubh0vDLAxYl+STQ0XAINWdwzipH9sL7k8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cceb9213362e92c06b60b50c1e2877bc5fb95887", + "rev": "6896fd3d7f8a7cdd79d2a8355ce0d79db18dc875", "type": "github" }, "original": { @@ -1360,11 +1361,11 @@ }, "nixpkgs-staging": { "locked": { - "lastModified": 1771384451, - "narHash": "sha256-rFs7+EFjAglrHFhRz3N/M+fyn28q+dR4gVC9/9yoWS0=", + "lastModified": 1772453524, + "narHash": "sha256-2VR3/3A0mD42BYh6mNkxJ3W4qSy6mxa7Q84S4bR0VrA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4f8a766def570768a6cefe8ea42f839eff9dc1eb", + "rev": "0d1bb154f92b51fa8d6fd6323dd60e4d70eb5e57", "type": "github" }, "original": { @@ -1376,11 +1377,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1771008912, - "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", + "lastModified": 1772198003, + "narHash": "sha256-I45esRSssFtJ8p/gLHUZ1OUaaTaVLluNkABkk6arQwE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a82ccc39b39b621151d6732718e3e250109076fa", + "rev": "dd9b079222d43e1943b6ebd802f04fd959dc8e61", "type": "github" }, "original": { @@ -1408,11 +1409,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1771208521, - "narHash": "sha256-X01Q3DgSpjeBpapoGA4rzKOn25qdKxbPnxHeMLNoHTU=", + "lastModified": 1772047000, + "narHash": "sha256-7DaQVv4R97cii/Qdfy4tmDZMB2xxtyIvNGSwXBBhSmo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa56d7d6de78f5a7f997b0ea2bc6efd5868ad9e8", + "rev": "1267bb4920d0fc06ea916734c11b0bf004bbe17e", "type": "github" }, "original": { @@ -1511,11 +1512,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1772094427, - "narHash": "sha256-TiVs6OUBJEvajHdJZ5nIq0KognNJooUWuLGPFfQacSw=", + "lastModified": 1772366660, + "narHash": "sha256-UfVF6W3LKSl+KMM510AXrGOdOdkU0PTZd3xyee14iRc=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "56b59a832858329c2f947f9b7bdf1a49da39c981", + "rev": "566fe415d158452c72feb026f43e8d81e249ccb0", "type": "github" }, "original": { @@ -1591,11 +1592,11 @@ ] }, "locked": { - "lastModified": 1769900466, - "narHash": "sha256-WeoJBj/PhqFCCJEIycTipqPbKm5BpQT2uzFTYcYZ30I=", + "lastModified": 1771956684, + "narHash": "sha256-+EtzmEzGA2xqwIvKrP0euYaOzrmTQWEWAiWV+k2WBEM=", "owner": "uiriansan", "repo": "SilentSDDM", - "rev": "a44caf771b4cb72f5c2514f7d488455b0fa860d2", + "rev": "34f82e1fb8412fff78b82a0dcce763492b36054c", "type": "github" }, "original": { @@ -1646,11 +1647,11 @@ ] }, "locked": { - "lastModified": 1771268051, - "narHash": "sha256-nGqPcngnezoT+/xAvw3UDjwdKP2MC4fO315A/Otb9eE=", + "lastModified": 1772392844, + "narHash": "sha256-jG6LoavnG1iVPXo9EGrvZoP4cgcXnsXXSydC6wKPihY=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "b930de84c561f62a0c39a6a57c2ab553a97e8495", + "rev": "74d7bb896e98cc3e87e7d0064a968f196fccaa90", "type": "github" }, "original": { @@ -1841,11 +1842,11 @@ ] }, "locked": { - "lastModified": 1771381854, - "narHash": "sha256-6uEDuQYEGuyuFnvOdSx+fW75tRbNiLswAl6+4qyTdJ4=", + "lastModified": 1772426935, + "narHash": "sha256-fLxV/FzP06eaoMFzwrnKk9x0b+kaNNjbFfp6+rsRKGs=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "0fa995bec0e391b45b032fbd9d6e03609a30c115", + "rev": "6caef0bf5e38a793fd269333f000b7299b160900", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5ddee7e..faca99f 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ }; cerulean = { - url = "git+https://tearforge.net/cry/cerulean"; + url = "git+https://tearforge.net/cry/cerulean?rev=d5211287bd3cb96078f2053488d67d557848a8f2"; inputs = { systems.follows = "systems"; nixpkgs.follows = "nixpkgs"; @@ -56,22 +56,27 @@ url = "git+https://codeberg.org/LGFae/awww"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; + zen = { url = "github:0xc000022070/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; + iamb = { url = "github:ulyssa/iamb"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; + nixcord = { url = "github:FlameFlag/nixcord"; inputs.nixpkgs.follows = "nixpkgs"; }; + millennium = { url = "github:trivaris/millennium?dir=packages/nix"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; + spicetify-nix = { url = "github:Gerg-L/spicetify-nix"; inputs = { @@ -80,6 +85,11 @@ }; }; + bookokrat = { + url = "github:bugzmanov/bookokrat"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; + fenix = { url = "github:nix-community/fenix"; inputs.nixpkgs.follows = "nixpkgs-unstable"; diff --git a/homes/aurora/default.nix b/homes/aurora/default.nix index 23350ba..3422f09 100644 --- a/homes/aurora/default.nix +++ b/homes/aurora/default.nix @@ -4,6 +4,7 @@ config, inputs, upkgs, + mpkgs, root, system, ... @@ -144,9 +145,10 @@ imhex # hex editor kicad # open source electronics design program easyeda2kicad - libreoffice-qt # word, excel, pdf etc open source programs + # FIX: its fucking broken: https://github.com/NixOS/nixpkgs/pull/494721 + mpkgs.libreoffice-qt # word, excel, pdf etc open source programs hunspell # spell checker - calibre # ebook reader + inputs.bookokrat.packages.${system}.default # tui ebook reader obs-studio cytoscape element-desktop # 'official' gui matrix client @@ -198,6 +200,7 @@ alsa-utils gphoto2 # for my dslr!!! ffmpeg + nix-index ]; programs = { diff --git a/homes/modules/programs/neovim/nixcats.nix b/homes/modules/programs/neovim/nixcats.nix index 2527c0d..a599436 100644 --- a/homes/modules/programs/neovim/nixcats.nix +++ b/homes/modules/programs/neovim/nixcats.nix @@ -2,7 +2,6 @@ # https://github.com/BirdeeHub/nix-wrapper-modules { inputs, - spkgs, mpkgs, ... }: @@ -75,7 +74,7 @@ in inputs.fenix.packages.${system}.complete.rustfmt ]; zig = [ - spkgs.zls # FIX: using spkgs version as zls is broken rn ;-; + zls ]; elixir = [ elixir-ls diff --git a/homes/modules/wm/river.nix b/homes/modules/wm/river.nix index 33daf83..57a9626 100644 --- a/homes/modules/wm/river.nix +++ b/homes/modules/wm/river.nix @@ -1,4 +1,4 @@ -{ spkgs, ... }: +{ ... }: { wayland.windowManager.river = let @@ -7,7 +7,6 @@ { enable = true; xwayland.enable = true; - package = spkgs.river-classic; # FIX: using spkgs version as zls is broken rn ;-; settings = let diff --git a/hosts/nixarawrui/default.nix b/hosts/nixarawrui/default.nix index 724615d..03db509 100644 --- a/hosts/nixarawrui/default.nix +++ b/hosts/nixarawrui/default.nix @@ -1,9 +1,7 @@ { - inputs, lib, root, upkgs, - spkgs, ... }: { @@ -256,7 +254,6 @@ }; river-classic = { - package = spkgs.river-classic; # FIX: using spkgs version as zls is broken rn ;-; enable = true; }; @@ -277,7 +274,7 @@ alvr = { enable = true; - package = spkgs.alvr; + package = upkgs.alvr; openFirewall = true; };