From f131f4fa2b7a387b1e4d4291c7ef0cb92f8fa2e5 Mon Sep 17 00:00:00 2001 From: Aleksandr Lebedev Date: Thu, 30 Jan 2025 13:38:06 +0100 Subject: [PATCH] Use my own emacs instead of doom emacs + Updated all packages. --- flake.lock | 257 ++++++++++++++++++---------- flake.nix | 5 +- nixos/modules/emacs/default.nix | 24 +-- nixos/modules/hyprland/hyprland.nix | 37 ++-- 4 files changed, 199 insertions(+), 124 deletions(-) diff --git a/flake.lock b/flake.lock index f971768..dea56f7 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1737392146, - "narHash": "sha256-fqDBMzFFZLYxNxnvM/9AABAsRgfgsLoDhdQXUvU0OnM=", + "lastModified": 1737610453, + "narHash": "sha256-OLgl/kgjOmDFrkU04PlqVklXj1m9y8xF7xbD+blAdg8=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "8adcb4b702511620bcaa4127f8f8af1ce7622d38", + "rev": "1f7bdbb82f6b9ec1d8d206e2c64d36f13bae91a1", "type": "github" }, "original": { @@ -40,11 +40,11 @@ ] }, "locked": { - "lastModified": 1736702516, - "narHash": "sha256-NbJiiPFnmciji3JHpqF/L0SdMQXKXn+q3Q/D8RjF/ak=", + "lastModified": 1738183445, + "narHash": "sha256-C1He3N1SA8D2u+TSlldbA9wiYwDvXI4GxX3zKaeD7qU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "e7719f9b9f5321c7100733773ad9f38cb6db6b6f", + "rev": "48a000cf35dd10bfeb231152735aebbe875f4b74", "type": "github" }, "original": { @@ -106,16 +106,17 @@ "base16-vim": { "flake": false, "locked": { - "lastModified": 1735953590, - "narHash": "sha256-YbQwaApLFJobn/0lbpMKcJ8N5axKlW2QIGkDS5+xoSU=", + "lastModified": 1732806396, + "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=", "owner": "tinted-theming", "repo": "base16-vim", - "rev": "c2a1232aa2c0ed27dcbf005779bcfe0e0ab5e85d", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "base16-vim", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", "type": "github" } }, @@ -126,11 +127,11 @@ ] }, "locked": { - "lastModified": 1737038063, - "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=", + "lastModified": 1738148035, + "narHash": "sha256-KYOATYEwaKysL3HdHdS5kbQMXvzS4iPJzJrML+3TKAo=", "owner": "nix-community", "repo": "disko", - "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2", + "rev": "18d0a984cc2bc82cf61df19523a34ad463aa7f54", "type": "github" }, "original": { @@ -139,19 +140,37 @@ "type": "github" } }, + "emacs-kylekrein": { + "inputs": { + "emacs-overlay": "emacs-overlay", + "nix-org-babel": "nix-org-babel", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1738237340, + "narHash": "sha256-AInwqwvsd58tX/c8BG4SKtEUuXU1uz6iKEq6sEJ3Czk=", + "owner": "kylekrein", + "repo": "emacs-config", + "rev": "e459041e925d1faaf0d224ff29247d14901a1161", + "type": "github" + }, + "original": { + "owner": "kylekrein", + "repo": "emacs-config", + "type": "github" + } + }, "emacs-overlay": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1737478847, - "narHash": "sha256-J7aYytYMcI8fXNKJp2JUy7fSGh4jZs5POmSE9t+PtQM=", + "lastModified": 1737998189, + "narHash": "sha256-Np3e0z3S9nSbnbqaj+i0KyCR5S+KS+bdqHyser+KJuU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "3d9c3f57344e9b247287ab702380251d4f95875c", + "rev": "2251b6ce66de3f27aaf26779f2dc8c7b99402014", "type": "github" }, "original": { @@ -408,11 +427,11 @@ ] }, "locked": { - "lastModified": 1737478403, - "narHash": "sha256-e6PJI4Bd+QdpukHyd5F/fQY8fRUiNfCwvCRU8WXMSk8=", + "lastModified": 1738228963, + "narHash": "sha256-Ee5hVHM7AWxaq7XJN6xiZztTZX8csdXernjqaTW5r9I=", "owner": "nix-community", "repo": "home-manager", - "rev": "96dee79b178d295b716052feca3ee46abc085abe", + "rev": "d963ed335b890a70ed53eecf14cdb21528eda9b8", "type": "github" }, "original": { @@ -458,11 +477,11 @@ ] }, "locked": { - "lastModified": 1737391116, - "narHash": "sha256-wOlplOftCnD2J1VwkRiAzASiXi80LypWqhVJcBYuLG8=", + "lastModified": 1738178255, + "narHash": "sha256-+D6Nu2ewXbMTFzx/Q4jDOo+LAOUPr0cxQJg5k33daIE=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "3219b311283803d4dbdacb3c5cc10cf9e9b7c2b5", + "rev": "dcadd3398abe146d60c67e0d9ee6e27b301cae82", "type": "github" }, "original": { @@ -487,11 +506,11 @@ ] }, "locked": { - "lastModified": 1736115290, - "narHash": "sha256-Jcn6yAzfUMcxy3tN/iZRbi/QgrYm7XLyVRl9g/nbUl4=", + "lastModified": 1738018829, + "narHash": "sha256-5Ol5iahMlELx3lWuChyZsqqLk6sP6aqaJCJFw92OZGo=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "52202272d89da32a9f866c0d10305a5e3d954c50", + "rev": "12cd7034e441a5ebfdef1a090c0788413b4a635b", "type": "github" }, "original": { @@ -510,17 +529,17 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_4", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems", "xdph": "xdph" }, "locked": { - "lastModified": 1737487260, - "narHash": "sha256-9u56FK+N8Ab/i98bOa/kIzdm+0PapXDAYZPBIEtNNoM=", + "lastModified": 1738236612, + "narHash": "sha256-fJ6VwFCp1w/CA+ONo9Ix+0JuGef5kHnfy/KWzOpSkWc=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "ce48bc540824fcaefd777959703df9908e258d0a", + "rev": "32c0fa2f2fe02254d5887b38cf2cffa72ddfd769", "type": "github" }, "original": { @@ -541,11 +560,11 @@ ] }, "locked": { - "lastModified": 1737127640, - "narHash": "sha256-mIQ3/axCZ4g8ySwWRbW4fJcyC9v55uAii3cqlJRtW8g=", + "lastModified": 1737556638, + "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "455c055883d9639d4fcbfcedb4c6d12ce313791e", + "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5", "type": "github" }, "original": { @@ -556,6 +575,11 @@ }, "hyprland-qt-support": { "inputs": { + "hyprlang": [ + "hyprland", + "hyprland-qtutils", + "hyprlang" + ], "nixpkgs": [ "hyprland", "hyprland-qtutils", @@ -568,11 +592,11 @@ ] }, "locked": { - "lastModified": 1736376766, - "narHash": "sha256-tZG+mkJJzqoi/gH8nN6P/yY1/PEYtom9+2WdYKKv5YM=", + "lastModified": 1737634706, + "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", "owner": "hyprwm", "repo": "hyprland-qt-support", - "rev": "0ecf224f213497c45b12c4dc7bdc2c2edd0e3084", + "rev": "8810df502cdee755993cb803eba7b23f189db795", "type": "github" }, "original": { @@ -584,8 +608,14 @@ "hyprland-qtutils": { "inputs": { "hyprland-qt-support": "hyprland-qt-support", + "hyprlang": [ + "hyprland", + "hyprlang" + ], "hyprutils": [ "hyprland", + "hyprland-qtutils", + "hyprlang", "hyprutils" ], "nixpkgs": [ @@ -598,11 +628,11 @@ ] }, "locked": { - "lastModified": 1736774415, - "narHash": "sha256-pb8v7axHdVKFGhQHEAxIuZP/9REsmlyuDW5eLGIplLc=", + "lastModified": 1737981711, + "narHash": "sha256-lh6cL5D8nPplB3WovCQjLUZ7k7MViiBrMlpkfm4R7/c=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "534cd1badc46ec9bdd986ab41ad2408bf845961e", + "rev": "96bf0677fa9cd13508294e3d4559dfbbc8beff73", "type": "github" }, "original": { @@ -627,11 +657,11 @@ ] }, "locked": { - "lastModified": 1735393019, - "narHash": "sha256-NPpqA8rtmDLsEmZOmz+qR67zsB6Y503Jnv+nSFLKJZ8=", + "lastModified": 1737634606, + "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "55608efdaa387af7bfdc0eddb404c409958efa43", + "rev": "f41271d35cc0f370d300413d756c2677f386af9d", "type": "github" }, "original": { @@ -652,11 +682,11 @@ ] }, "locked": { - "lastModified": 1736613432, - "narHash": "sha256-x7nMS1dFtlzgG13QoguKMZ6SKwSIQw82OANA5ZKF0d0=", + "lastModified": 1737978343, + "narHash": "sha256-TfFS0HCEJh63Kahrkp1h9hVDMdLU8a37Zz+IFucxyfA=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "72dfbf52967e4040693164319a027d8ac6315887", + "rev": "6a8bc9d2a4451df12f5179dc0b1d2d46518a90ab", "type": "github" }, "original": { @@ -692,11 +722,11 @@ }, "impermanence": { "locked": { - "lastModified": 1736688610, - "narHash": "sha256-1Zl9xahw399UiZSJ9Vxs1W4WRFjO1SsNdVZQD4nghz0=", + "lastModified": 1737831083, + "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", "owner": "nix-community", "repo": "impermanence", - "rev": "c64bed13b562fc3bb454b48773d4155023ac31b7", + "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", "type": "github" }, "original": { @@ -776,11 +806,11 @@ ] }, "locked": { - "lastModified": 1737423230, - "narHash": "sha256-WEOiNmkcmlaeXy2HGW1PYxYmCPiHdsI7a7SpjhBYxRg=", + "lastModified": 1738033138, + "narHash": "sha256-qlIM8A3bdL9c6PexhpS+QyZLO9y/8a3V75HVyJgDE5Q=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "46d0fa4ded0a7532f19870f9bbedaf62269fe3f7", + "rev": "349a74c66c596ef97ee97b4d80a3ca61227b6120", "type": "github" }, "original": { @@ -834,15 +864,15 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_6", "umu": "umu" }, "locked": { - "lastModified": 1737337163, - "narHash": "sha256-Z9hc25iV+jhH0AlvsrG65KqLEd726/HVvalSiqNQLqA=", + "lastModified": 1737855374, + "narHash": "sha256-RRGX2C+c+GaR3YMiYm6l/Tp5N/KZtYpiTplUrBwH/og=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "e5559b3a91433c21eb64792b78134582b3bd77f2", + "rev": "4845fe94cda365c7550d9fd1ef899d45df0bc18a", "type": "github" }, "original": { @@ -878,6 +908,21 @@ "type": "github" } }, + "nix-org-babel": { + "locked": { + "lastModified": 1731256202, + "narHash": "sha256-xtV0vIUhl3ZUzaUIHSaiWpybxyCgQ9Yp/MUGo3f5zvM=", + "owner": "emacs-twist", + "repo": "org-babel", + "rev": "a5d16c54aca35c07af59d216cda598163512db42", + "type": "github" + }, + "original": { + "owner": "emacs-twist", + "repo": "org-babel", + "type": "github" + } + }, "nixos-facter-modules": { "locked": { "lastModified": 1736931726, @@ -895,11 +940,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737062831, - "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", + "lastModified": 1737469691, + "narHash": "sha256-nmKOgAU48S41dTPIXAq0AHZSehWUn6ZPrUKijHAMmIk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", + "rev": "9e4d5190a9482a1fb9d18adf0bdb83c6e506eaab", "type": "github" }, "original": { @@ -967,11 +1012,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1737299813, - "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=", + "lastModified": 1737885640, + "narHash": "sha256-GFzPxJzTd1rPIVD4IW+GwJlyGwBDV1Tj5FLYwDQQ9sM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "107d5ef05c0b1119749e381451389eded30fb0d5", + "rev": "4e96537f163fad24ed9eb317798a79afc85b51b7", "type": "github" }, "original": { @@ -983,11 +1028,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1737062831, - "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "type": "github" }, "original": { @@ -998,6 +1043,38 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1735523292, "narHash": "sha256-opBsbR/nrGxiiF6XzlVluiHYb6yN/hEwv+lBWTy9xoM=", @@ -1013,13 +1090,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_6": { "locked": { - "lastModified": 1737003892, - "narHash": "sha256-RCzJE9wKByLCXmRBp+z8LK9EgdW+K+W/DXnJS4S/NVo=", + "lastModified": 1737717945, + "narHash": "sha256-ET91TMkab3PmOZnqiJQYOtSGvSTvGeHoegAv4zcTefM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae06b9c2d83cb5c8b12d7d0e32692e93d1379713", + "rev": "ecd26a469ac56357fd333946a99086e992452b6a", "type": "github" }, "original": { @@ -1029,13 +1106,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_7": { "locked": { - "lastModified": 1737062831, - "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", + "lastModified": 1738142207, + "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", + "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", "type": "github" }, "original": { @@ -1045,7 +1122,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_8": { "locked": { "lastModified": 1731763621, "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", @@ -1061,7 +1138,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_9": { "locked": { "lastModified": 1736798957, "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", @@ -1137,7 +1214,7 @@ "flake-utils": "flake-utils", "mnw": "mnw", "nil": "nil", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_5", "nmd": "nmd", "plugin-aerial-nvim": "plugin-aerial-nvim", "plugin-alpha-nvim": "plugin-alpha-nvim", @@ -3258,7 +3335,7 @@ "inputs": { "apple-silicon-support": "apple-silicon-support", "disko": "disko", - "emacs-overlay": "emacs-overlay", + "emacs-kylekrein": "emacs-kylekrein", "home-manager": "home-manager", "hyprland": "hyprland", "impermanence": "impermanence", @@ -3268,7 +3345,7 @@ "nix-gaming": "nix-gaming", "nix-on-droid": "nix-on-droid", "nixos-facter-modules": "nixos-facter-modules", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_7", "sops-nix": "sops-nix", "stylix": "stylix" } @@ -3330,7 +3407,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1737411508, @@ -3358,7 +3435,7 @@ "git-hooks": "git-hooks", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_9", "systems": "systems_4", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", @@ -3366,11 +3443,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1737416820, - "narHash": "sha256-PvOXfVj62pYnl2aq8l/hQkgmo22K1qa6n1JILTm4+ng=", + "lastModified": 1738025638, + "narHash": "sha256-nU3JpvIeEmcDHzQK4OTD1KXSoL/GOff6j9kuSO4X8eM=", "owner": "danth", "repo": "stylix", - "rev": "268daf22a1f93a00b7efc74c367d6711ca7f18e1", + "rev": "55418e8fc8d4696af619176a22cefcfac56ad2ef", "type": "github" }, "original": { @@ -3514,11 +3591,11 @@ }, "locked": { "dir": "packaging/nix", - "lastModified": 1737161836, - "narHash": "sha256-v20q0DeglyrsIAbqwqOSxdzZ4JhEWtU9muWPlPz3Few=", + "lastModified": 1737834175, + "narHash": "sha256-fhyc89qqYM3ql0k4hJVibAhXvEXOch96hnsEGB7Av3I=", "ref": "refs/heads/main", - "rev": "3fd4ef90e8427cfc74d94914654a288912edb2cf", - "revCount": 901, + "rev": "4d1860eefd79d6c04e964774155dbe13be65121a", + "revCount": 911, "submodules": true, "type": "git", "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" @@ -3558,11 +3635,11 @@ ] }, "locked": { - "lastModified": 1736421203, - "narHash": "sha256-BNe2xnHsSsTZiHp8OWl9UUf697w0gVtzh67AYe+pP+g=", + "lastModified": 1737634991, + "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "7613351375de66ca0d56689e333d460e2db05454", + "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7413014..57ef1d5 100644 --- a/flake.nix +++ b/flake.nix @@ -41,9 +41,8 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.home-manager.follows = "home-manager"; }; - emacs-overlay = { - url = "github:nix-community/emacs-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; + emacs-kylekrein = { + url = "github:kylekrein/emacs-config"; }; }; diff --git a/nixos/modules/emacs/default.nix b/nixos/modules/emacs/default.nix index a876d17..33b7fbe 100644 --- a/nixos/modules/emacs/default.nix +++ b/nixos/modules/emacs/default.nix @@ -3,23 +3,15 @@ pkgs, lib, inputs, + hwconfig, ... -}: -let - emacs = pkgs.emacs-pgtk; # pkgs.emacs; #pkgs.emacs-pgtk; -in -{ - #services.emacs.enable = true; +}: let + emacs = inputs.emacs-kylekrein.packages.${hwconfig.system}.default; +in { + services.emacs.enable = true; services.emacs.startWithGraphical = true; - #services.emacs.install = true; - services.emacs.package = emacs; # pkgs.emacs-unstable + services.emacs.install = true; + services.emacs.package = emacs; - environment.systemPackages = - (import ./packages.nix { - inherit pkgs; - inherit emacs; - }).packages; - nixpkgs.overlays = [ - inputs.emacs-overlay.overlays.default - ]; + environment.systemPackages = [emacs]; } diff --git a/nixos/modules/hyprland/hyprland.nix b/nixos/modules/hyprland/hyprland.nix index 5627637..f3bca50 100644 --- a/nixos/modules/hyprland/hyprland.nix +++ b/nixos/modules/hyprland/hyprland.nix @@ -4,12 +4,10 @@ hwconfig, username, ... -}: -let +}: let toggle_monitors = ./toggle_monitors.sh; wallpaper-image = ./wallpaper.jpg; -in -{ +in { imports = [ ./waybar.nix ./hyprlock.nix @@ -20,13 +18,13 @@ in xwayland.enable = true; settings = { monitor = - if hwconfig.hostname == "kylekrein-homepc" then - [ - "DP-1,2560x1440@75,1600x0,1.6" - "DP-3,2560x1440@75,0x0,1.6" - ] + if hwconfig.hostname == "kylekrein-homepc" + then [ + "DP-1,2560x1440@75,1600x0,1.6" + "DP-3,2560x1440@75,0x0,1.6" + ] else - [ ",highres,auto,1.6" ] + [",highres,auto,1.6"] ++ [ "FALLBACK,1920x1080@60,auto,1" # to fix crash on hyprlock https://github.com/hyprwm/hyprlock/issues/434#issuecomment-2341710088 ]; @@ -36,7 +34,11 @@ in }; exec-once = [ - "${if hwconfig.isLaptop then "brightnessctl set 25%" else ""}" + "${ + if hwconfig.isLaptop + then "brightnessctl set 25%" + else "" + }" "dbus-update-activation-environment --systemd --all" "${pkgs.waybar}/bin/waybar &" "${pkgs.networkmanagerapplet}/bin/nm-applet &" @@ -47,7 +49,7 @@ in "${pkgs.clipse}/bin/clipse -listen &" "${pkgs.swww}/bin/swww-daemon &" "${pkgs.swww}/bin/swww img ${wallpaper-image} &" - "emacs --daemon &" + #"emacs --daemon &" #"${pkgs.kando}/bin/kando" ]; exec = [ @@ -60,10 +62,9 @@ in "$fileManager" = "$emacs --eval '(dired \"/home/${username}\")'"; # "$terminal ${pkgs.yazi}/bin/yazi"; "$fileManager2" = "${pkgs.kdePackages.dolphin}/bin/dolphin"; "$browser" = "${pkgs.firefox}/bin/firefox"; - "$menu" = "${pkgs.wofi}/bin/wofi --show drun"; + "$menu" = "emacsclient -cF '((visibility . nil))' -e '(emacs-run-launcher)'"; #"${pkgs.wofi}/bin/wofi --show drun"; "$clipboardManager" = "$terminal --class clipse -e 'clipse'"; - "$makeRegionScreenshot" = - "${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp -w 0)\" - | ${pkgs.satty}/bin/satty --early-exit --copy-command 'wl-copy' --filename '-' --initial-tool brush"; + "$makeRegionScreenshot" = "${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp -w 0)\" - | ${pkgs.satty}/bin/satty --early-exit --copy-command 'wl-copy' --filename '-' --initial-tool brush"; bind = [ "$mod, T, exec, $terminal" "$mod, Q, killactive," @@ -204,6 +205,12 @@ in #for clipboard manager "float,class:(clipse)" "size 622 652,class:(clipse)" # set the size of the window as necessary + #emacs run launcher + "float, title:emacs-run-launcher" + "pin, title:emacs-run-launcher" + + #emacs + "opaque, class:emacs" ]; decoration = {