chore: upgrade to NixOS 23.05
This commit is contained in:
parent
028e515ec9
commit
e77fc1fe1d
|
@ -8,12 +8,12 @@
|
|||
native-window-placement
|
||||
appindicator
|
||||
(pop-shell.overrideAttrs (old: rec {
|
||||
version = "unstable-2022-10-11";
|
||||
version = "unstable-2023-04-27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "shell";
|
||||
rev = "886a069c0582b371e90ac3602b1747ea5fba616c";
|
||||
sha256 = "DwJ3IFhYuEW0LQrmN/mOspEiudj4X5BCLhdOyP74EVs=";
|
||||
rev = "b5acccefcaa653791d25f70a22c0e04f1858d96e";
|
||||
sha256 = "w6EBHKWJ4L3ZRVmFqZhCqHGumbElQXk9udYSnwjIl6c=";
|
||||
};
|
||||
patches = [ ];
|
||||
postPatch = ''
|
||||
|
|
19
flake.lock
19
flake.lock
|
@ -164,22 +164,19 @@
|
|||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"utils": [
|
||||
"flake-utils"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681092193,
|
||||
"narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=",
|
||||
"lastModified": 1685480784,
|
||||
"narHash": "sha256-pkk3J9gX745LEkkeTGhSRJqPJkmCPQzwI/q7a720XaY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af",
|
||||
"rev": "54a9d6456eaa6195998a0f37bdbafee9953ca0fb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-22.11",
|
||||
"ref": "release-23.05",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
|
@ -202,16 +199,16 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1685468986,
|
||||
"narHash": "sha256-YSj3K71KjRZgeL0hS3sYLYHI0g8aIVIf9lcsRMCIW2A=",
|
||||
"lastModified": 1685451684,
|
||||
"narHash": "sha256-Y5iqtWkO82gHAnrBvNu/yLQsiVNJRCad4wWGz2a1urk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9af373a61647257d16ae6062cddaa9094d24920c",
|
||||
"rev": "6b0edc9c690c1d8a729f055e0d73439045cfda55",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-22.11",
|
||||
"ref": "nixos-23.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
|
||||
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
|
||||
|
||||
inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
|
||||
|
@ -8,7 +8,7 @@
|
|||
inputs.flake-utils.url = "github:numtide/flake-utils";
|
||||
|
||||
inputs.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.utils.follows = "flake-utils";
|
||||
};
|
||||
|
|
|
@ -52,6 +52,4 @@
|
|||
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
||||
hardware.cpu.intel.updateMicrocode =
|
||||
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
# high-resolution display
|
||||
hardware.video.hidpi.enable = lib.mkDefault true;
|
||||
}
|
||||
|
|
|
@ -31,9 +31,11 @@
|
|||
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
kbdInteractiveAuthentication = false;
|
||||
passwordAuthentication = false;
|
||||
permitRootLogin = "no";
|
||||
settings = {
|
||||
KbdInteractiveAuthentication = false;
|
||||
PasswordAuthentication = false;
|
||||
PermitRootLogin = "no";
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
|
|
|
@ -116,9 +116,11 @@ in with builtins; {
|
|||
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
kbdInteractiveAuthentication = false;
|
||||
passwordAuthentication = false;
|
||||
permitRootLogin = "no";
|
||||
settings = {
|
||||
KbdInteractiveAuthentication = false;
|
||||
PasswordAuthentication = false;
|
||||
PermitRootLogin = "no";
|
||||
};
|
||||
inherit hostKeys;
|
||||
};
|
||||
|
||||
|
|
|
@ -53,16 +53,15 @@ in {
|
|||
private = {
|
||||
id = 0;
|
||||
extraConfig = sharedExtraConfig;
|
||||
# extensions = commonExtensions ++ (with firefox-addons; [ metamask ]);
|
||||
extensions = commonExtensions ++ (with firefox-addons; [ metamask ]);
|
||||
};
|
||||
work = {
|
||||
id = 1;
|
||||
extraConfig = sharedExtraConfig;
|
||||
# extensions = commonExtensions
|
||||
# ++ (with firefox-addons; [ react-devtools reduxdevtools ]);
|
||||
extensions = commonExtensions
|
||||
++ (with firefox-addons; [ react-devtools reduxdevtools ]);
|
||||
};
|
||||
};
|
||||
extensions = commonExtensions ++ (with firefox-addons; [ metamask ]);
|
||||
};
|
||||
|
||||
home.packages = let
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
programs.helix = {
|
||||
enable = true;
|
||||
package = pkgs.unstable.helix;
|
||||
languages = [
|
||||
languages.language = [
|
||||
{
|
||||
name = "rust";
|
||||
config.rust-analyzer = {
|
||||
|
|
|
@ -9,7 +9,7 @@ require("nvim-lightbulb").setup({
|
|||
LspFormat = function(bufnr)
|
||||
vim.lsp.buf.format({
|
||||
filter = function(client)
|
||||
return not vim.tbl_contains({ "tsserver", "jsonls", "rnix" }, client.name)
|
||||
return not vim.tbl_contains({ "tsserver", "jsonls" }, client.name)
|
||||
end,
|
||||
bufnr,
|
||||
timeout_ms = 5000,
|
||||
|
@ -123,7 +123,7 @@ local runtime_path = vim.split(package.path, ';')
|
|||
table.insert(runtime_path, "lua/?.lua")
|
||||
table.insert(runtime_path, "lua/?/init.lua")
|
||||
|
||||
config.sumneko_lua.setup {
|
||||
config.lua_ls.setup {
|
||||
on_attach = on_attach,
|
||||
capabilities = capabilities,
|
||||
settings = {
|
||||
|
|
|
@ -1,13 +1,13 @@
|
|||
require("neorg").setup {
|
||||
load = {
|
||||
["core.defaults"] = {},
|
||||
["core.norg.concealer"] = {},
|
||||
["core.norg.completion"] = {
|
||||
["core.concealer"] = {},
|
||||
["core.completion"] = {
|
||||
config = {
|
||||
engine = "nvim-cmp",
|
||||
},
|
||||
},
|
||||
["core.norg.dirman"] = {
|
||||
["core.dirman"] = {
|
||||
config = {
|
||||
workspaces = {
|
||||
work = "~/notes/work",
|
||||
|
@ -15,12 +15,7 @@ require("neorg").setup {
|
|||
},
|
||||
},
|
||||
},
|
||||
["core.norg.qol.toc"] = {},
|
||||
["core.gtd.base"] = {
|
||||
config = {
|
||||
workspace = "home",
|
||||
},
|
||||
},
|
||||
["core.qol.toc"] = {},
|
||||
},
|
||||
}
|
||||
|
||||
|
|
|
@ -56,7 +56,7 @@
|
|||
tabbed
|
||||
|
||||
# work
|
||||
teams
|
||||
teams-for-linux
|
||||
|
||||
# dev
|
||||
postman
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
# kitty/neovim don't play well with multi-width emojis
|
||||
nix_shell.symbol = " ";
|
||||
};
|
||||
# @TODO broken in nixos-22.11
|
||||
enableNushellIntegration = false;
|
||||
enableNushellIntegration = true;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -9,7 +9,8 @@ in {
|
|||
imports = [ ./esphome.nix ];
|
||||
|
||||
# just installed for ConBee firmware updates
|
||||
environment.systemPackages = with pkgs; [ deconz ];
|
||||
# TODO deconz package is currently broken
|
||||
# environment.systemPackages = with pkgs; [ deconz ];
|
||||
|
||||
services.nginx = {
|
||||
virtualHosts."${config.networking.domain}" = {
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
postStart = ''
|
||||
while ! ${pkgs.mullvad}/bin/mullvad status >/dev/null; do sleep 1; done
|
||||
|
||||
${pkgs.mullvad}/bin/mullvad always-require-vpn set on
|
||||
${pkgs.mullvad}/bin/mullvad lockdown-mode set on
|
||||
${pkgs.mullvad}/bin/mullvad auto-connect set on
|
||||
${pkgs.mullvad}/bin/mullvad dns set default \
|
||||
--block-ads --block-trackers --block-malware
|
||||
|
|
|
@ -7,5 +7,5 @@
|
|||
virtualisation.podman.dockerCompat = true;
|
||||
virtualisation.podman.dockerSocket.enable = true;
|
||||
virtualisation.podman.extraPackages = with pkgs; [ ];
|
||||
virtualisation.podman.defaultNetwork.dnsname.enable = true;
|
||||
virtualisation.podman.defaultNetwork.settings.dns_enabled = true;
|
||||
}
|
||||
|
|
|
@ -29,9 +29,11 @@
|
|||
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
kbdInteractiveAuthentication = false;
|
||||
passwordAuthentication = false;
|
||||
permitRootLogin = "no";
|
||||
settings = {
|
||||
KbdInteractiveAuthentication = false;
|
||||
PasswordAuthentication = false;
|
||||
PermitRootLogin = "no";
|
||||
};
|
||||
};
|
||||
|
||||
# only change this when specified in release notes
|
||||
|
|
Loading…
Reference in a new issue