From 39eb0b807403c7745c2edc6024e0e713155662bc Mon Sep 17 00:00:00 2001 From: tzlil Date: Sun, 12 Mar 2023 16:29:17 +0200 Subject: bunch of stuff --- mixins/emacs/default.nix | 50 ++++++++++++++++++++++++------------------------ mixins/hyprland.nix | 27 +++++++++++++++++--------- mixins/tailscale.nix | 8 ++++++++ 3 files changed, 51 insertions(+), 34 deletions(-) (limited to 'mixins') diff --git a/mixins/emacs/default.nix b/mixins/emacs/default.nix index a22523e..0290d20 100644 --- a/mixins/emacs/default.nix +++ b/mixins/emacs/default.nix @@ -5,29 +5,29 @@ inputs, ... }: { - imports = [ - inputs.home-manager.nixosModules."home-manager" - ]; - config = { - home-manager.users.tzlil = { - pkgs, - config, - nixosConfig, - ... - } @ hm: { - home = { - packages = with pkgs; [ - - ]; - }; - services.emacs = { - enable = true; - defaultEditor = true; - }; - programs.emacs = { - enable = true; - extraConfig = builtins.readFile ./init.el - }; - }; - } + # imports = [ + # inputs.home-manager.nixosModules."home-manager" + # ]; + # config = { + # home-manager.users.tzlil = { + # pkgs, + # config, + # nixosConfig, + # ... + # } @ hm: { + # home = { + # packages = with pkgs; [ + + # ]; + # }; + # services.emacs = { + # enable = true; + # defaultEditor = true; + # }; + # programs.emacs = { + # enable = true; + # extraConfig = builtins.readFile ./init.el + # }; + # }; + # } } diff --git a/mixins/hyprland.nix b/mixins/hyprland.nix index 3442438..3cc740c 100644 --- a/mixins/hyprland.nix +++ b/mixins/hyprland.nix @@ -5,16 +5,25 @@ inputs, ... }: { - imports = [ - inputs.hyprland.nixosModules.default - ]; config = { - programs.hyprland = { - enable = true; - xwayland = { - enable = false; - hidpi = false; - }; + home-manager.users.tzlil = { + pkgs, + config, + nixosConfig, + ... + } @ hm: { + imports = [ + inputs.hyprland.homeManagerModules.default + ]; + + wayland.windowManager.hyprland.enable = true; }; + # programs.hyprland = { + # enable = true; + # xwayland = { + # enable = false; + # hidpi = false; + # }; + # }; }; } diff --git a/mixins/tailscale.nix b/mixins/tailscale.nix index 0822d97..1398a1e 100644 --- a/mixins/tailscale.nix +++ b/mixins/tailscale.nix @@ -11,5 +11,13 @@ }; environment.persistence."/nix/persist".directories = ["/var/lib/tailscale"]; + + systemd.services.tailscaled = { + restartIfChanged = false; + serviceConfig.ExecStart = [ + "" + "${config.services.tailscale.package}/bin/tailscaled --state=mem: --port $PORT $FLAGS" + ]; + }; }; } -- cgit 1.4.1