diff options
| -rw-r--r-- | flake.lock | 65 | ||||
| -rw-r--r-- | flake.nix | 13 | ||||
| -rw-r--r-- | gui/default.nix | 7 | ||||
| -rw-r--r-- | gui/emacs.nix | 14 | ||||
| -rw-r--r-- | gui/gtk.nix | 2 |
5 files changed, 37 insertions, 64 deletions
@@ -7,11 +7,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1702028397, - "narHash": "sha256-FNlJm0IJ0mjMYVKL7qiTFIdmF0yEyBUJeeCxDjg72gE=", + "lastModified": 1719562820, + "narHash": "sha256-HZQ9UCGpcQSrAz335utn5CXkUr2OHyoqipDTQI6/3+k=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ea9cd7c22194345e4db85e334b8ff40cc384c536", + "rev": "e3a4b715f2a60efafa9cbe6bfa6b8bb5b659a381", "type": "github" }, "original": { @@ -26,11 +26,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -61,16 +61,16 @@ ] }, "locked": { - "lastModified": 1700814205, - "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=", + "lastModified": 1718530513, + "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", "owner": "nix-community", "repo": "home-manager", - "rev": "aeb2232d7a32530d3448318790534d196bf9427a", + "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -97,11 +97,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701718080, - "narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=", + "lastModified": 1719254875, + "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335", + "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "type": "github" }, "original": { @@ -113,16 +113,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1701615100, - "narHash": "sha256-7VI84NGBvlCTduw2aHLVB62NvCiZUlALLqBe5v684Aw=", + "lastModified": 1719234068, + "narHash": "sha256-1AjSIedDC/aERt24KsCUftLpVppW61S7awfjGe7bMio=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9f06adb793d1cca5384907b3b8a4071d5d7cb19", + "rev": "90bd1b26e23760742fdcb6152369919098f05417", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } @@ -158,22 +158,6 @@ "type": "github" } }, - "oldstable": { - "locked": { - "lastModified": 1688392541, - "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, "personal": { "inputs": { "nixpkgs": "nixpkgs_3" @@ -197,7 +181,6 @@ "emacs": "emacs", "home-manager": "home-manager", "jupyter": "jupyter", - "oldstable": "oldstable", "personal": "personal", "stable": "stable", "unstable": "unstable" @@ -205,16 +188,16 @@ }, "stable": { "locked": { - "lastModified": 1701952659, - "narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=", + "lastModified": 1719426051, + "narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4", + "rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -236,11 +219,11 @@ }, "unstable": { "locked": { - "lastModified": 1701693815, - "narHash": "sha256-7BkrXykVWfkn6+c1EhFA3ko4MLi3gVG0p9G96PNnKTM=", + "lastModified": 1719468428, + "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "09ec6a0881e1a36c29d67497693a67a16f4da573", + "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d", "type": "github" }, "original": { @@ -2,12 +2,11 @@ description = "Computing environment of Adrian Kummerlaender"; inputs = { - stable.url = github:NixOS/nixpkgs/nixos-23.11; + stable.url = github:NixOS/nixpkgs/nixos-24.05; 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.11; + url = github:nix-community/home-manager/release-24.05; inputs = { nixpkgs.follows = "stable"; }; }; emacs.url = github:nix-community/emacs-overlay/master; @@ -15,7 +14,7 @@ }; outputs = { - self, stable, unstable, oldstable, personal, emacs, home-manager, jupyter, ... + self, stable, unstable, personal, emacs, home-manager, jupyter, ... }: let system = "x86_64-linux"; @@ -34,11 +33,6 @@ config = { allowUnfree = true; }; }; - pkgs-oldstable = import oldstable { - inherit system; - config = { allowUnfree = true; }; - }; - pkgs-personal = personal; config = hostname: home-manager.lib.homeManagerConfiguration { @@ -46,7 +40,6 @@ extraSpecialArgs = { inherit pkgs-unstable; - inherit pkgs-oldstable; inherit pkgs-personal; inherit hostname; }; diff --git a/gui/default.nix b/gui/default.nix index 7289e1d..2cebeaf 100644 --- a/gui/default.nix +++ b/gui/default.nix @@ -22,13 +22,6 @@ iosevka ]; - qt = { - enable = true; - platformTheme = "gtk"; - }; - - services.gpg-agent.pinentryFlavor = "gtk2"; - home.sessionVariables = { QT_AUTO_SCREEN_SCALE_FACTOR = 0; }; diff --git a/gui/emacs.nix b/gui/emacs.nix index 7197e85..eb3bc8b 100644 --- a/gui/emacs.nix +++ b/gui/emacs.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-oldstable, pkgs-unstable, ... }: +{ config, pkgs, pkgs-unstable, ... }: { programs.emacs = let @@ -47,6 +47,10 @@ enable = true; package = pkgs.emacsWithPackagesFromUsePackage { + override = final: prev: { + org = prev.org.overrideAttrs(old: { patches = []; } ); + }; + package = pkgs.emacs29; config = ./conf/init.el; @@ -60,9 +64,9 @@ ]) ++ (with epkgs.nongnuPackages; [ org-contrib ])++ [ + epkgs.mu4e akr-color-theme custom-runtime-env - pkgs-oldstable.mu ]; }; }; @@ -87,9 +91,9 @@ in with pkgs; [ symbola - (iosevka-bin.override { variant = "aile"; }) - (iosevka-bin.override { variant = "etoile"; }) - pkgs-oldstable.mu + (iosevka-bin.override { variant = "Aile"; }) + (iosevka-bin.override { variant = "Etoile"; }) + mu org-protocol-shortcut ]; diff --git a/gui/gtk.nix b/gui/gtk.nix index 150fab0..d593a55 100644 --- a/gui/gtk.nix +++ b/gui/gtk.nix @@ -63,7 +63,7 @@ qt = { enable = true; - platformTheme = "gtk"; + platformTheme.name = "gtk"; }; home.sessionVariables = { |