diff options
| -rw-r--r-- | flake.lock | 100 | ||||
| -rw-r--r-- | flake.nix | 9 | ||||
| -rw-r--r-- | modules/emacs.nix | 11 | ||||
| -rw-r--r-- | modules/gnome.nix | 20 |
4 files changed, 80 insertions, 60 deletions
@@ -33,6 +33,27 @@ "type": "github" } }, + "emacs-overlay": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1682703588, + "narHash": "sha256-yCnluuXCCnQNSC3hxk76fSuSv9mS0+f3ag6vWNi2utQ=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "0489c1bbade20d3f95e2a96ba384bdc327ed9750", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "emacs-overlay", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": [ @@ -41,11 +62,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1682230876, - "narHash": "sha256-vCnd1pZRQKCdNvivQBD7WzaOlU1GcN91OCAz1rnoe5M=", + "lastModified": 1682662921, + "narHash": "sha256-9cr58bpiJpge/ZeTyrGL3mpcCe071qTjTIGlwFGvRes=", "owner": "nix-community", "repo": "fenix", - "rev": "378f052d9f1cd90060ec4329f81782fee80490a4", + "rev": "d0b0d39d4f74bec4634ea6b52e6bd49314c3988b", "type": "github" }, "original": { @@ -92,6 +113,21 @@ } }, "flake-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" + } + }, + "flake-utils_2": { "inputs": { "systems": "systems" }, @@ -109,7 +145,7 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_3": { "locked": { "lastModified": 1678901627, "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", @@ -124,7 +160,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_4": { "locked": { "lastModified": 1678901627, "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", @@ -166,20 +202,19 @@ "crane": "crane", "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs-unstable" ], - "nixpkgs-test": "nixpkgs-test", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1682256558, - "narHash": "sha256-H+O4yqeePiQcUGvmzXbeZB0fRX1ybAD+LVwP5w3CU/w=", + "lastModified": 1682610266, + "narHash": "sha256-uBu76p9z59HXrRvxDvwqXmlUYvKeTYC9soUf4bIMEc0=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "9bf192bb79e2fbee0b9f12cd314b36d194863059", + "rev": "c60e039ee968f208bd4bbd4557c41fe451a41d97", "type": "github" }, "original": { @@ -190,7 +225,7 @@ }, "microvm": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ] @@ -211,11 +246,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1682173319, - "narHash": "sha256-tPhOpJJ+wrWIusvGgIB2+x6ILfDkEgQMX0BTtM5vd/4=", + "lastModified": 1682538316, + "narHash": "sha256-YuHgVsR7S9zxJWHo7lo2ugd+uDC4ESWg1hA4bEZQv3Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee7ec1c71adc47d2e3c2d5eb0d6b8fbbd42a8d1c", + "rev": "15b75800dce80225b44f067c9012b09de37dfad2", "type": "github" }, "original": { @@ -257,29 +292,13 @@ "type": "github" } }, - "nixpkgs-test": { - "locked": { - "lastModified": 1679009563, - "narHash": "sha256-jizICiQOqUcYFNHRNNOo69bfyNo36iyuRAHem5z68LQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "371d3778c4f9cee7d5cf014e6ce400d57366570f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "qemu-boot-disk-using-make-disk-image", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { - "lastModified": 1682181988, - "narHash": "sha256-CYWhlNi16cjGzMby9h57gpYE59quBcsHPXiFgX4Sw5k=", + "lastModified": 1682526928, + "narHash": "sha256-2cKh4O6t1rQ8Ok+v16URynmb0rV7oZPEbXkU0owNLQs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6c43a3495a11e261e5f41e5d7eda2d71dae1b2fe", + "rev": "d6b863fd9b7bb962e6f9fdf292419a775e772891", "type": "github" }, "original": { @@ -322,8 +341,9 @@ }, "root": { "inputs": { + "emacs-overlay": "emacs-overlay", "fenix": "fenix", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "lanzaboote": "lanzaboote", "microvm": "microvm", "nixpkgs": "nixpkgs", @@ -335,11 +355,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1682163822, - "narHash": "sha256-u7vaRlI6rYiutytoTk8lyOtNKO/rz5Q63Z6S6QzYCtU=", + "lastModified": 1682577516, + "narHash": "sha256-4vjedE3z9I6/0B52e7AT642OmLxmok9uodCx6N0ngX8=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "2feabc4dc462644287372922928110eea4c60ca7", + "rev": "237ffa3997250b8569ced477a5072310eb48c847", "type": "github" }, "original": { @@ -382,11 +402,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1682218555, - "narHash": "sha256-kojMklCNBnPe8KtRvJvBtFGU/gPAqRKYpZEqyehHfn4=", + "lastModified": 1682539132, + "narHash": "sha256-djX/Vp1snR1XHyk400HKCfwWVoLBE8uiQalTXMH7Kj0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8a95e6f8cd160a05c2b560e66f702432a53b59ac", + "rev": "4a330ead6a990365c9bb48f30523ac048fb6d8ae", "type": "github" }, "original": { @@ -30,10 +30,16 @@ url = "github:nix-community/lanzaboote"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; + + emacs-overlay = { + url = "github:nix-community/emacs-overlay"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; }; outputs = inputs@{ self + , emacs-overlay , fenix , flake-utils , lanzaboote @@ -73,11 +79,12 @@ ./modules/basic-tools ./modules/binary-caches.nix ./modules/devtools.nix + ./modules/emacs.nix + ./modules/gnome.nix ./modules/gnupg.nix ./modules/mail ./modules/radio.nix ./modules/science.nix - ./modules/sway.nix ./modules/tlp.nix ./modules/virtualization.nix ]; diff --git a/modules/emacs.nix b/modules/emacs.nix index 0df6c08..a033a54 100644 --- a/modules/emacs.nix +++ b/modules/emacs.nix @@ -9,20 +9,11 @@ inputs.emacs-overlay.overlay ]; - programs.zsh.shellInit = '' - eval "$(direnv hook zsh)" - ''; - programs.bash.shellInit = '' - eval "$(direnv hook bash)" - ''; - - services.emacs = { install = true; enable = false; - package = with pkgs; ((emacsPackagesFor emacsPgtkNativeComp).emacsWithPackages (epkgs: with epkgs; [ + package = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages (epkgs: with epkgs; [ vterm - pdf-tools ])); defaultEditor = false; }; diff --git a/modules/gnome.nix b/modules/gnome.nix index 5254353..8f7f592 100644 --- a/modules/gnome.nix +++ b/modules/gnome.nix @@ -1,20 +1,22 @@ { config, pkgs, ... }: { environment.systemPackages = with pkgs; [ + amberol celluloid + dino + firefox-wayland + fluffychat + gnome-console gnome.gnome-boxes + gnome.gnome-terminal gnome.gnome-tweaks nextcloud-client - amberol - firefox-wayland - element-desktop - wl-clipboard pulseaudioFull - screen-message qbittorrent - dino - gnome.gnome-terminal - #gnome-console + screen-message + signal-desktop + tdesktop + wl-clipboard ]; environment.gnome.excludePackages = with pkgs; [ @@ -40,7 +42,7 @@ }; }; - qt5 = { + qt = { enable = true; platformTheme = "gnome"; style = "adwaita-dark"; |