From fbcdcf6cfd6e6cd58ba443aa8f06dc173f4cc1a3 Mon Sep 17 00:00:00 2001 From: prescientmoon Date: Sat, 18 Jan 2025 23:55:49 +0100 Subject: [PATCH] Backup before server rebuild --- common/default.nix | 10 +- common/nixpkgs.nix | 17 + common/themes/default.nix | 4 +- flake.lock | 603 ++++++++++-------- flake.nix | 11 +- home/features/cli/fish/config.fish | 2 +- home/features/desktop/firefox/default.nix | 18 + home/features/neovim/config/lazy-lock.json | 68 +- .../neovim/config/lua/my/helpers/folding.lua | 4 +- home/features/neovim/config/lua/my/lazy.lua | 1 + home/features/neovim/default.nix | 59 +- .../neovim/snippets/common/math-phrases.miros | 6 +- home/features/neovim/snippets/tex.miros | 13 +- home/features/wayland/hyprland/hyprland.conf | 4 +- home/global.nix | 15 - home/tethys.nix | 4 +- hosts/nixos/calypso/hardware/default.nix | 2 +- hosts/nixos/common/global/default.nix | 11 +- hosts/nixos/common/optional/bluetooth.nix | 1 + hosts/nixos/common/optional/pipewire.nix | 21 +- .../optional/services/wpa_supplicant.nix | 26 +- hosts/nixos/tethys/boot.nix | 6 +- hosts/nixos/tethys/default.nix | 11 + hosts/nixos/tethys/hardware/default.nix | 2 +- 24 files changed, 515 insertions(+), 404 deletions(-) create mode 100644 common/nixpkgs.nix diff --git a/common/default.nix b/common/default.nix index 137a836..effac76 100644 --- a/common/default.nix +++ b/common/default.nix @@ -1,8 +1,10 @@ # This directory contains modules which can be loaded on both nixos and home-manager! { - imports = [ ./fonts.nix ./themes ]; + imports = [ + ./fonts.nix + ./themes + ./nixpkgs.nix + ]; - # {{{ ad-hoc toggles - satellite.toggles.neovim-nightly.enable = false; - # }}} + satellite.toggles.neovim-nightly.enable = true; } diff --git a/common/nixpkgs.nix b/common/nixpkgs.nix new file mode 100644 index 0000000..4a507fb --- /dev/null +++ b/common/nixpkgs.nix @@ -0,0 +1,17 @@ +{ outputs, ... }: +{ + nixpkgs = { + # Add all overlays defined in the overlays directory + overlays = builtins.attrValues outputs.overlays; + + config.allowUnfree = true; + + config.permittedInsecurePackages = [ + "electron-25.9.0" + "nix-2.15.3" + "dotnet-runtime-6.0.36" + "dotnet-sdk-wrapped-6.0.428" + "dotnet-sdk-6.0.428" + ]; + }; +} diff --git a/common/themes/default.nix b/common/themes/default.nix index 3c34a35..76a4ab8 100644 --- a/common/themes/default.nix +++ b/common/themes/default.nix @@ -24,7 +24,7 @@ let # {{{ Catppuccin latte catppuccin-latte = { stylix = { - image = ./wallpapers/needygirloverdose.jpg; + image = ./wallpapers/sketchy-peaks.png; base16Scheme = base16 "catppuccin-latte"; opacity = transparency 0.7; polarity = "light"; @@ -96,6 +96,8 @@ in } ]; + stylix.enable = true; + # Requires me to manually turn targets on! stylix.autoEnable = false; } diff --git a/flake.lock b/flake.lock index 23d1fab..ca37509 100644 --- a/flake.lock +++ b/flake.lock @@ -3,17 +3,15 @@ "anyrun": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "systems": "systems" }, "locked": { - "lastModified": 1717576207, - "narHash": "sha256-LU6d1xX7jN1zt10YU7Oym07MtzVfziSmUEznGFdbuaw=", + "lastModified": 1731092955, + "narHash": "sha256-L1hLXf4IDZ0KoXbFiSNNZJ7IrReEr/J+CLt6Rl4Ea3M=", "owner": "Kirottu", "repo": "anyrun", - "rev": "7aabad8d5bb7d1bffae903ce86427b888ab824b4", + "rev": "d2017f224b2bfd7e33573c7070e7c3e2960c7dcc", "type": "github" }, "original": { @@ -91,11 +89,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1708890466, - "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", + "lastModified": 1732200724, + "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "665b3c6748534eb766c777298721cece9453fdae", + "rev": "153d52373b0fb2d343592871009a286ec8837aec", "type": "github" }, "original": { @@ -104,39 +102,6 @@ "type": "github" } }, - "base16-alacritty": { - "flake": false, - "locked": { - "lastModified": 1703982197, - "narHash": "sha256-TNxKbwdiUXGi4Z4chT72l3mt3GSvOcz6NZsUH8bQU/k=", - "owner": "aarowill", - "repo": "base16-alacritty", - "rev": "c95c200b3af739708455a03b5d185d3d2d263c6e", - "type": "github" - }, - "original": { - "owner": "aarowill", - "repo": "base16-alacritty", - "type": "github" - } - }, - "base16-alacritty-yaml": { - "flake": false, - "locked": { - "lastModified": 1674275109, - "narHash": "sha256-Adwx9yP70I6mJrjjODOgZJjt4OPPe8gJu7UuBboXO4M=", - "owner": "aarowill", - "repo": "base16-alacritty", - "rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7", - "type": "github" - }, - "original": { - "owner": "aarowill", - "repo": "base16-alacritty", - "rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7", - "type": "github" - } - }, "base16-fish": { "flake": false, "locked": { @@ -153,30 +118,14 @@ "type": "github" } }, - "base16-foot": { - "flake": false, - "locked": { - "lastModified": 1696725948, - "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", - "owner": "tinted-theming", - "repo": "base16-foot", - "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-foot", - "type": "github" - } - }, "base16-helix": { "flake": false, "locked": { - "lastModified": 1696727917, - "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", + "lastModified": 1725860795, + "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", + "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", "type": "github" }, "original": { @@ -185,22 +134,6 @@ "type": "github" } }, - "base16-kitty": { - "flake": false, - "locked": { - "lastModified": 1665001328, - "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", - "owner": "kdrag0n", - "repo": "base16-kitty", - "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", - "type": "github" - }, - "original": { - "owner": "kdrag0n", - "repo": "base16-kitty", - "type": "github" - } - }, "base16-schemes": { "flake": false, "locked": { @@ -217,34 +150,18 @@ "type": "github" } }, - "base16-tmux": { - "flake": false, - "locked": { - "lastModified": 1696725902, - "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", - "owner": "tinted-theming", - "repo": "base16-tmux", - "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-tmux", - "type": "github" - } - }, "base16-vim": { "flake": false, "locked": { - "lastModified": 1663659192, - "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", - "owner": "chriskempson", + "lastModified": 1731949548, + "narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=", + "owner": "tinted-theming", "repo": "base16-vim", - "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", + "rev": "61165b1632409bd55e530f3dbdd4477f011cadc6", "type": "github" }, "original": { - "owner": "chriskempson", + "owner": "tinted-theming", "repo": "base16-vim", "type": "github" } @@ -491,11 +408,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1732334599, - "narHash": "sha256-6rT/EbzElX894Az/UmQoEYj2YLNHddwUtfPLpenMHpQ=", + "lastModified": 1733488732, + "narHash": "sha256-Evin/MkMF+U1zSFCpCcHsxJQg78ilouObSr7YGAH8v0=", "ref": "refs/heads/master", - "rev": "cc09ebae9e99ea2310d3f8719ab06a9880373b8d", - "revCount": 3922, + "rev": "656d7f28b05f70d132851c8655771f1a29e25a76", + "revCount": 3958, "type": "git", "url": "https://gitlab.com/rycee/nur-expressions" }, @@ -556,11 +473,11 @@ "flake-compat_4": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -572,11 +489,11 @@ "flake-compat_5": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -588,11 +505,11 @@ "flake-compat_6": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -620,11 +537,27 @@ "flake-compat_8": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_9": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -641,11 +574,11 @@ ] }, "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -685,11 +618,11 @@ ] }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -707,11 +640,11 @@ ] }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -771,24 +704,6 @@ "inputs": { "systems": "systems_3" }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_5": { - "inputs": { - "systems": "systems_4" - }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -803,9 +718,9 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1685518550, @@ -821,9 +736,9 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_6": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -839,14 +754,35 @@ "type": "github" } }, + "flake-utils_7": { + "inputs": { + "systems": [ + "stylix", + "systems" + ] + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { - "lastModified": 1689549921, - "narHash": "sha256-iX0pk/uB019TdBGlaJEWvBCfydT6sRq+eDcGPifVsCM=", + "lastModified": 1731966426, + "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", "owner": "SenchoPens", "repo": "fromYaml", - "rev": "11fbbbfb32e3289d3c631e0134a23854e7865c84", + "rev": "106af9e2f715e2d828df706c386a685698f3223b", "type": "github" }, "original": { @@ -886,6 +822,33 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": "flake-compat_5", + "gitignore": "gitignore_2", + "nixpkgs": [ + "neovim-nightly-overlay", + "nixpkgs" + ], + "nixpkgs-stable": [ + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733665616, + "narHash": "sha256-+XTFXYlFJBxohhMGLDpYdEnhUNdxN8dyTA8WAd+lh2A=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "d8c02f0ffef0ef39f6063731fc539d8c71eb463a", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -909,6 +872,28 @@ } }, "gitignore_2": { + "inputs": { + "nixpkgs": [ + "neovim-nightly-overlay", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_3": { "inputs": { "nixpkgs": [ "smos", @@ -931,7 +916,7 @@ "type": "github" } }, - "gitignore_3": { + "gitignore_4": { "inputs": { "nixpkgs": [ "smos", @@ -956,16 +941,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1698794309, - "narHash": "sha256-/TIkZ8y5Wv3QHLFp79Poao9fINurKs5pa4z0CRe+F8s=", + "lastModified": 1732369855, + "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "a7c169c6c29cf02a4c392fa0acbbc5f5072823e7", + "rev": "dadd58f630eeea41d645ee225a63f719390829dc", "type": "github" }, "original": { "owner": "GNOME", - "ref": "45.1", + "ref": "47.2", "repo": "gnome-shell", "type": "github" } @@ -1029,11 +1014,11 @@ ] }, "locked": { - "lastModified": 1710478346, - "narHash": "sha256-Xjf8BdnQG0tLhPMlqQdwCIjOp7Teox0DP3N/jjyiGM4=", + "lastModified": 1733333617, + "narHash": "sha256-nMMQXREGvLOLvUa0ByhYFdaL0Jov0t1wzLbKjr05P2w=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "64e7763d72c1e4c1e5e6472640615b6ae2d40fbf", + "rev": "56f8ea8d502c87cf62444bec4ee04512e8ea24ea", "type": "github" }, "original": { @@ -1049,23 +1034,23 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1733482664, + "narHash": "sha256-ZD+h1fwvZs+Xvg46lzTWveAqyDe18h9m7wZnTIJfFZ4=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "e38d3dd1d355a003cc63e8fe6ff66ef2257509ed", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } }, "home-manager_2": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1714043624, @@ -1090,11 +1075,11 @@ ] }, "locked": { - "lastModified": 1706001011, - "narHash": "sha256-J7Bs9LHdZubgNHZ6+eE/7C18lZ1P6S5/zdJSdXFItI4=", + "lastModified": 1733085484, + "narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=", "owner": "nix-community", "repo": "home-manager", - "rev": "3df2a80f3f85f91ea06e5e91071fa74ba92e5084", + "rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163", "type": "github" }, "original": { @@ -1142,7 +1127,7 @@ "haskell-dependency-graph-nix": "haskell-dependency-graph-nix", "linkcheck": "linkcheck", "mergeless": "mergeless", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks", "safe-coloured-text": "safe-coloured-text", "seocheck": "seocheck", @@ -1168,7 +1153,7 @@ }, "korora": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1702807380, @@ -1287,46 +1272,24 @@ "type": "github" } }, - "neovim-flake": { - "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "dir": "contrib", - "lastModified": 1711669189, - "narHash": "sha256-VVRFhOKS/MmhV2u6av2e9Qzg4WE24vEmrW/JKed6tlo=", - "owner": "neovim", - "repo": "neovim", - "rev": "e2224a7933b6e30ab6efb0b7ad4e3f26da57c226", - "type": "github" - }, - "original": { - "dir": "contrib", - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, "neovim-nightly-overlay": { "inputs": { "flake-compat": "flake-compat_4", "flake-parts": "flake-parts_3", + "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", - "neovim-flake": "neovim-flake", + "neovim-src": "neovim-src", "nixpkgs": [ "nixpkgs" - ] + ], + "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1711670984, - "narHash": "sha256-orA2u5/LqpdPCvYUZnQStarJjjRMylTDYS8JKf97ZfU=", + "lastModified": 1733930887, + "narHash": "sha256-RRba45YTJqwG7mwVWhnmMRJlVmBN5uwJqkIRQ2aBKdM=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "6a5e80c188d3f3763a624df1610294b4a11764a0", + "rev": "83b492d3af77e09af44875b7fceba99a9e8a5ea5", "type": "github" }, "original": { @@ -1335,10 +1298,26 @@ "type": "github" } }, + "neovim-src": { + "flake": false, + "locked": { + "lastModified": 1733850961, + "narHash": "sha256-GpdTTQ1g7tERjY/rzGZtiWd5eAqKsTtPJN/LEBkTU0E=", + "owner": "neovim", + "repo": "neovim", + "rev": "3f1d09bc94d02266d6fa588a2ccd1be1ca084cf7", + "type": "github" + }, + "original": { + "owner": "neovim", + "repo": "neovim", + "type": "github" + } + }, "nix-eval-jobs": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -1362,11 +1341,11 @@ ] }, "locked": { - "lastModified": 1720334033, - "narHash": "sha256-X9pEvvHTVWJphhbUYqXvlLedOndNqGB7rvhSvL2CIgU=", + "lastModified": 1733024876, + "narHash": "sha256-vy9Q41hBE7Zg0yakF79neVgb3i3PQMSMR7uHPpPywFE=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "685e40e1348007d2cf76747a201bab43d86b38cb", + "rev": "6e0b7f81367069589a480b91603a10bcf71f3103", "type": "github" }, "original": { @@ -1377,11 +1356,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1720429258, - "narHash": "sha256-d6JI5IgJ1xdrk7DvYVx7y8ijcYz5I1nhCwOiDP6cq00=", + "lastModified": 1733481457, + "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "72d3c007024ce47d838bb38693c8773812f54bf2", + "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", "type": "github" }, "original": { @@ -1393,17 +1372,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719253556, - "narHash": "sha256-A/76RFUVxZ/7Y8+OMVL1Lc8LRhBxZ8ZE2bpMnvZ1VpY=", + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc07dc3bdf2956ddd64f24612ea7fc894933eb2e", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "fc07dc3bdf2956ddd64f24612ea7fc894933eb2e", "type": "github" } }, @@ -1473,11 +1452,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { @@ -1488,6 +1467,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1705331948, + "narHash": "sha256-qjQXfvrAT1/RKDFAMdl8Hw3m4tLVvMCc8fMqzJv0pP4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b8dd8be3c790215716e7c12b247f45ca525867e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b8dd8be3c790215716e7c12b247f45ca525867e2", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1701539137, "narHash": "sha256-nVO/5QYpf1GwjvtpXhyxx5M3U/WN0MwBro4Lsk+9mL0=", @@ -1503,7 +1498,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1689261696, "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=", @@ -1519,7 +1514,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1710765496, "narHash": "sha256-p7ryWEeQfMwTB6E0wIUd5V2cFTgq+DRRBz2hYGnJZyA=", @@ -1535,13 +1530,13 @@ "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { - "lastModified": 1700856099, - "narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=", + "lastModified": 1732238832, + "narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1", + "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d", "type": "github" }, "original": { @@ -1552,6 +1547,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1719253556, + "narHash": "sha256-A/76RFUVxZ/7Y8+OMVL1Lc8LRhBxZ8ZE2bpMnvZ1VpY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fc07dc3bdf2956ddd64f24612ea7fc894933eb2e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fc07dc3bdf2956ddd64f24612ea7fc894933eb2e", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1719082008, "narHash": "sha256-jHJSUH619zBQ6WdC21fFAlDxHErKVDJ5fpN0Hgx4sjs=", @@ -1567,7 +1578,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1702272962, "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", @@ -1581,7 +1592,7 @@ "type": "indirect" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1693443141, "narHash": "sha256-uvXHx0ysNeEPC4UjPiwNgX/8z9ItBS4GLkcM7ency+w=", @@ -1597,7 +1608,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1679679161, "narHash": "sha256-weTfVvy077MKvm+62R3dj+EpL9u7xe/PTWWH8nDHYfM=", @@ -1612,7 +1623,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1658371388, "narHash": "sha256-ACjtJNUAqjAdR+o5EDcOGgK3aseB+IF1TSBNPVftdLg=", @@ -1628,34 +1639,18 @@ "type": "github" } }, - "nixpkgs_7": { - "locked": { - "lastModified": 1728500571, - "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_8": { "locked": { - "lastModified": 1705331948, - "narHash": "sha256-qjQXfvrAT1/RKDFAMdl8Hw3m4tLVvMCc8fMqzJv0pP4=", - "owner": "NixOS", + "lastModified": 1733412085, + "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "b8dd8be3c790215716e7c12b247f45ca525867e2", + "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-23.11", + "owner": "nixos", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -1671,16 +1666,16 @@ }, "original": { "owner": "NixOS", + "ref": "nixos-23.11", "repo": "nixpkgs", - "rev": "b8dd8be3c790215716e7c12b247f45ca525867e2", "type": "github" } }, "openapi-code-generator": { "inputs": { "autodocodec": "autodocodec_3", - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_10", + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_11", "pre-commit-hooks": "pre-commit-hooks_2", "safe-coloured-text": "safe-coloured-text_2", "sydtest": "sydtest_2", @@ -1704,7 +1699,7 @@ "inputs": { "flake-compat": "flake-compat_2", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -1723,10 +1718,10 @@ }, "pre-commit-hooks_2": { "inputs": { - "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_6", - "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_11", + "flake-compat": "flake-compat_6", + "flake-utils": "flake-utils_5", + "gitignore": "gitignore_3", + "nixpkgs": "nixpkgs_12", "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { @@ -1745,10 +1740,10 @@ }, "pre-commit-hooks_3": { "inputs": { - "flake-compat": "flake-compat_6", - "flake-utils": "flake-utils_7", - "gitignore": "gitignore_3", - "nixpkgs": "nixpkgs_12", + "flake-compat": "flake-compat_7", + "flake-utils": "flake-utils_6", + "gitignore": "gitignore_4", + "nixpkgs": "nixpkgs_13", "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { @@ -1768,7 +1763,7 @@ "purenix": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1659759527, @@ -1843,7 +1838,7 @@ "inputs": { "easy-purescript-nix": "easy-purescript-nix", "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "purenix": "purenix", "purescript-registry": "purescript-registry", "purescript-registry-index": "purescript-registry-index" @@ -1877,7 +1872,7 @@ "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nixpkgs-unstable": "nixpkgs-unstable", "smos": "smos", "sops-nix": "sops-nix", @@ -2008,7 +2003,7 @@ "linkcheck": "linkcheck_2", "looper": "looper", "mergeful": "mergeful", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "openapi-code-generator": "openapi-code-generator", "pre-commit-hooks": "pre-commit-hooks_3", "safe-coloured-text": "safe-coloured-text_3", @@ -2075,7 +2070,7 @@ }, "spicetify-nix": { "inputs": { - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_8", "nixpkgs": [ "nixpkgs" ] @@ -2097,31 +2092,30 @@ "stylix": { "inputs": { "base16": "base16", - "base16-alacritty": "base16-alacritty", - "base16-alacritty-yaml": "base16-alacritty-yaml", "base16-fish": "base16-fish", - "base16-foot": "base16-foot", "base16-helix": "base16-helix", - "base16-kitty": "base16-kitty", - "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_8", + "flake-compat": "flake-compat_9", + "flake-utils": "flake-utils_7", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_14", + "systems": "systems_6", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1710366273, - "narHash": "sha256-MkeXZkh1OQ3fiWzDgOUAhguBUPQQZDdF8fhXuLxjTBY=", + "lastModified": 1733858997, + "narHash": "sha256-PMZdRUZQlouWgHFCFW8ANDFL6fUjZ67KAEaqRXwRwvc=", "owner": "danth", "repo": "stylix", - "rev": "a33d88cf8f75446f166f2ff4f810a389feed2d56", + "rev": "bc25f3d69d3bb54548b772d7c2771e65cc37dc10", "type": "github" }, "original": { "owner": "danth", "repo": "stylix", - "rev": "a33d88cf8f75446f166f2ff4f810a389feed2d56", "type": "github" } }, @@ -2279,6 +2273,56 @@ "type": "github" } }, + "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1726913040, + "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + } + }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1716423189, + "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1729501581, + "narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -2302,6 +2346,27 @@ "type": "github" } }, + "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733761991, + "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "validity": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 79c80db..c22c612 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ # {{{ Inputs inputs = { # {{{ Nixpkgs instances - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # }}} # {{{ Additional package repositories @@ -23,7 +23,7 @@ disko.inputs.nixpkgs.follows = "nixpkgs"; # }}} - home-manager.url = "github:nix-community/home-manager/release-24.05"; + home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nix-index-database.url = "github:Mic92/nix-index-database"; @@ -50,7 +50,6 @@ # }}} anyrun.url = "github:Kirottu/anyrun"; - anyrun.inputs.nixpkgs.follows = "nixpkgs"; miros.url = "github:prescientmoon/miros"; miros.inputs.nixpkgs.follows = "nixpkgs"; @@ -63,7 +62,7 @@ darkmatter-grub-theme.url = "gitlab:VandalByte/darkmatter-grub-theme"; darkmatter-grub-theme.inputs.nixpkgs.follows = "nixpkgs"; - stylix.url = "github:danth/stylix/a33d88cf8f75446f166f2ff4f810a389feed2d56"; + stylix.url = "github:danth/stylix"; # stylix.inputs.nixpkgs.follows = "nixpkgs"; # stylix.inputs.home-manager.follows = "home-manager"; @@ -201,14 +200,14 @@ nixConfig = { extra-substituters = [ "https://nix-community.cachix.org" - # "https://anyrun.cachix.org" + "https://anyrun.cachix.org" "https://smos.cachix.org" "https://intray.cachix.org" ]; extra-trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - # "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s=" + "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s=" "smos.cachix.org-1:YOs/tLEliRoyhx7PnNw36cw2Zvbw5R0ASZaUlpUv+yM=" "intray.cachix.org-1:qD7I/NQLia2iy6cbzZvFuvn09iuL4AkTmHvjxrQlccQ=" ]; diff --git a/home/features/cli/fish/config.fish b/home/features/cli/fish/config.fish index 026f5d5..fde69de 100644 --- a/home/features/cli/fish/config.fish +++ b/home/features/cli/fish/config.fish @@ -27,6 +27,6 @@ end # }}} # {{{ Helpers function take -d "Create a directory and cd into it" - mkdir $argv; and cd $argv + mkdir -p $argv; and cd $argv end # }}} diff --git a/home/features/desktop/firefox/default.nix b/home/features/desktop/firefox/default.nix index 5da3995..64ab996 100644 --- a/home/features/desktop/firefox/default.nix +++ b/home/features/desktop/firefox/default.nix @@ -269,6 +269,24 @@ in ]; }; + "Yu-Gi-Oh! wiki" = mkBasicSearchEngine { + url = "https://yugipedia.com/index.php"; + param = "search"; + aliases = [ + "@ygo" + "@yugioh-wiki" + ]; + }; + + "Yu-Gi-Oh! card prices" = mkBasicSearchEngine { + url = "https://www.cardmarket.com/en/YuGiOh/Products/Search"; + param = "searchString"; + aliases = [ + "@cm" + "@cardmarket" + ]; + }; + "Moonythm" = mkBasicSearchEngine { url = "https://search.moonythm.dev/search"; param = "q"; diff --git a/home/features/neovim/config/lazy-lock.json b/home/features/neovim/config/lazy-lock.json index 415323d..9444d54 100644 --- a/home/features/neovim/config/lazy-lock.json +++ b/home/features/neovim/config/lazy-lock.json @@ -1,57 +1,59 @@ { - "catppuccin": { "branch": "main", "commit": "9703f227bfab20d04bcee62d2f08f1795723b4ae" }, + "catppuccin": { "branch": "main", "commit": "faf15ab0201b564b6368ffa47b56feefc92ce3f4" }, "clipboard-image": { "branch": "main", "commit": "4ab6f7f1fa4ea97866c0e0f6160f6a36ef174438" }, - "cmp": { "branch": "main", "commit": "7e348da6e5085ac447144a2ef4b637220ba27209" }, + "cmp": { "branch": "main", "commit": "3403e2e9391ed0a28c3afddd8612701b647c8e26" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-emoji": { "branch": "main", "commit": "e8398e2adf512a03bb4e1728ca017ffeac670a9f" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform": { "branch": "master", "commit": "cd75be867f2331b22905f47d28c0c270a69466aa" }, - "crates": { "branch": "main", "commit": "c3fd47391de6999f4c939af89494d08443f71916" }, - "dressing": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" }, + "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, + "conform": { "branch": "master", "commit": "f4e8837878fc5712d053ba3091a73d27d96a09e2" }, + "crates": { "branch": "main", "commit": "8bf8358ee326d5d8c11dcd7ac0bcc9ff97dbc785" }, + "dap": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, + "dressing": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" }, "fidget": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, - "flash": { "branch": "main", "commit": "d0799ae43a581d9f190e182e2a1f389d2887c42a" }, + "flash": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "ftft": { "branch": "master", "commit": "f3e43c9584e14b27f04c27a95a9d9f0e58dfec02" }, "github-actions": { "branch": "master", "commit": "728374ef59b11a5f5991ea2560d149a4ae33fd22" }, "gitlinker": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" }, - "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" }, + "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, "haskell-tools": { "branch": "master", "commit": "92e097c6832405fb64e4c44a7ce8bebe7836cae6" }, "hyprland": { "branch": "main", "commit": "71760fe0cad972070657b0528f48456f7e0027b2" }, - "idris": { "branch": "main", "commit": "8bff02984a33264437e70fd9fff4359679d910da" }, - "indent-blankline": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, + "idris": { "branch": "main", "commit": "fd051fa8dde6541a6d345e020a05d2cc8f7a3f8d" }, + "indent-blankline": { "branch": "master", "commit": "259357fa4097e232730341fa60988087d189193a" }, "lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" }, - "lean": { "branch": "main", "commit": "182703184edb866d7bfe878be358295e189c8223" }, + "lean": { "branch": "main", "commit": "202513a398e780dac32d36159181a8299d9cfd12" }, "live-command": { "branch": "main", "commit": "d460067d47948725a6f25b20f31ea8bbfdfe4622" }, - "lspconfig": { "branch": "master", "commit": "216deb2d1b5fbf24398919228208649bbf5cbadf" }, - "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, + "lspconfig": { "branch": "master", "commit": "b1729954329236f59d075bec79fdee7a6f3ce88b" }, + "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, "luasnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, - "mini.ai": { "branch": "main", "commit": "45587078f323eaf41b9f701bbc04f8d1ab008979" }, - "mini.comment": { "branch": "main", "commit": "080f00bb91fea4bab799820bd2ce835a88d0703a" }, - "mini.files": { "branch": "main", "commit": "acfc4e46f6722a0690ce640632c5b5515ddade70" }, - "mini.operators": { "branch": "main", "commit": "7d30c0bc5baaa1f0d3a63dd18b35c8581bc164f4" }, - "mini.pairs": { "branch": "main", "commit": "927d19cbdd0e752ab1c7eed87072e71d2cd6ff51" }, - "mini.statusline": { "branch": "main", "commit": "ec7e2c509c7262fef85a28a772f60ebe146297db" }, - "mini.surround": { "branch": "main", "commit": "57caca9525cec0ea771a67326b0ee637d056078a" }, + "mini.ai": { "branch": "main", "commit": "ebb04799794a7f94628153991e6334c3304961b8" }, + "mini.comment": { "branch": "main", "commit": "a56581c40c19fa26f2b39da72504398de3173c5a" }, + "mini.files": { "branch": "main", "commit": "84efb81e5207ae8c41f54abdafb79c6212fc0971" }, + "mini.operators": { "branch": "main", "commit": "7cb4dc66c51a3d736d347bbc517dc73dc7d28888" }, + "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" }, + "mini.statusline": { "branch": "main", "commit": "813854243156472c9d0bc9c64ea0af159b9b37ca" }, + "mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" }, "navigator": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" }, - "neoconf": { "branch": "main", "commit": "23f24edab5f78465a0bc3320678e038664b9aa6e" }, + "neoconf": { "branch": "main", "commit": "05d25c121e07c464d6b4203204aa113453eca152" }, "neodev": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, - "neotest": { "branch": "master", "commit": "6d6ad113f56edc7c3f2a77a0836ea8c1b955ebea" }, - "neotest-haskell": { "branch": "master", "commit": "10cd953fb7c81de82ce8dc618e0614e0ab5fa1e3" }, - "nui": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, + "neotest": { "branch": "master", "commit": "6d3d22cdad49999ef774ebe1bc250a4994038964" }, + "neotest-haskell": { "branch": "master", "commit": "af2b3a37d46cbfb50735da306a7b584c6a643716" }, + "nui": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, "null-ls": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, + "nvim-dap": { "branch": "master", "commit": "a6070b4e9e9a8ff1bc513c3748eff27080b0f44a" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "obsidian": { "branch": "main", "commit": "6ddc2d4dbe044b8e114c52633c04391077f1f734" }, - "plenary": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, + "plenary": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "purescript": { "branch": "main", "commit": "82348352e6568fcc0385bd7c99a8ead3a479feea" }, - "quicker.nvim": { "branch": "master", "commit": "183041a46d6c908eefb1c23ea02cce9c8f41256e" }, - "rustacean": { "branch": "master", "commit": "5c0c44149e43b907dae2e0fe053284ad56226eb7" }, + "quicker.nvim": { "branch": "master", "commit": "049d66534d3de5920663ee1b8dd0096d70f55a67" }, + "rustacean": { "branch": "master", "commit": "a244210b28f9055c2b4cfa85c92c8a71c13671c9" }, "rzip": { "branch": "master", "commit": "f65400fed27b27c7cff7ef8d428c4e5ff749bf28" }, "scrap": { "branch": "main", "commit": "cc8453ed613932c744c3d1ec42f379b78bd8b92c" }, "telescope": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "typst": { "branch": "main", "commit": "4d18ced62599ffe5b3c0e5e49566d5456121bc02" }, - "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" }, - "wakatime": { "branch": "master", "commit": "3cb40867cb5a3120f9bef76eff88edc7f1dc1a23" }, - "web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" } -} \ No newline at end of file + "typst": { "branch": "main", "commit": "8ce752f1ba1277046429cb469c17ff2e1abc718f" }, + "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" }, + "wakatime": { "branch": "master", "commit": "cf51327a9e08935569614d1cb24e779ee9f45519" }, + "web-devicons": { "branch": "master", "commit": "e73d2774d12d0ecf9e05578d692ba1ea50508cf2" } +} diff --git a/home/features/neovim/config/lua/my/helpers/folding.lua b/home/features/neovim/config/lua/my/helpers/folding.lua index 374e944..fddaa71 100644 --- a/home/features/neovim/config/lua/my/helpers/folding.lua +++ b/home/features/neovim/config/lua/my/helpers/folding.lua @@ -2,8 +2,8 @@ local M = {} local function createFold(name) local commentstring = vim.o.commentstring - local start_comment = string.gsub(commentstring, "%%s", " {{{ " .. name) - local end_comment = string.gsub(commentstring, "%%s", " }}}") + local start_comment = string.gsub(commentstring, "%%s", "{{{ " .. name) + local end_comment = string.gsub(commentstring, "%%s", "}}}") -- Leave visual mode local esc = vim.api.nvim_replace_termcodes("", true, false, true) diff --git a/home/features/neovim/config/lua/my/lazy.lua b/home/features/neovim/config/lua/my/lazy.lua index 3cfc37c..d4c5b4d 100644 --- a/home/features/neovim/config/lua/my/lazy.lua +++ b/home/features/neovim/config/lua/my/lazy.lua @@ -15,6 +15,7 @@ function M.setup() unpack(require("nix").lazy), }, { defaults = { lazy = true }, + rocks = { enabled = false }, install = { -- install missing plugins on startup. this doesn't increase startup time. missing = true, diff --git a/home/features/neovim/default.nix b/home/features/neovim/default.nix index e5b1791..b8d3eee 100644 --- a/home/features/neovim/default.nix +++ b/home/features/neovim/default.nix @@ -258,36 +258,13 @@ let autocmds = { event = "LspAttach"; group = "UserLspConfig"; - action = - let - nmap = - mapping: action: desc: - nlib.nmap mapping (vim /lsp/buf/${action}) desc; - in - { - mkContext = event: { - bufnr = lua event /buf; - client = vim /lsp/get_client_by_id (lua event /data/client_id); - }; - keys = [ - (nlib.nmap "li" "LspInfo" "[L]sp [i]nfo") - (nmap "gd" "definition" "[G]o to [d]efinition") - (nmap "gi" "implementation" "[G]o to [i]mplementation") - (nmap "gr" "references" "[G]o to [r]eferences") - (nmap "L" "signature_help" "Signature help") - (nmap "c" "code_action" "[C]ode actions") - (keymap "v" "c" ":'<,'> lua vim.lsp.buf.range_code_action()" "[C]ode actions") - (nmap "wa" "add_workspace_folder" "[W]orkspace [A]dd Folder") - (nmap "wr" "remove_workspace_folder" "[W]orkspace [R]emove Folder") - (nlib.nmap "wl" ( - _: print (vim /inspect (vim /ps/buf/list_workspace_folders none)) - ) "[W]orkspace [L]ist Folders") - ]; - callback = { - cond = ctx: return (lua ctx /client/supports_method "textDocument/hover"); - keys = nmap "K" "hover" "Hover"; - }; + action = { + mkContext = event: { + bufnr = lua event /buf; + client = vim /lsp/get_client_by_id (lua event /data/client_id); }; + keys = [ ]; + }; }; # }}} }; @@ -865,6 +842,7 @@ let in lib.flatten [ (operator "=") + (operator "m") (operator "x") (operator "r") (operator "s") @@ -1010,11 +988,12 @@ let event = "VeryLazy"; + keys = nmap "li" "LspInfo" "[L]sp [i]nfo"; config = _: importFrom ./plugins/lspconfig.lua "config" { # We handle formatting using null-ls and prettierd - tsserver.on_attach = client: '' + ts_ls.on_attach = client: '' ${client}.server_capabilities.documentFormattingProvider = false ''; @@ -1081,6 +1060,7 @@ let dhall_lsp_server = { }; elmls = { }; csharp_ls = { }; + ols = { }; # Odin }; }; # }}} @@ -1229,6 +1209,15 @@ let # }}} }; # }}} + # {{{ dap + dap = { + package = "rcarriga/nvim-dap-ui"; + dependencies.lua = [ + "mfussenegger/nvim-dap" + "nvim-neotest/nvim-nio" + ]; + }; + # }}} # }}} # {{{ language support # {{{ haskell support @@ -1265,6 +1254,10 @@ let dependencies.nix = lib.lists.optionals packedTargets.rust [ pkgs.rust-analyzer pkgs.rustfmt + + # Recommended by rustacean.nvim as providing a better experience + # than raw lldb + pkgs.vscode-extensions.vadimcn.vscode-lldb.adapter ]; lazy = false; # This plugin is already lazy @@ -1647,7 +1640,11 @@ let # }}} # {{{ Clients neovim = wrapClient { - base = if config.satellite.toggles.neovim-nightly.enable then pkgs.neovim-nightly else upkgs.neovim; + base = + if config.satellite.toggles.neovim-nightly.enable then + inputs.neovim-nightly-overlay.packages.${pkgs.system}.default + else + upkgs.neovim; name = "nvim"; }; diff --git a/home/features/neovim/snippets/common/math-phrases.miros b/home/features/neovim/snippets/common/math-phrases.miros index 9e2109c..46cf188 100644 --- a/home/features/neovim/snippets/common/math-phrases.miros +++ b/home/features/neovim/snippets/common/math-phrases.miros @@ -6,9 +6,9 @@ block auto !word abbr wpbd we will prove the statement in both directions. abbr itf it then follows - for who <- @⟨which,this⟩ - for what <- @⟨means,implies⟩ - abbr @⟨@who:ww,tt⟩@⟨@what:m,i⟩ @who @what + -- for who <- @⟨which,this⟩ + -- for what <- @⟨means,implies⟩ + -- abbr @⟨@who:ww,tt⟩@⟨@what:m,i⟩ @who @what abbr stam statement abbr cox counterexample diff --git a/home/features/neovim/snippets/tex.miros b/home/features/neovim/snippets/tex.miros index e33ecc2..bf33e77 100644 --- a/home/features/neovim/snippets/tex.miros +++ b/home/features/neovim/snippets/tex.miros @@ -39,6 +39,16 @@ block auto !math start string item snip \item$|1⟨,[$1] $0⟩ + + for kind <- @⟨chapter,section,subsection,subsubsection⟩ + + string @kind + name @kind environment + snip + \\@kind⋄{$1} + $0 + + -- }}} block text @@ -220,7 +230,6 @@ block math abbr niinf -\ifty abbr eniinf ^{-\ifty} abbr sniinf _{-\ifty} - abbr ccan \cancel abbr mul \cdot abbr nlnl \pm abbr limsup \lim\sup @@ -248,7 +257,7 @@ block math for noperator <- @⟨ordop,land,lor,equiv,pmod,ldots,cdots,perp,angle,sup⟩ abbr @noperator \\@noperator - for operator <- @⟨overline,hat,bar,abs,norm,prob,diprod,sin,cos,sqrt,ln,lrb,zmod,gen,pmob⟩ + for operator <- @⟨cancel,overline,hat,tilde,vec,bar,abs,norm,prob,diprod,sin,cos,sqrt,ln,lrb,zmod,gen,pmob⟩ string @operator snip \\@operator$|1⟨{$1}, $0⟩ diff --git a/home/features/wayland/hyprland/hyprland.conf b/home/features/wayland/hyprland/hyprland.conf index 59a9e7d..274b8e2 100644 --- a/home/features/wayland/hyprland/hyprland.conf +++ b/home/features/wayland/hyprland/hyprland.conf @@ -54,6 +54,7 @@ animations { # Execute apps at launch exec-once = foot & firefox & vesktop & gtk-launch obsidiantui & gtk-launch smostui & Spotify +exec-once = fcitx5 # Without this, xdg-open doesn't work exec = systemctl --user import-environment PATH && systemctl --user restart xdg-desktop-portal.service @@ -92,6 +93,7 @@ bind = $mod, Q, exec, wlogout # Show logout menu bind = $mod, L, exec, loginctl lock-session # Lock screen bind = $mod, P, exec, anyrun bind = $mod, B, exec, wlsunset-toggle # Toggle blue light filter thingy +bind = $mod SHIFT, B, exec, notify-sent $(acpi) bind = $mod, V, exec, foot vimclip # Vim anywhere! bind = $mod, W, exec, ~/projects/form-filler/type.sh @@ -170,6 +172,6 @@ binde=, XF86MonBrightnessDown, exec, swayosd-client --brightness lower # }}} # {{{ App-specific global keybinds # OBS -bind = SUPER, F4, pass, ^(com\.obsproject\.Studio)$ # Start / Stop recording +# bind = SUPER, F4, pass, ^(com\.obsproject\.Studio)$ # Start / Stop recording # }}} # }}} diff --git a/home/global.nix b/home/global.nix index 8b0f404..cb09319 100644 --- a/home/global.nix +++ b/home/global.nix @@ -35,21 +35,6 @@ in # Import all modules defined in modules/home-manager imports = builtins.attrValues outputs.homeManagerModules ++ imports; - # {{{ Nixpkgs - nixpkgs = { - # Add all overlays defined in the overlays directory - overlays = - builtins.attrValues outputs.overlays - ++ lib.lists.optional config.satellite.toggles.neovim-nightly.enable inputs.neovim-nightly-overlay.overlay; - - config.allowUnfree = true; - - config.permittedInsecurePackages = [ - "electron-25.9.0" - "nix-2.15.3" - ]; - }; - # }}} # {{{ Enable the home-manager and git clis programs = { home-manager.enable = true; diff --git a/home/tethys.nix b/home/tethys.nix index 35f6b9c..bc837c7 100644 --- a/home/tethys.nix +++ b/home/tethys.nix @@ -10,6 +10,7 @@ ./features/cli/zellij.nix ./features/desktop/discord ./features/desktop/firefox + ./features/desktop/gaming/edopro.nix ./features/desktop/foot.nix ./features/desktop/obsidian.nix ./features/desktop/spotify.nix @@ -45,14 +46,15 @@ qbittorrent # Torrent client # google-chrome # Not my primary browser, but sometimes needed in webdev # plover.dev # steno engine - overskride # Bluetooth client + freetube # youtube client # }}} # {{{ Media playing/recording mpv # Video player imv # Image viewer # peek # GIF recorder # obs-studio # video recorder + wl-screenrec # }}} ]; diff --git a/hosts/nixos/calypso/hardware/default.nix b/hosts/nixos/calypso/hardware/default.nix index f63a729..3a2b5bb 100644 --- a/hosts/nixos/calypso/hardware/default.nix +++ b/hosts/nixos/calypso/hardware/default.nix @@ -11,7 +11,7 @@ # }}} # {{{ Misc hardware.enableAllFirmware = true; - hardware.opengl.enable = true; + hardware.graphics.enable = true; hardware.opentabletdriver.enable = true; hardware.keyboard.qmk.enable = true; # }}} diff --git a/hosts/nixos/common/global/default.nix b/hosts/nixos/common/global/default.nix index 28a52ed..4197021 100644 --- a/hosts/nixos/common/global/default.nix +++ b/hosts/nixos/common/global/default.nix @@ -2,8 +2,8 @@ { inputs, lib, - config, outputs, + pkgs, ... }: let @@ -52,15 +52,6 @@ in boot.initrd.systemd.enable = true; # }}} - nixpkgs = { - # Add all overlays defined in the overlays directory - overlays = - builtins.attrValues outputs.overlays - ++ lib.lists.optional config.satellite.toggles.neovim-nightly.enable inputs.neovim-nightly-overlay.overlay; - - config.allowUnfree = true; - }; - # Root domain used throughout my config satellite.dns.domain = "moonythm.dev"; } diff --git a/hosts/nixos/common/optional/bluetooth.nix b/hosts/nixos/common/optional/bluetooth.nix index c6ea80a..54a63e2 100644 --- a/hosts/nixos/common/optional/bluetooth.nix +++ b/hosts/nixos/common/optional/bluetooth.nix @@ -2,4 +2,5 @@ { hardware.bluetooth.enable = true; hardware.bluetooth.powerOnBoot = true; + systemd.services.bluetooth.serviceConfig.ConfigurationDirectoryMode = "755"; } diff --git a/hosts/nixos/common/optional/pipewire.nix b/hosts/nixos/common/optional/pipewire.nix index 5b4c471..c26e096 100644 --- a/hosts/nixos/common/optional/pipewire.nix +++ b/hosts/nixos/common/optional/pipewire.nix @@ -12,14 +12,17 @@ }; # https://nixos.wiki/wiki/PipeWire - environment.etc = { - "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = '' - bluez_monitor.properties = { - ["bluez5.enable-sbc-xq"] = true, - ["bluez5.enable-msbc"] = true, - ["bluez5.enable-hw-volume"] = true, - ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]" - } - ''; + services.pipewire.wireplumber.extraConfig.bluetoothEnhancements = { + "monitor.bluez.properties" = { + "bluez5.enable-sbc-xq" = true; + "bluez5.enable-msbc" = true; + "bluez5.enable-hw-volume" = true; + "bluez5.roles" = [ + "hsp_hs" + "hsp_ag" + "hfp_hf" + "hfp_ag" + ]; + }; }; } diff --git a/hosts/nixos/common/optional/services/wpa_supplicant.nix b/hosts/nixos/common/optional/services/wpa_supplicant.nix index 03da89c..bb743ae 100644 --- a/hosts/nixos/common/optional/services/wpa_supplicant.nix +++ b/hosts/nixos/common/optional/services/wpa_supplicant.nix @@ -8,22 +8,22 @@ fallbackToWPA2 = false; # Declarative - environmentFile = config.sops.secrets.wireless.path; + secretsFile = config.sops.secrets.wireless.path; networks = { - "Neptune".psk = "@ENCELADUS_HOTSPOT_PASS@"; + "Neptune".pskRaw = "ext:ENCELADUS_HOTSPOT_PASS"; - "Familia-Matei-PRO".psk = "@TG_HOTSPOT_HOME_PASS@"; - "Familia-Matei".psk = "@TG_HOTSPOT_HOME_PASS@"; + "Familia-Matei-PRO".pskRaw = "ext:TG_HOTSPOT_HOME_PASS"; + "Familia-Matei".pskRaw = "ext:TG_HOTSPOT_HOME_PASS"; - "R15-5365 5g".psk = "@TG_WIFI_HOME_PASS@"; - "R15-5365".psk = "@TG_WIFI_HOME_PASS@"; + "R15-5365 5g".pskRaw = "ext:TG_WIFI_HOME_PASS"; + "R15-5365".pskRaw = "ext:TG_WIFI_HOME_PASS"; - "Sailhorse".psk = "@NL_PLACE_0_PASS@"; - "Ziggo1721699".psk = "@NL_PLACE_1_PASS@"; - "Konijntjes".psk = "@NL_PLACE_1_PODS_PASS@"; - "InfoEdu12".psk = "@INFOEDU_PASS@"; - "CNU19".psk = "@INFOEDU_PASS@"; - "ZTE_F7A321".psk = "@MADALINA_PASS@"; + "Sailhorse".pskRaw = "ext:NL_PLACE_0_PASS"; + "Ziggo1721699".pskRaw = "ext:NL_PLACE_1_PASS"; + "Konijntjes".pskRaw = "ext:NL_PLACE_1_PODS_PASS"; + "InfoEdu12".pskRaw = "ext:INFOEDU_PASS"; + "CNU19".pskRaw = "ext:INFOEDU_PASS"; + "ZTE_F7A321".pskRaw = "ext:MADALINA_PASS"; # [Working solution](https://bbs.archlinux.org/viewtopic.php?id=271336) # [Other interesting link](https://help.itc.rwth-aachen.de/en/service/b3d9a2c8ae5345b8b8f5128143ef4e3c/article/eaf6d69389a74a5a839c1f383c508df7/) @@ -33,7 +33,7 @@ auth = '' eap=PEAP identity="s5260329@rug.nl" - password="@EDUROAM_PASS@" + password="ext:EDUROAM_PASS" ''; extraConfig = '' phase2="auth=MSCHAPV2" diff --git a/hosts/nixos/tethys/boot.nix b/hosts/nixos/tethys/boot.nix index 4f61302..a2a28db 100644 --- a/hosts/nixos/tethys/boot.nix +++ b/hosts/nixos/tethys/boot.nix @@ -1,6 +1,10 @@ -{ inputs, ... }: { +{ inputs, pkgs, ... }: +{ imports = [ inputs.darkmatter-grub-theme.nixosModule ]; + # https://github.com/NixOS/nixpkgs/issues/314425 + boot.kernelPackages = pkgs.linuxPackages_6_12; + # See [the wiki page](https://nixos.wiki/wiki/Dual_Booting_NixOS_and_Windows) boot.loader = { efi = { diff --git a/hosts/nixos/tethys/default.nix b/hosts/nixos/tethys/default.nix index 2285081..7945643 100644 --- a/hosts/nixos/tethys/default.nix +++ b/hosts/nixos/tethys/default.nix @@ -62,4 +62,15 @@ # {{{ SSH keys users.users.pilot.openssh.authorizedKeys.keyFiles = [ ../calypso/keys/id_ed25519.pub ]; # }}} + + i18n.inputMethod = { + type = "fcitx5"; + enable = true; + fcitx5.addons = with pkgs; [ + fcitx5-mozc # for japanese input + fcitx5-gtk + ]; + fcitx5.waylandFrontend = true; + }; + } diff --git a/hosts/nixos/tethys/hardware/default.nix b/hosts/nixos/tethys/hardware/default.nix index a416f58..153e01c 100644 --- a/hosts/nixos/tethys/hardware/default.nix +++ b/hosts/nixos/tethys/hardware/default.nix @@ -11,7 +11,7 @@ # }}} # {{{ Misc hardware.enableAllFirmware = true; - hardware.opengl.enable = true; + hardware.graphics.enable = true; hardware.opentabletdriver.enable = true; hardware.keyboard.qmk.enable = true; # }}}