aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock66
-rw-r--r--flake.nix4
-rw-r--r--gui/apps/file.nix2
-rw-r--r--gui/emacs.nix2
4 files changed, 29 insertions, 45 deletions
diff --git a/flake.lock b/flake.lock
index a3a807f..c7c4c45 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1685966375,
- "narHash": "sha256-Au2k0XrnsiZHKfCpdk3/X618k9Cma7yCaQ076D/ASyw=",
+ "lastModified": 1693105704,
+ "narHash": "sha256-j1SSgP2K1iv9G7dc3yX2ulsB4mV3K231L8xNmuDS8WM=",
"owner": "nix-community",
"repo": "emacs-overlay",
- "rev": "ec3643e9cf2e09e9a328ae53de7c602b05c07b61",
+ "rev": "123ac69d1d430562dd1a266a2f50296eaac7d65d",
"type": "github"
},
"original": {
@@ -26,11 +26,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1685518550,
- "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+ "lastModified": 1692799911,
+ "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+ "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
"type": "github"
},
"original": {
@@ -58,20 +58,19 @@
"inputs": {
"nixpkgs": [
"stable"
- ],
- "utils": "utils"
+ ]
},
"locked": {
- "lastModified": 1681092193,
- "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=",
+ "lastModified": 1692099905,
+ "narHash": "sha256-/pSusGhmIdSdAaywQRFA5dVbfdIzlWQTecM+E46+cJ0=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af",
+ "rev": "2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f",
"type": "github"
},
"original": {
"owner": "nix-community",
- "ref": "release-22.11",
+ "ref": "release-23.05",
"repo": "home-manager",
"type": "github"
}
@@ -98,11 +97,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1685836261,
- "narHash": "sha256-rpxEPGeW4JZJcH58SQApJUtJ7w78VPtkF6Cut/Pq6Kg=",
+ "lastModified": 1693003285,
+ "narHash": "sha256-5nm4yrEHKupjn62MibENtfqlP6pWcRTuSKrMiH9bLkc=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "dd4982554e18b936790da07c4ea2db7c7600f283",
+ "rev": "5690c4271f2998c304a45c91a0aeb8fb69feaea7",
"type": "github"
},
"original": {
@@ -114,16 +113,16 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1685758009,
- "narHash": "sha256-IT4Z5WGhafrq+xbDTyuKrRPRQ1f+kVOtE+4JU1CHFeo=",
+ "lastModified": 1692986144,
+ "narHash": "sha256-M4VFpy7Av9j+33HF5nIGm0k2+DXXW4qSSKdidIKg5jY=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "eaf03591711b46d21abc7082a8ebee4681f9dbeb",
+ "rev": "74e5bdc5478ebbe7ba5849f0d765f92757bb9dbf",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-22.11",
+ "ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
@@ -189,16 +188,16 @@
},
"stable": {
"locked": {
- "lastModified": 1685758009,
- "narHash": "sha256-IT4Z5WGhafrq+xbDTyuKrRPRQ1f+kVOtE+4JU1CHFeo=",
+ "lastModified": 1693087214,
+ "narHash": "sha256-Kn1SSqRfPpqcI1MDy82JXrPT1WI8c03TA2F0xu6kS+4=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "eaf03591711b46d21abc7082a8ebee4681f9dbeb",
+ "rev": "f155f0cf4ea43c4e3c8918d2d327d44777b6cad4",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-22.11",
+ "ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
@@ -220,11 +219,11 @@
},
"unstable": {
"locked": {
- "lastModified": 1685894048,
- "narHash": "sha256-QKqv1QS+22k9oxncj1AnAxeqS5jGnQiUW3Jq3B+dI1w=",
+ "lastModified": 1693060755,
+ "narHash": "sha256-KNsbfqewEziFJEpPR0qvVz4rx0x6QXxw1CcunRhlFdk=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "2e56a850786211972d99d2bb39665a9b5a1801d6",
+ "rev": "c66ccfa00c643751da2fd9290e096ceaa30493fc",
"type": "github"
},
"original": {
@@ -233,21 +232,6 @@
"repo": "nixpkgs",
"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"
- }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
index cebdfad..cf5095c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,11 +2,11 @@
description = "Computing environment of Adrian Kummerlaender";
inputs = {
- stable.url = github:NixOS/nixpkgs/nixos-22.11;
+ stable.url = github:NixOS/nixpkgs/nixos-23.05;
unstable.url = github:NixOS/nixpkgs/nixpkgs-unstable;
personal.url = github:KnairdA/pkgs;
home-manager = {
- url = github:nix-community/home-manager/release-22.11;
+ url = github:nix-community/home-manager/release-23.05;
inputs = { nixpkgs.follows = "stable"; };
};
emacs.url = github:nix-community/emacs-overlay/master;
diff --git a/gui/apps/file.nix b/gui/apps/file.nix
index 8ff49e2..a559abe 100644
--- a/gui/apps/file.nix
+++ b/gui/apps/file.nix
@@ -27,7 +27,7 @@
sessionVariables = {
# required to enable auto-mounting in pcmanfm
- GIO_EXTRA_MODULES = [ "${pkgs.gvfs}/lib/gio/modules" ];
+ GIO_EXTRA_MODULES = "${pkgs.gvfs}/lib/gio/modules";
# use GTK theme in libreoffice
SAL_USE_VCLPLUGIN = "gtk";
};
diff --git a/gui/emacs.nix b/gui/emacs.nix
index c4d163f..d36d7bd 100644
--- a/gui/emacs.nix
+++ b/gui/emacs.nix
@@ -50,7 +50,7 @@
config = ./conf/init.el;
alwaysEnsure = false;
- package = pkgs-unstable.emacsGit.override { nativeComp = true; };
+ package = pkgs-unstable.emacs-git.override { withNativeCompilation = true; };
extraEmacsPackages = epkgs: (with epkgs.melpaPackages; [
pdf-tools