diff options
| author | Miran Bastaja <miran.bastaja04@gmail.com> | 2024-03-07 00:34:30 +0100 |
|---|---|---|
| committer | Miran Bastaja <miran.bastaja04@gmail.com> | 2024-03-07 00:34:30 +0100 |
| commit | 7b5bf013daf1038cc11872868e6822eb14eb2861 (patch) | |
| tree | 194c639a8efb86c94165fd84dbe8948bbe804483 /share/system | |
| parent | 26b851c43bd88a9626fc9e18a4a9d0b235b3f2a2 (diff) | |
Slim down client machines, fix some issues
- completely remove emacs module
- use nixpkgs hyprland package instead of the flake
- fix tofi desktop file cache issue
- update flake lock
- wonderland: remove madhatter
- remove hyprdesktop module from clients' sharedModules and move it into
the users' individual modules wherever it's needed
Diffstat (limited to 'share/system')
| -rw-r--r-- | share/system/client-common.nix | 2 | ||||
| -rw-r--r-- | share/system/common.nix | 15 | ||||
| -rw-r--r-- | share/system/hyprland.nix | 7 |
3 files changed, 3 insertions, 21 deletions
diff --git a/share/system/client-common.nix b/share/system/client-common.nix index 63c5219..c58a0f5 100644 --- a/share/system/client-common.nix +++ b/share/system/client-common.nix @@ -2,10 +2,10 @@ { pkgs, ... }: { imports = [ - ./hyprland.nix ./steam.nix ]; + programs.hyprland.enable = true; boot.supportedFilesystems = [ "ntfs" "bcachefs" ]; nixpkgs.config.allowUnfree = true; diff --git a/share/system/common.nix b/share/system/common.nix index d8bea21..b280667 100644 --- a/share/system/common.nix +++ b/share/system/common.nix @@ -1,21 +1,8 @@ # Common system settings shared across every machine # Used mostly for adding substituters and such -{ inputs, ... }: { +{ ... }: { nix.settings = { experimental-features = [ "nix-command" "flakes" ]; auto-optimise-store = true; - - extra-substituters = [ - "https://hyprland.cachix.org" - "https://nix-community.cachix.org" - ]; - extra-trusted-public-keys = [ - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - ]; }; - nixpkgs.overlays = [ - inputs.hyprland.overlays.default - #inputs.emacs-overlay.overlays.default - ]; } diff --git a/share/system/hyprland.nix b/share/system/hyprland.nix index 2e1c679..8b13789 100644 --- a/share/system/hyprland.nix +++ b/share/system/hyprland.nix @@ -1,6 +1 @@ -{ inputs, pkgs, ... }: { - programs.hyprland = { - enable = true; - package = inputs.hyprland.packages.${pkgs.system}.hyprland; - }; -} + |
