From dfb90a6b16ce2afcb7d8ec2a6641af6fab00409d Mon Sep 17 00:00:00 2001 From: buffet Date: Mon, 12 Jun 2023 12:09:54 +0200 Subject: [PATCH] chore: update to nixos 23.05 --- flake.lock | 34 +++++++++----------------------- flake.nix | 4 ++-- programs/firefox.nix | 47 ++++++++++++++++++++++---------------------- programs/mako.nix | 2 +- programs/nvim.nix | 9 +-------- 5 files changed, 37 insertions(+), 59 deletions(-) diff --git a/flake.lock b/flake.lock index c1333be..2708b48 100644 --- a/flake.lock +++ b/flake.lock @@ -149,20 +149,19 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": "utils" + ] }, "locked": { - "lastModified": 1681092193, - "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=", + "lastModified": 1685599623, + "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af", + "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-22.11", + "ref": "release-23.05", "repo": "home-manager", "type": "github" } @@ -184,16 +183,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1686476475, - "narHash": "sha256-W9yUePvCSDghn+YUXewuodyPxt+kJl/a7zdY4Q6r4MU=", + "lastModified": 1686431482, + "narHash": "sha256-oPVQ/0YP7yC2ztNsxvWLrV+f0NQ2QAwxbrZ+bgGydEM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eef86b8a942913a828b9ef13722835f359deef29", + "rev": "d3bb401dcfc5a46ce51cdfb5762e70cc75d082d2", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } @@ -280,21 +279,6 @@ "type": "github" } }, - "utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "vim-hy": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 6d748f2..366eafc 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { inputs = { impermanence.url = "github:nix-community/impermanence"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nur.url = "github:nix-community/NUR"; @@ -36,7 +36,7 @@ }; home-manager = { - url = "github:nix-community/home-manager/release-22.11"; + url = "github:nix-community/home-manager/release-23.05"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/programs/firefox.nix b/programs/firefox.nix index 225af87..eeb6ee8 100644 --- a/programs/firefox.nix +++ b/programs/firefox.nix @@ -9,31 +9,32 @@ enable = true; package = pkgs.firefox-wayland; - extensions = with config.nur.repos.rycee.firefox-addons; - let - # TODO: switch to yomitan - yomichan = buildFirefoxXpiAddon { - pname = "yomichan"; - version = "20.5.22.1"; - addonId = "alex@foosoft.net"; - url = "https://addons.mozilla.org/firefox/downloads/file/3585060/yomichan-20.5.22.1.xpi"; - sha256 = "sha256-/icvPD/nCJYS31owfYMD25QzFjsxAqapy/UAehhxsy8="; - meta = with lib; { - description = "Yomichan turns your browser into a tool for building Japanese language literacy by helping you to decipher texts which would be otherwise too difficult tackle. It features a robust dictionary with EPWING and flashcard creation support."; - license = licenses.gpl3; - platforms = platforms.all; - }; - }; - in [ - bitwarden - i-dont-care-about-cookies - refined-github - sidebery - ublock-origin - yomichan - ]; profiles."buffet" = { + extensions = with config.nur.repos.rycee.firefox-addons; + let + # TODO: switch to yomitan + yomichan = buildFirefoxXpiAddon { + pname = "yomichan"; + version = "20.5.22.1"; + addonId = "alex@foosoft.net"; + url = "https://addons.mozilla.org/firefox/downloads/file/3585060/yomichan-20.5.22.1.xpi"; + sha256 = "sha256-/icvPD/nCJYS31owfYMD25QzFjsxAqapy/UAehhxsy8="; + meta = with lib; { + description = "Yomichan turns your browser into a tool for building Japanese language literacy by helping you to decipher texts which would be otherwise too difficult tackle. It features a robust dictionary with EPWING and flashcard creation support."; + license = licenses.gpl3; + platforms = platforms.all; + }; + }; + in [ + bitwarden + i-dont-care-about-cookies + refined-github + sidebery + ublock-origin + yomichan + ]; + settings = { "toolkit.legacyUserProfileCustomizations.stylesheets" = true; }; diff --git a/programs/mako.nix b/programs/mako.nix index b7013fc..28f5d76 100644 --- a/programs/mako.nix +++ b/programs/mako.nix @@ -1,6 +1,6 @@ {pkgs, ...}: { home-manager.users.buffet = { - programs.mako = let + services.mako = let theme = import ../theme.nix; in { enable = true; diff --git a/programs/nvim.nix b/programs/nvim.nix index 0e53571..84909ac 100644 --- a/programs/nvim.nix +++ b/programs/nvim.nix @@ -65,13 +65,6 @@ config = "lua require 'cmp_git'.setup {}"; } - { - plugin = copilot-vim; - config = '' - let g:copilot_node_command = "${pkgs.nodejs-16_x}/bin/node" - ''; - } - { plugin = crates-nvim; config = '' @@ -237,6 +230,7 @@ { plugin = kanagawa-nvim; config = '' + colorscheme kanagawa lua <