aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock46
-rw-r--r--flake.nix4
-rw-r--r--gui/apps/file.nix1
-rw-r--r--gui/apps/web.nix2
-rw-r--r--gui/conf/init.el8
-rw-r--r--gui/emacs.nix2
6 files changed, 32 insertions, 31 deletions
diff --git a/flake.lock b/flake.lock
index d7d6d32..5a389a9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
- "lastModified": 1699436319,
- "narHash": "sha256-gRYGKnYfXE1dugjGJ0Xx5P3x3BOT505gxEFxDBohSiM=",
+ "lastModified": 1702028397,
+ "narHash": "sha256-FNlJm0IJ0mjMYVKL7qiTFIdmF0yEyBUJeeCxDjg72gE=",
"owner": "nix-community",
"repo": "emacs-overlay",
- "rev": "dc09405b5f031852d3e930b1fa91e973b5206ef8",
+ "rev": "ea9cd7c22194345e4db85e334b8ff40cc384c536",
"type": "github"
},
"original": {
@@ -26,11 +26,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1694529238,
- "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+ "lastModified": 1701680307,
+ "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide",
"repo": "flake-utils",
- "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+ "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github"
},
"original": {
@@ -61,16 +61,16 @@
]
},
"locked": {
- "lastModified": 1695108154,
- "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
+ "lastModified": 1700814205,
+ "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "07682fff75d41f18327a871088d20af2710d4744",
+ "rev": "aeb2232d7a32530d3448318790534d196bf9427a",
"type": "github"
},
"original": {
"owner": "nix-community",
- "ref": "release-23.05",
+ "ref": "release-23.11",
"repo": "home-manager",
"type": "github"
}
@@ -97,11 +97,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1699099776,
- "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
+ "lastModified": 1701718080,
+ "narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
+ "rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335",
"type": "github"
},
"original": {
@@ -113,11 +113,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1699291058,
- "narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=",
+ "lastModified": 1701615100,
+ "narHash": "sha256-7VI84NGBvlCTduw2aHLVB62NvCiZUlALLqBe5v684Aw=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "41de143fda10e33be0f47eab2bfe08a50f234267",
+ "rev": "e9f06adb793d1cca5384907b3b8a4071d5d7cb19",
"type": "github"
},
"original": {
@@ -205,16 +205,16 @@
},
"stable": {
"locked": {
- "lastModified": 1699291058,
- "narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=",
+ "lastModified": 1701952659,
+ "narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "41de143fda10e33be0f47eab2bfe08a50f234267",
+ "rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-23.05",
+ "ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
@@ -236,11 +236,11 @@
},
"unstable": {
"locked": {
- "lastModified": 1699343069,
- "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=",
+ "lastModified": 1701693815,
+ "narHash": "sha256-7BkrXykVWfkn6+c1EhFA3ko4MLi3gVG0p9G96PNnKTM=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d",
+ "rev": "09ec6a0881e1a36c29d67497693a67a16f4da573",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 84f0a43..009d062 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,12 +2,12 @@
description = "Computing environment of Adrian Kummerlaender";
inputs = {
- stable.url = github:NixOS/nixpkgs/nixos-23.05;
+ stable.url = github:NixOS/nixpkgs/nixos-23.11;
unstable.url = github:NixOS/nixpkgs/nixpkgs-unstable;
oldstable.url = github:NixOS/nixpkgs/nixos-22.11;
personal.url = github:KnairdA/pkgs;
home-manager = {
- url = github:nix-community/home-manager/release-23.05;
+ url = github:nix-community/home-manager/release-23.11;
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 a559abe..d0a164e 100644
--- a/gui/apps/file.nix
+++ b/gui/apps/file.nix
@@ -18,7 +18,6 @@
# audio
pulseaudio
pavucontrol
- pulseeffects-pw
# office
libreoffice
gimp
diff --git a/gui/apps/web.nix b/gui/apps/web.nix
index e4de814..fa09685 100644
--- a/gui/apps/web.nix
+++ b/gui/apps/web.nix
@@ -19,7 +19,7 @@
firefox = {
enable = true;
package = pkgs.firefox.override {
- extraNativeMessagingHosts = with pkgs; [ passff-host ];
+ nativeMessagingHosts = with pkgs; [ passff-host ];
};
};
chromium.enable = true;
diff --git a/gui/conf/init.el b/gui/conf/init.el
index e77759f..9ef5e47 100644
--- a/gui/conf/init.el
+++ b/gui/conf/init.el
@@ -274,10 +274,10 @@
(setq org-bullets-bullet-list '("◉" "◉" "⤷" "⤷"))
(add-hook 'org-mode-hook #'org-bullets-mode))
-(use-package org-re-reveal
- :ensure t
- :custom
- (org-re-reveal-revealjs-version "4"))
+;(use-package org-re-reveal
+; :ensure t
+; :custom
+; (org-re-reveal-revealjs-version "4"))
(use-package org-present
:ensure t
diff --git a/gui/emacs.nix b/gui/emacs.nix
index 71690fc..7197e85 100644
--- a/gui/emacs.nix
+++ b/gui/emacs.nix
@@ -47,6 +47,8 @@
enable = true;
package = pkgs.emacsWithPackagesFromUsePackage {
+ package = pkgs.emacs29;
+
config = ./conf/init.el;
alwaysEnsure = false;