diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix index 019b2f4f..9332268b 100644 --- a/nix/configurations/vanadium.nix +++ b/nix/configurations/vanadium.nix @@ -169,7 +169,6 @@ in ../homeModules/common/tmux ../homeModules/common/vim ../homeModules/common/wired - ../homeModules/common/vlc.nix ../homeModules/common/atuin.nix ../homeModules/common/direnv.nix ../homeModules/common/feh.nix diff --git a/nix/configurations/vanadium/home/misc.nix b/nix/configurations/vanadium/home/misc.nix index ae41030e..23eea664 100644 --- a/nix/configurations/vanadium/home/misc.nix +++ b/nix/configurations/vanadium/home/misc.nix @@ -1,5 +1,6 @@ { pkgs, + lib, ... }: { @@ -8,7 +9,7 @@ # fonts.fontconfig = { enable = true; - defaultFonts = { + defaultFonts = lib.mapAttrsRecursive (_: v: v ++ [ "Last Resort" ]) { sansSerif = [ "Ubuntu" "Noto Sans CJK TC" @@ -27,11 +28,12 @@ pkgs.noto-fonts-emoji-blob-bin pkgs.ubuntu-classic pkgs.iosevka + pkgs.last-resort ]; home.file = { ".xscreensaver".source = "${./xscreensaver/.xscreensaver}"; - ".wallpaper".source = "${pkgs.wallpapers.packages.serial_experiments_lain.lain_red_bg}"; + ".wallpaper".source = "${pkgs.wallpapers.packages.knights_of_guinevere.fixing_gwen}"; }; xdg.configFile = { "xmonad".source = "${./xmonad}"; diff --git a/nix/homeModules/common/vlc.nix b/nix/homeModules/common/vlc.nix deleted file mode 100644 index 3d324ca4..00000000 --- a/nix/homeModules/common/vlc.nix +++ /dev/null @@ -1,142 +0,0 @@ -{ lib, config, ... }: -let - # Kinda slow but there's no option defined and I'm lazy - vlcInstalled = lib.any (x: lib.getName x == "vlc") config.home.packages; -in -{ - xdg = lib.mkIf vlcInstalled { - enable = true; - mimeApps = - let - associations = lib.genAttrs vlcTypes (_: "vlc.desktop"); - # credit: https://github.com/tiredofit/home - vlcTypes = [ - "application/mxf" - "application/ogg" - "application/sdp" - "application/smil" - "application/streamingmedia" - "application/vnd.apple.mpegurl" - "application/vnd.ms-asf" - "application/vnd.rn-realmedia" - "application/vnd.rn-realmedia-vbr" - "application/x-cue" - "application/x-extension-m4a" - "application/x-extension-mp4" - "application/x-matroska" - "application/x-mpegurl" - "application/x-ogg" - "application/x-ogm" - "application/x-ogm-audio" - "application/x-ogm-video" - "application/x-shorten" - "application/x-smil" - "application/x-streamingmedia" - "audio/3gpp" - "audio/3gpp2" - "audio/AMR" - "audio/aac" - "audio/ac3" - "audio/aiff" - "audio/amr-wb" - "audio/dv" - "audio/eac3" - "audio/flac" - "audio/m3u" - "audio/m4a" - "audio/mp1" - "audio/mp2" - "audio/mp3" - "audio/mp4" - "audio/mpeg" - "audio/mpeg2" - "audio/mpeg3" - "audio/mpegurl" - "audio/mpg" - "audio/musepack" - "audio/ogg" - "audio/opus" - "audio/rn-mpeg" - "audio/scpls" - "audio/vnd.dolby.heaac.1" - "audio/vnd.dolby.heaac.2" - "audio/vnd.dts" - "audio/vnd.dts.hd" - "audio/vnd.rn-realaudio" - "audio/vorbis" - "audio/wav" - "audio/webm" - "audio/x-aac" - "audio/x-adpcm" - "audio/x-aiff" - "audio/x-ape" - "audio/x-m4a" - "audio/x-matroska" - "audio/x-mp1" - "audio/x-mp2" - "audio/x-mp3" - "audio/x-mpegurl" - "audio/x-mpg" - "audio/x-ms-asf" - "audio/x-ms-wma" - "audio/x-musepack" - "audio/x-pls" - "audio/x-pn-au" - "audio/x-pn-realaudio" - "audio/x-pn-wav" - "audio/x-pn-windows-pcm" - "audio/x-realaudio" - "audio/x-scpls" - "audio/x-shorten" - "audio/x-tta" - "audio/x-vorbis" - "audio/x-vorbis+ogg" - "audio/x-wav" - "audio/x-wavpack" - "video/3gp" - "video/3gpp" - "video/3gpp2" - "video/avi" - "video/divx" - "video/dv" - "video/fli" - "video/flv" - "video/mkv" - "video/mp2t" - "video/mp4" - "video/mp4v-es" - "video/mpeg" - "video/msvideo" - "video/ogg" - "video/quicktime" - "video/vnd.divx" - "video/vnd.mpegurl" - "video/vnd.rn-realvideo" - "video/webm" - "video/x-avi" - "video/x-flc" - "video/x-flic" - "video/x-flv" - "video/x-m4v" - "video/x-matroska" - "video/x-mpeg2" - "video/x-mpeg3" - "video/x-ms-afs" - "video/x-ms-asf" - "video/x-ms-wmv" - "video/x-ms-wmx" - "video/x-ms-wvxvideo" - "video/x-msvideo" - "video/x-ogm" - "video/x-ogm+ogg" - "video/x-theora" - "video/x-theora+ogg" - ]; - in - { - enable = true; - associations.added = associations; - defaultApplications = associations; - }; - }; -} diff --git a/nix/packages/by-name/ruler/package.nix b/nix/packages/by-name/ruler/package.nix index e873a2b6..0bf791a4 100644 --- a/nix/packages/by-name/ruler/package.nix +++ b/nix/packages/by-name/ruler/package.nix @@ -11,8 +11,8 @@ let domain = "git.confusedcompiler.org"; owner = "leana8959"; repo = "ruler"; - rev = "0b4e3ea1e477d4a817da8730fab7fb22ba25fa61"; - hash = "sha256-CoGJ3uOVEd6K+zFeBkZKVYVm5697Qu9aLYzmlfqGej0="; + rev = "6cdadb92b8cff6d57bc1d15061923bfbf40ede71"; + hash = "sha256-TwUXpgdmGBUgyxyN/nRReu3VniYdLkAVp1Q72r9ouBI="; }) { }; cabalOverrides = o: { diff --git a/npins/sources.json b/npins/sources.json index cee4d919..8deaa305 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -114,9 +114,9 @@ }, "branch": "release-25.11", "submodules": false, - "revision": "3fdd076e08049a9c7a83149b270440d9787d2df5", - "url": "https://github.com/nix-community/home-manager/archive/3fdd076e08049a9c7a83149b270440d9787d2df5.tar.gz", - "hash": "07k47xnkzha7ilcyak57wrh2ngka2j4f0d95zyyxn8jz8195q2q6" + "revision": "2217780c39169a9c77915200137550c2ef0fa974", + "url": "https://github.com/nix-community/home-manager/archive/2217780c39169a9c77915200137550c2ef0fa974.tar.gz", + "hash": "1p4j622rkpymnjggmqxwsngss4fpw21pf6khdzdfbiann5lzc5bn" }, "infuse": { "type": "GitRelease", @@ -187,9 +187,9 @@ }, "branch": "master", "submodules": false, - "revision": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", - "url": "https://github.com/NixOS/nixos-hardware/archive/9154f4569b6cdfd3c595851a6ba51bfaa472d9f3.tar.gz", - "hash": "1vmlcda7864ya2byxivnpzkqf41cavj9ms5hjh6i0h8anls56lk6" + "revision": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", + "url": "https://github.com/NixOS/nixos-hardware/archive/899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9.tar.gz", + "hash": "1dbf11zjspg68wiryp2y24w587izg954nbv517q57mpl8i8sfr85" }, "nixpkgs": { "type": "Git", @@ -200,9 +200,9 @@ }, "branch": "nixos-25.11-small", "submodules": false, - "revision": "e9f8538978f954bed00f6535b764e7932dbc3eea", - "url": "https://github.com/nixos/nixpkgs/archive/e9f8538978f954bed00f6535b764e7932dbc3eea.tar.gz", - "hash": "07wdninn693v06jz537pn1d257idi7p3dqh1mvygsb2zf6y4hypm" + "revision": "a320ce8e6e2cc6b4397eef214d202a50a4583829", + "url": "https://github.com/nixos/nixpkgs/archive/a320ce8e6e2cc6b4397eef214d202a50a4583829.tar.gz", + "hash": "1q779dz718s7k00zmfzksl6j8alpixp4rdazsvsfk7rn7g05sdzb" }, "nur": { "type": "Git", @@ -213,9 +213,9 @@ }, "branch": "main", "submodules": false, - "revision": "cdeb308c4faaa430f951e81db2360cebb54feb58", - "url": "https://github.com/nix-community/nur/archive/cdeb308c4faaa430f951e81db2360cebb54feb58.tar.gz", - "hash": "1jjsgmg3maqkrncwc3fn7iqcsi88fjvfzkpchcc1iwih65kr91il" + "revision": "263f45afd86d9c3cb8f61fb7af44c465d4493b88", + "url": "https://github.com/nix-community/nur/archive/263f45afd86d9c3cb8f61fb7af44c465d4493b88.tar.gz", + "hash": "0lv1gkqqb5bkkmwvgl8kaipqxg6ddqw09wb8jcc0wql95vbyzyca" }, "pin-emacs28": { "type": "Git", @@ -352,9 +352,9 @@ }, "branch": "mistress", "submodules": false, - "revision": "377fc66de1961687bf81bd0182c5d385c1dfadb2", - "url": "https://git.confusedcompiler.org/leana8959/wallpapers/archive/377fc66de1961687bf81bd0182c5d385c1dfadb2.tar.gz", - "hash": "1j6mnb1n0wjlm69dfngi4jjrr76zf3kfmqm0wkbgjvm93cbg1p7j" + "revision": "0eec270ac5fcbc939f475c7954504cfcbde8f7d9", + "url": "https://git.confusedcompiler.org/leana8959/wallpapers/archive/0eec270ac5fcbc939f475c7954504cfcbde8f7d9.tar.gz", + "hash": "1y5r6gm7b781s70x89ya24sqj9rfza83as0749hkd77b8zncvkkl" }, "wired-notify": { "type": "Git", @@ -378,9 +378,9 @@ }, "branch": "main", "submodules": false, - "revision": "fb066e133e614c024a470608ff56585c4f707b44", - "url": "https://github.com/0xc000022070/zen-browser-flake/archive/fb066e133e614c024a470608ff56585c4f707b44.tar.gz", - "hash": "04icaki7ygwrq7h4m4bkh5k08rpdr4qagz0z1mbbk4927ljqn30x" + "revision": "ef951ed2d976bcd1f57a09f358fdda9fa9425018", + "url": "https://github.com/0xc000022070/zen-browser-flake/archive/ef951ed2d976bcd1f57a09f358fdda9fa9425018.tar.gz", + "hash": "1s85cxiwhzwqgbazcgv12xqdlk1nkfynv23r9zj8gip4j6pznr4z" } }, "version": 5