diff --git a/flake.lock b/flake.lock index 7479445..b6746ad 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ "base16-nvim-src": { "flake": false, "locked": { - "lastModified": 1713467988, - "narHash": "sha256-p3HWYasmi0gVUM5l9jLWL4Iy37Uxnvbj3SO/cMCpDBg=", + "lastModified": 1716483968, + "narHash": "sha256-GRF/6AobXHamw8TZ3FjL7SI6ulcpwpcohsIuZeCSh2A=", "owner": "RRethy", "repo": "base16-nvim", - "rev": "eec6882101dd189117f79c5d18d389d20cfc0415", + "rev": "6ac181b5733518040a33017dde654059cd771b7c", "type": "github" }, "original": { @@ -35,40 +35,28 @@ "bufferline-nvim-src": { "flake": false, "locked": { - "lastModified": 1706180994, - "narHash": "sha256-/iGzUDJaodkUyWpwim8UtwaRuarfu/Nk6wxVApk+QxY=", + "lastModified": 1716555412, + "narHash": "sha256-8PCkY1zrlMrPGnQOb7MjqDXNlkeX46jrT4ScIL+MOwM=", "owner": "akinsho", "repo": "bufferline.nvim", - "rev": "d6cb9b7cac52887bcac65f8698e67479553c0748", + "rev": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe", "type": "github" }, "original": { "owner": "akinsho", - "ref": "v4.5.0", + "ref": "v4.6.1", "repo": "bufferline.nvim", "type": "github" } }, - "bypass-paywalls-clean": { - "flake": false, - "locked": { - "narHash": "sha256-VZey1VgabUpsiN+mdSNzoMfxICSNKtZIuvISFcMUDw4=", - "type": "file", - "url": "https://github.com/bpc-clone/bpc_updates/releases/download/latest/bypass_paywalls_clean-3.6.6.0.xpi" - }, - "original": { - "type": "file", - "url": "https://github.com/bpc-clone/bpc_updates/releases/download/latest/bypass_paywalls_clean-3.6.6.0.xpi" - } - }, "cmp-nvim-lsp-src": { "flake": false, "locked": { - "lastModified": 1702205473, - "narHash": "sha256-/0sh9vJBD9pUuD7q3tNSQ1YLvxFMNykdg5eG+LjZAA8=", + "lastModified": 1715931395, + "narHash": "sha256-CT1+Z4XJBVsl/RqvJeGmyitD6x7So0ylXvvef5jh7I8=", "owner": "hrsh7th", "repo": "cmp-nvim-lsp", - "rev": "5af77f54de1b16c34b23cba810150689a3a90312", + "rev": "39e2eda76828d88b773cc27a3f61d2ad782c922d", "type": "github" }, "original": { @@ -77,23 +65,6 @@ "type": "github" } }, - "comment-nvim-src": { - "flake": false, - "locked": { - "lastModified": 1681214440, - "narHash": "sha256-48hy+hiaDJLlgWqC7IeZI3dT+VwWkRo4atQbyPxu/ys=", - "owner": "numToStr", - "repo": "Comment.nvim", - "rev": "e51f2b142d88bb666dcaa77d93a07f4b419aca70", - "type": "github" - }, - "original": { - "owner": "numToStr", - "ref": "v0.8.0", - "repo": "Comment.nvim", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -101,11 +72,11 @@ ] }, "locked": { - "lastModified": 1713946171, - "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=", + "lastModified": 1716511055, + "narHash": "sha256-5Fe/DGgvMhPEMl9VdVxv3zvwRcwNDmW5eRJ0gk72w7U=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7", + "rev": "0bea8222f6e83247dd13b055d83e64bce02ee532", "type": "github" }, "original": { @@ -122,11 +93,11 @@ ] }, "locked": { - "lastModified": 1714612856, - "narHash": "sha256-W7+rtMzRmdovzndN2NYUv5xzkbMudtQ3jbyFuGk0O1E=", + "lastModified": 1716773194, + "narHash": "sha256-rskkGmWlvYFb+CXedBiL8eWEuED0Es0XR4CkJ11RQKY=", "owner": "nix-community", "repo": "disko", - "rev": "d57058eb09dd5ec00c746df34fe0a603ea744370", + "rev": "10986091e47fb1180620b78438512b294b7e8f67", "type": "github" }, "original": { @@ -138,16 +109,16 @@ "fidget-nvim-src": { "flake": false, "locked": { - "lastModified": 1704696337, - "narHash": "sha256-uAX/RGfOmsUIUaDepNwUpK8MBaTMBJ4rLZ69y0MwpNE=", + "lastModified": 1716093309, + "narHash": "sha256-Gpk/G0ByOAIE8uX4Xr94CvAjJBSJMEOwBuvrhmYYGsg=", "owner": "j-hui", "repo": "fidget.nvim", - "rev": "3a93300c076109d86c7ce35ec67a8034ae6ba9db", + "rev": "ef99df04a1c53a453602421bc0f756997edc8289", "type": "github" }, "original": { "owner": "j-hui", - "ref": "v1.2.0", + "ref": "v1.4.5", "repo": "fidget.nvim", "type": "github" } @@ -159,11 +130,11 @@ ] }, "locked": { - "lastModified": 1714869979, - "narHash": "sha256-kTAMHZ1DDGauq3f5IzPw+EtVOgWdctLPUMJiqciqOx0=", + "lastModified": 1716857077, + "narHash": "sha256-IvdZLdbPqJFkIbcDjMCMbdhrHjhS6k0SZk9IvJAI/fI=", "owner": "bandithedoge", "repo": "nixpkgs-firefox-darwin", - "rev": "7e9014891eebabffa68351e3360da3fbc59b8066", + "rev": "539f092808e92ffbab69d8dc307f7db88d721a9c", "type": "github" }, "original": { @@ -227,11 +198,11 @@ "hmts-nvim-src": { "flake": false, "locked": { - "lastModified": 1710430870, - "narHash": "sha256-bsOQX56ciQ8ni7Zh4ZNtTvptvy/YaDPG318AsEaZRpE=", + "lastModified": 1715076655, + "narHash": "sha256-vDTqJQzLyg0nmlC+CrLnPkYti1rPxmvRW8eQq/9Zg+M=", "owner": "calops", "repo": "hmts.nvim", - "rev": "473d74cf54da8f51aaa9993ec3e6bfae278eb47b", + "rev": "19a91816c123173a4551a6a04f2882338f20db1d", "type": "github" }, "original": { @@ -247,11 +218,11 @@ ] }, "locked": { - "lastModified": 1714865296, - "narHash": "sha256-02r2Qzh4fGYBPB/3Lj8vwPMtE6H/UchZnN7A/dQMHIA=", + "lastModified": 1716847642, + "narHash": "sha256-rjEswRV0o23eBBils8lJXyIGha+l/VjV73IPg+ztxgk=", "owner": "nix-community", "repo": "home-manager", - "rev": "e0825ea2112d09d9f0680833cd716f6aee3b973f", + "rev": "10c7c219b7dae5795fb67f465a0d86cbe29f25fa", "type": "github" }, "original": { @@ -264,11 +235,11 @@ "kitty-scrollback-nvim-src": { "flake": false, "locked": { - "lastModified": 1714049193, - "narHash": "sha256-LICARktpc04vaHpFuAFDrZsYKy2HJme6LMtoXMi7jJ8=", + "lastModified": 1716487246, + "narHash": "sha256-yHyco+ftcpJAVWhwA8ItKa0IZgNJZjCQQjuyVG93xUs=", "owner": "mikesmithgh", "repo": "kitty-scrollback.nvim", - "rev": "22f524f1fa9c7660804a1800ed0fe981c5d392c8", + "rev": "08960ad9a96ff6ea6269157dbd4a8a499f7a4311", "type": "github" }, "original": { @@ -293,7 +264,7 @@ "nextcloud-external": { "flake": false, "locked": { - "lastModified": 1699624348, + "lastModified": 1699624334, "narHash": "sha256-RCL2RP5twRDLxI/KfAX6QLYQOzqZmSWsfrC5ZQIwTD4=", "type": "tarball", "url": "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz" @@ -337,11 +308,11 @@ ] }, "locked": { - "lastModified": 1707832982, - "narHash": "sha256-Jsrj8HJyo+PmjrHIDhq4gjZCE0eYCVmmTrx24cG8eOQ=", + "lastModified": 1715598267, + "narHash": "sha256-xriYT6Tu6THN0n3ZOVLy3C0x61OVQOe9U1XvLhg463M=", "owner": "gytis-ivaskevicius", "repo": "nix2vim", - "rev": "2fb1328cf058fc967b02f9a5330a99253b4c247e", + "rev": "fa1b1cbf6c17883143fcbbc840e5ecf6557af072", "type": "github" }, "original": { @@ -373,11 +344,11 @@ ] }, "locked": { - "lastModified": 1713783234, - "narHash": "sha256-3yh0nqI1avYUmmtqqTW3EVfwaLE+9ytRWxsA5aWtmyI=", + "lastModified": 1716210724, + "narHash": "sha256-iqQa3omRcHGpWb1ds75jS9ruA5R39FTmAkeR3J+ve1w=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "722b512eb7e6915882f39fff0e4c9dd44f42b77e", + "rev": "d14b286322c7f4f897ca4b1726ce38cb68596c94", "type": "github" }, "original": { @@ -388,11 +359,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714635257, - "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", "type": "github" }, "original": { @@ -420,11 +391,11 @@ }, "nur": { "locked": { - "lastModified": 1714880338, - "narHash": "sha256-G/dc755qMdAMvXuZsi1OFCzD49OWszdMSnp12+1eFcM=", + "lastModified": 1716892974, + "narHash": "sha256-THmLi8tNElts9aPkHV68tyON6LgaMvfrmu8j4h4v6Aw=", "owner": "nix-community", "repo": "nur", - "rev": "49f72c695fb2f46c8aeb1549704246b9558b2011", + "rev": "f45a1ca97c3e7b5ec5d970977b5ec44b5f466857", "type": "github" }, "original": { @@ -436,11 +407,11 @@ "nvim-lint-src": { "flake": false, "locked": { - "lastModified": 1714489830, - "narHash": "sha256-aM4oWSZrZb660wEpLQnFyoBkH+MSi0WgfBIztk98Qtk=", + "lastModified": 1716409152, + "narHash": "sha256-L5G634dM8kFWH+WxLCaMx+XY6Pzd++m0O4qRH1dS5PA=", "owner": "mfussenegger", "repo": "nvim-lint", - "rev": "861a04313501563bb1b11f125ae9b7237a517b9b", + "rev": "e19842a05aae484957ad20710444757bc0a61d63", "type": "github" }, "original": { @@ -452,16 +423,16 @@ "nvim-lspconfig-src": { "flake": false, "locked": { - "lastModified": 1701687137, - "narHash": "sha256-qFjFofA2LoD4yRfx4KGfSCpR3mDkpFaagcm+TVNPqco=", + "lastModified": 1716281382, + "narHash": "sha256-foJ7a59N0a3QaBW24PtwbyYDQVlIsFxiatADLO/hQvc=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "cf3dd4a290084a868fac0e2e876039321d57111c", + "rev": "0b8165cf95806bc4bb8f745bb0c92021b2ed4b98", "type": "github" }, "original": { "owner": "neovim", - "ref": "v0.1.7", + "ref": "v0.1.8", "repo": "nvim-lspconfig", "type": "github" } @@ -469,11 +440,11 @@ "nvim-tree-lua-src": { "flake": false, "locked": { - "lastModified": 1714794673, - "narHash": "sha256-rY4FbuqBM4zOUkaA3QBc+UrpfTha8uGtp+lIzrYK+cg=", + "lastModified": 1716876666, + "narHash": "sha256-rj/LdWQUSBcbxsUKfZp7N/qVC9/sWc/5PYwHVpBRm2U=", "owner": "kyazdani42", "repo": "nvim-tree.lua", - "rev": "64f61e4c913047a045ff90bd188dd3b54ee443cf", + "rev": "5a87ffe35c4739ffb6b62052572583ad277a20ae", "type": "github" }, "original": { @@ -485,11 +456,11 @@ "nvim-treesitter-src": { "flake": false, "locked": { - "lastModified": 1714811590, - "narHash": "sha256-3Ae3ieCqckVAElTufJxgBRNXdWg81++oI0qesKevcb4=", + "lastModified": 1716878762, + "narHash": "sha256-gXlbgvF9dtHof8xDSxGsACGCInMucjT3jiKB1T+VOm8=", "owner": "nvim-treesitter", "repo": "nvim-treesitter", - "rev": "4e21361e15b1d4147830c5fe571556eb1b14e6f9", + "rev": "ea2b137f35fb1e87a6471ec311805920fdf45745", "type": "github" }, "original": { @@ -536,9 +507,7 @@ "baleia-nvim-src": "baleia-nvim-src", "base16-nvim-src": "base16-nvim-src", "bufferline-nvim-src": "bufferline-nvim-src", - "bypass-paywalls-clean": "bypass-paywalls-clean", "cmp-nvim-lsp-src": "cmp-nvim-lsp-src", - "comment-nvim-src": "comment-nvim-src", "darwin": "darwin", "disko": "disko", "fidget-nvim-src": "fidget-nvim-src", @@ -609,16 +578,16 @@ "telescope-nvim-src": { "flake": false, "locked": { - "lastModified": 1701167040, - "narHash": "sha256-H5RpyWMluE+Yxg7xFX43AZTVW+Yg70DF3FmEGXBUSNg=", + "lastModified": 1716532947, + "narHash": "sha256-e1ulhc4IIvUgpjKQrSqPY4WpXuez6wlxL6Min9U0o5Q=", "owner": "nvim-telescope", "repo": "telescope.nvim", - "rev": "d90956833d7c27e73c621a61f20b29fdb7122709", + "rev": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026", "type": "github" }, "original": { "owner": "nvim-telescope", - "ref": "0.1.5", + "ref": "0.1.8", "repo": "telescope.nvim", "type": "github" } @@ -642,16 +611,16 @@ "toggleterm-nvim-src": { "flake": false, "locked": { - "lastModified": 1701858874, - "narHash": "sha256-vJApw7XY2wOX9InfWcah+hkNxBfS1+kQUWr4ITxRmgA=", + "lastModified": 1713792255, + "narHash": "sha256-mM5bGgAemsRJD9U6U5K6ia5qb8NaTusM99x6xrtEBfw=", "owner": "akinsho", "repo": "toggleterm.nvim", - "rev": "cbd041d91b90cd3c02df03fe6133208888f8e008", + "rev": "066cccf48a43553a80a210eb3be89a15d789d6e6", "type": "github" }, "original": { "owner": "akinsho", - "ref": "v2.9.0", + "ref": "v2.11.0", "repo": "toggleterm.nvim", "type": "github" } @@ -659,11 +628,11 @@ "tree-sitter-bash": { "flake": false, "locked": { - "lastModified": 1712878661, - "narHash": "sha256-sj1qYb42k0hXXcNCKg1hINYD11wDcVpnoPhZNtlYT6k=", + "lastModified": 1715005250, + "narHash": "sha256-rCuQbnQAOnQWKYreNH80nlL+0A1qbWbjMvtczcoWPrY=", "owner": "tree-sitter", "repo": "tree-sitter-bash", - "rev": "f8fb3274f72a30896075585b32b0c54cad65c086", + "rev": "2fbd860f802802ca76a6661ce025b3a3bca2d3ed", "type": "github" }, "original": { @@ -676,11 +645,11 @@ "tree-sitter-ini": { "flake": false, "locked": { - "lastModified": 1699877527, - "narHash": "sha256-dYPeVTNWO4apY5dsjsKViavU7YtLeGTp6BzEemXhsEU=", + "lastModified": 1716889525, + "narHash": "sha256-IyHrIxcmuzs60zUiJv4E3nSkhSkgbcaLDUdeDx5mlHk=", "owner": "justinmk", "repo": "tree-sitter-ini", - "rev": "bcb84a2d4bcd6f55b911c42deade75c8f90cb0c5", + "rev": "87176e524f0a98f5be75fa44f4f0ff5c6eac069c", "type": "github" }, "original": { @@ -742,11 +711,11 @@ "tree-sitter-rasi": { "flake": false, "locked": { - "lastModified": 1707776004, - "narHash": "sha256-7zhQ5wGm0FFyuTiBVN2KgvUTw8G6fwUGR8HKJ69kR+c=", + "lastModified": 1716296585, + "narHash": "sha256-sPrIVgGGaBaXeqHNxjcdJ/S2FvxyV6rD9UPKU/tpspw=", "owner": "Fymyte", "repo": "tree-sitter-rasi", - "rev": "43196d934a9a6ab3c7093a8683efd0111bb03db1", + "rev": "6c9bbcfdf5f0f553d9ebc01750a3aa247a37b8aa", "type": "github" }, "original": { @@ -796,11 +765,11 @@ ] }, "locked": { - "lastModified": 1714355896, - "narHash": "sha256-rtv+nJJ12V7w68j8vIcGacfS1yuK1/dBgglSKWzYMTM=", + "lastModified": 1716640344, + "narHash": "sha256-AZKQs+KrL70le0RZH8XqZJMc2SahU4LpfEJ2Vd5SWzM=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "acb893461a4bee4e77b1a27b1410d4995b52174c", + "rev": "020cd466170204e448b24b246045599fce69ad91", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c1ac2f5..7941968 100644 --- a/flake.nix +++ b/flake.nix @@ -68,7 +68,7 @@ }; nvim-lspconfig-src = { # https://github.com/neovim/nvim-lspconfig/tags - url = "github:neovim/nvim-lspconfig/v0.1.7"; + url = "github:neovim/nvim-lspconfig/v0.1.8"; flake = false; }; cmp-nvim-lsp-src = { @@ -80,11 +80,6 @@ url = "github:m00qek/baleia.nvim"; flake = false; }; - comment-nvim-src = { - # https://github.com/numToStr/Comment.nvim/releases - url = "github:numToStr/Comment.nvim/v0.8.0"; - flake = false; - }; nvim-treesitter-src = { # https://github.com/nvim-treesitter/nvim-treesitter/tags url = "github:nvim-treesitter/nvim-treesitter/master"; @@ -92,7 +87,7 @@ }; telescope-nvim-src = { # https://github.com/nvim-telescope/telescope.nvim/releases - url = "github:nvim-telescope/telescope.nvim/0.1.5"; + url = "github:nvim-telescope/telescope.nvim/0.1.8"; flake = false; }; telescope-project-nvim-src = { @@ -101,12 +96,12 @@ }; toggleterm-nvim-src = { # https://github.com/akinsho/toggleterm.nvim/tags - url = "github:akinsho/toggleterm.nvim/v2.9.0"; + url = "github:akinsho/toggleterm.nvim/v2.11.0"; flake = false; }; bufferline-nvim-src = { # https://github.com/akinsho/bufferline.nvim/releases - url = "github:akinsho/bufferline.nvim/v4.5.0"; + url = "github:akinsho/bufferline.nvim/v4.6.1"; flake = false; }; nvim-tree-lua-src = { @@ -119,7 +114,7 @@ }; fidget-nvim-src = { # https://github.com/j-hui/fidget.nvim/tags - url = "github:j-hui/fidget.nvim/v1.2.0"; + url = "github:j-hui/fidget.nvim/v1.4.5"; flake = false; }; kitty-scrollback-nvim-src = { @@ -177,13 +172,6 @@ flake = false; }; - # Firefox addon from outside the extension store - bypass-paywalls-clean = { - # https://gitlab.com/magnolia1234/bpc-uploads/-/commits/master/?ref_type=HEADS - url = "https://github.com/bpc-clone/bpc_updates/releases/download/latest/bypass_paywalls_clean-3.6.6.0.xpi"; - flake = false; - }; - # Nextcloud Apps nextcloud-news = { # https://github.com/nextcloud/news/releases @@ -257,7 +245,6 @@ (import ./overlays/nextcloud-apps.nix inputs) (import ./overlays/betterlockscreen.nix) (import ./overlays/gh-collaborators.nix) - (import ./overlays/bypass-paywalls-clean.nix inputs) (import ./overlays/ren-rep.nix inputs) ]; diff --git a/modules/common/applications/firefox.nix b/modules/common/applications/firefox.nix index f866ace..a6c6cc8 100644 --- a/modules/common/applications/firefox.nix +++ b/modules/common/applications/firefox.nix @@ -35,7 +35,6 @@ # https://nur.nix-community.org/repos/rycee/ extensions = with pkgs.nur.repos.rycee.firefox-addons; [ (lib.mkIf config._1password.enable onepassword-password-manager) - pkgs.bypass-paywalls-clean darkreader don-t-fuck-with-paste facebook-container diff --git a/modules/common/neovim/config/misc.nix b/modules/common/neovim/config/misc.nix index 10a1c6d..3c4abdc 100644 --- a/modules/common/neovim/config/misc.nix +++ b/modules/common/neovim/config/misc.nix @@ -10,7 +10,6 @@ pkgs.vimPlugins.vim-eunuch # File manipulation commands pkgs.vimPlugins.vim-fugitive # Git commands pkgs.vimPlugins.vim-repeat # Better repeat using . - pkgs.vimPlugins.comment-nvim # Smart comment commands pkgs.vimPlugins.glow-nvim # Markdown preview popup pkgs.vimPlugins.nvim-colorizer-lua # Hex color previews pkgs.vimPlugins.which-key-nvim # Keybind helper @@ -18,7 +17,6 @@ ]; # Initialize some plugins - setup.Comment = { }; setup.colorizer = { user_default_options = { names = false; @@ -44,7 +42,6 @@ scrolloff = 3; # Margin of lines to see while scrolling splitright = true; # Vertical splits on the right side splitbelow = true; # Horizontal splits on the bottom side - pastetoggle = ""; # Use F3 to enter raw paste mode clipboard = "unnamedplus"; # Uses system clipboard for yanking updatetime = 300; # Faster diagnostics mouse = "nv"; # Mouse interaction / scrolling diff --git a/modules/nixos/graphical/xorg.nix b/modules/nixos/graphical/xorg.nix index df2717f..8069187 100644 --- a/modules/nixos/graphical/xorg.nix +++ b/modules/nixos/graphical/xorg.nix @@ -8,13 +8,13 @@ config = lib.mkIf config.gui.enable { + # Enable touchpad support + services.libinput.enable = true; + # Enable the X11 windowing system. services.xserver = { enable = config.gui.enable; - # Enable touchpad support - libinput.enable = true; - # Login screen displayManager = { lightdm = { diff --git a/overlays/neovim-plugins.nix b/overlays/neovim-plugins.nix index ae4d568..19a1454 100644 --- a/overlays/neovim-plugins.nix +++ b/overlays/neovim-plugins.nix @@ -25,7 +25,6 @@ in nvim-lspconfig = withSrc prev.vimPlugins.nvim-lspconfig inputs.nvim-lspconfig-src; cmp-nvim-lsp = withSrc prev.vimPlugins.cmp-nvim-lsp inputs.cmp-nvim-lsp-src; - comment-nvim = withSrc prev.vimPlugins.comment-nvim inputs.comment-nvim-src; nvim-treesitter = withSrc prev.vimPlugins.nvim-treesitter inputs.nvim-treesitter-src; telescope-nvim = withSrc prev.vimPlugins.telescope-nvim inputs.telescope-nvim-src; telescope-project-nvim = withSrc prev.vimPlugins.telescope-project-nvim inputs.telescope-project-nvim-src;