felschr/nixos-config
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

chore: upgrade to NixOS 23.05

Browse source
This commit is contained in:
Felix Schröter 2023-05-31 17:25:46 +02:00
parent 028e515ec9
commit e77fc1fe1d
Signed by: felschr
GPG key ID: 671E39E6744C807D
16 changed files with 44 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
desktop/gnome.nix
View file

@ -8,12 +8,12 @@
native-window-placement native-window-placement
appindicator appindicator
(pop-shell.overrideAttrs (old: rec { (pop-shell.overrideAttrs (old: rec {
version = "unstable-2022-10-11"; version = "unstable-2023-04-27";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pop-os"; owner = "pop-os";
repo = "shell"; repo = "shell";
rev = "886a069c0582b371e90ac3602b1747ea5fba616c"; rev = "b5acccefcaa653791d25f70a22c0e04f1858d96e";
sha256 = "DwJ3IFhYuEW0LQrmN/mOspEiudj4X5BCLhdOyP74EVs="; sha256 = "w6EBHKWJ4L3ZRVmFqZhCqHGumbElQXk9udYSnwjIl6c=";
}; };
patches = [ ]; patches = [ ];
postPatch = '' postPatch = ''

19
flake.lock
View file

@ -164,22 +164,19 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
],
"utils": [
"flake-utils"
] ]
}, },
"locked": { "locked": {
"lastModified": 1681092193, "lastModified": 1685480784,
"narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=", "narHash": "sha256-pkk3J9gX745LEkkeTGhSRJqPJkmCPQzwI/q7a720XaY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af", "rev": "54a9d6456eaa6195998a0f37bdbafee9953ca0fb",
"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"
} }
@ -202,16 +199,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1685468986, "lastModified": 1685451684,
"narHash": "sha256-YSj3K71KjRZgeL0hS3sYLYHI0g8aIVIf9lcsRMCIW2A=", "narHash": "sha256-Y5iqtWkO82gHAnrBvNu/yLQsiVNJRCad4wWGz2a1urk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9af373a61647257d16ae6062cddaa9094d24920c", "rev": "6b0edc9c690c1d8a729f055e0d73439045cfda55",
"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"
} }

4
flake.nix
View file

@ -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"; inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
@ -8,7 +8,7 @@
inputs.flake-utils.url = "github:numtide/flake-utils"; inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.home-manager = { 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.nixpkgs.follows = "nixpkgs";
inputs.utils.follows = "flake-utils"; inputs.utils.follows = "flake-utils";
}; };

2
hardware/lattepanda.nix
View file

@ -52,6 +52,4 @@
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
hardware.cpu.intel.updateMicrocode = hardware.cpu.intel.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware; lib.mkDefault config.hardware.enableRedistributableFirmware;
# high-resolution display
hardware.video.hidpi.enable = lib.mkDefault true;
} }

8
home-pc.nix
View file

@ -31,9 +31,11 @@
services.openssh = { services.openssh = {
enable = true; enable = true;
kbdInteractiveAuthentication = false; settings = {
passwordAuthentication = false; KbdInteractiveAuthentication = false;
permitRootLogin = "no"; PasswordAuthentication = false;
PermitRootLogin = "no";
};
}; };
networking.firewall.allowedTCPPorts = [ networking.firewall.allowedTCPPorts = [

8
home-server.nix
View file

@ -116,9 +116,11 @@ in with builtins; {
services.openssh = { services.openssh = {
enable = true; enable = true;
kbdInteractiveAuthentication = false; settings = {
passwordAuthentication = false; KbdInteractiveAuthentication = false;
permitRootLogin = "no"; PasswordAuthentication = false;
PermitRootLogin = "no";
};
inherit hostKeys; inherit hostKeys;
}; };

7
home/browsers/firefox.nix
View file

@ -53,16 +53,15 @@ in {
private = { private = {
id = 0; id = 0;
extraConfig = sharedExtraConfig; extraConfig = sharedExtraConfig;
# extensions = commonExtensions ++ (with firefox-addons; [ metamask ]); extensions = commonExtensions ++ (with firefox-addons; [ metamask ]);
}; };
work = { work = {
id = 1; id = 1;
extraConfig = sharedExtraConfig; extraConfig = sharedExtraConfig;
# extensions = commonExtensions extensions = commonExtensions
# ++ (with firefox-addons; [ react-devtools reduxdevtools ]); ++ (with firefox-addons; [ react-devtools reduxdevtools ]);
}; };
}; };
extensions = commonExtensions ++ (with firefox-addons; [ metamask ]);
}; };
home.packages = let home.packages = let

2
home/editors/helix/default.nix
View file

@ -5,7 +5,7 @@
programs.helix = { programs.helix = {
enable = true; enable = true;
package = pkgs.unstable.helix; package = pkgs.unstable.helix;
languages = [ languages.language = [
{ {
name = "rust"; name = "rust";
config.rust-analyzer = { config.rust-analyzer = {

4
home/editors/neovim/lsp/lsp.lua
View file

@ -9,7 +9,7 @@ require("nvim-lightbulb").setup({
LspFormat = function(bufnr) LspFormat = function(bufnr)
vim.lsp.buf.format({ vim.lsp.buf.format({
filter = function(client) filter = function(client)
return not vim.tbl_contains({ "tsserver", "jsonls", "rnix" }, client.name) return not vim.tbl_contains({ "tsserver", "jsonls" }, client.name)
end, end,
bufnr, bufnr,
timeout_ms = 5000, 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/?.lua")
table.insert(runtime_path, "lua/?/init.lua") table.insert(runtime_path, "lua/?/init.lua")
config.sumneko_lua.setup { config.lua_ls.setup {
on_attach = on_attach, on_attach = on_attach,
capabilities = capabilities, capabilities = capabilities,
settings = { settings = {

13
home/editors/neovim/neorg.lua
View file

@ -1,13 +1,13 @@
require("neorg").setup { require("neorg").setup {
load = { load = {
["core.defaults"] = {}, ["core.defaults"] = {},
["core.norg.concealer"] = {}, ["core.concealer"] = {},
["core.norg.completion"] = { ["core.completion"] = {
config = { config = {
engine = "nvim-cmp", engine = "nvim-cmp",
}, },
}, },
["core.norg.dirman"] = { ["core.dirman"] = {
config = { config = {
workspaces = { workspaces = {
work = "~/notes/work", work = "~/notes/work",
@ -15,12 +15,7 @@ require("neorg").setup {
}, },
}, },
}, },
["core.norg.qol.toc"] = {}, ["core.qol.toc"] = {},
["core.gtd.base"] = {
config = {
workspace = "home",
},
},
}, },
} }

2
home/felschr.nix
View file

@ -56,7 +56,7 @@
tabbed tabbed
# work # work
teams teams-for-linux
# dev # dev
postman postman

3
home/shell/starship.nix
View file

@ -14,7 +14,6 @@
# kitty/neovim don't play well with multi-width emojis # kitty/neovim don't play well with multi-width emojis
nix_shell.symbol = " "; nix_shell.symbol = " ";
}; };
# @TODO broken in nixos-22.11 enableNushellIntegration = true;
enableNushellIntegration = false;
}; };
} }

3
services/home-assistant/default.nix
View file

@ -9,7 +9,8 @@ in {
imports = [ ./esphome.nix ]; imports = [ ./esphome.nix ];
# just installed for ConBee firmware updates # just installed for ConBee firmware updates
environment.systemPackages = with pkgs; [ deconz ]; # TODO deconz package is currently broken
# environment.systemPackages = with pkgs; [ deconz ];
services.nginx = { services.nginx = {
virtualHosts."${config.networking.domain}" = { virtualHosts."${config.networking.domain}" = {

2
system/vpn.nix
View file

@ -15,7 +15,7 @@
postStart = '' postStart = ''
while ! ${pkgs.mullvad}/bin/mullvad status >/dev/null; do sleep 1; done 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 auto-connect set on
${pkgs.mullvad}/bin/mullvad dns set default \ ${pkgs.mullvad}/bin/mullvad dns set default \
--block-ads --block-trackers --block-malware --block-ads --block-trackers --block-malware

2
virtualisation/podman.nix
View file

@ -7,5 +7,5 @@
virtualisation.podman.dockerCompat = true; virtualisation.podman.dockerCompat = true;
virtualisation.podman.dockerSocket.enable = true; virtualisation.podman.dockerSocket.enable = true;
virtualisation.podman.extraPackages = with pkgs; [ ]; virtualisation.podman.extraPackages = with pkgs; [ ];
virtualisation.podman.defaultNetwork.dnsname.enable = true; virtualisation.podman.defaultNetwork.settings.dns_enabled = true;
} }

8
work-pc.nix
View file

@ -29,9 +29,11 @@
services.openssh = { services.openssh = {
enable = true; enable = true;
kbdInteractiveAuthentication = false; settings = {
passwordAuthentication = false; KbdInteractiveAuthentication = false;
permitRootLogin = "no"; PasswordAuthentication = false;
PermitRootLogin = "no";
};
}; };
# only change this when specified in release notes # only change this when specified in release notes