chore: update to nixos 23.05

This commit is contained in:
buffet 2023-06-12 12:09:54 +02:00
parent 54dfdf41d0
commit dfb90a6b16
5 changed files with 37 additions and 59 deletions

View file

@ -149,20 +149,19 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ]
"utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1681092193, "lastModified": 1685599623,
"narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=", "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af", "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-22.11", "ref": "release-23.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -184,16 +183,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1686476475, "lastModified": 1686431482,
"narHash": "sha256-W9yUePvCSDghn+YUXewuodyPxt+kJl/a7zdY4Q6r4MU=", "narHash": "sha256-oPVQ/0YP7yC2ztNsxvWLrV+f0NQ2QAwxbrZ+bgGydEM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "eef86b8a942913a828b9ef13722835f359deef29", "rev": "d3bb401dcfc5a46ce51cdfb5762e70cc75d082d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-22.11", "ref": "nixos-23.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -280,21 +279,6 @@
"type": "github" "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": { "vim-hy": {
"flake": false, "flake": false,
"locked": { "locked": {

View file

@ -1,7 +1,7 @@
{ {
inputs = { inputs = {
impermanence.url = "github:nix-community/impermanence"; 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"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
@ -36,7 +36,7 @@
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-22.11"; url = "github:nix-community/home-manager/release-23.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

View file

@ -9,31 +9,32 @@
enable = true; enable = true;
package = pkgs.firefox-wayland; 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" = { 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 = { settings = {
"toolkit.legacyUserProfileCustomizations.stylesheets" = true; "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
}; };

View file

@ -1,6 +1,6 @@
{pkgs, ...}: { {pkgs, ...}: {
home-manager.users.buffet = { home-manager.users.buffet = {
programs.mako = let services.mako = let
theme = import ../theme.nix; theme = import ../theme.nix;
in { in {
enable = true; enable = true;

View file

@ -65,13 +65,6 @@
config = "lua require 'cmp_git'.setup {}"; config = "lua require 'cmp_git'.setup {}";
} }
{
plugin = copilot-vim;
config = ''
let g:copilot_node_command = "${pkgs.nodejs-16_x}/bin/node"
'';
}
{ {
plugin = crates-nvim; plugin = crates-nvim;
config = '' config = ''
@ -237,6 +230,7 @@
{ {
plugin = kanagawa-nvim; plugin = kanagawa-nvim;
config = '' config = ''
colorscheme kanagawa
lua <<EOF lua <<EOF
local colors = require 'kanagawa.colors'.setup(); local colors = require 'kanagawa.colors'.setup();
@ -246,7 +240,6 @@
}, },
} }
EOF EOF
colorscheme kanagawa
''; '';
} }