diff --git a/home/tasia/home.nix b/home/tasia/home.nix index b75415a..4447b4b 100644 --- a/home/tasia/home.nix +++ b/home/tasia/home.nix @@ -92,6 +92,13 @@ # superTuxKart # qgis amfora + dive + inxi + revolt-desktop + lsof + pixelorama + nodePackages.node-pre-gyp + jdk17 ]; # The state version is required and should stay at the version you diff --git a/hosts/yaseen/configuration.nix b/hosts/yaseen/configuration.nix index 8def592..3929d80 100644 --- a/hosts/yaseen/configuration.nix +++ b/hosts/yaseen/configuration.nix @@ -21,7 +21,7 @@ in { ../../common/hardware/nvidia-gpu-offload.nix ../../common/hardware/ssd.nix ../../common/hardware/btrfs.nix - ../../common/hardware/latest-kernel.nix + # ../../common/hardware/latest-kernel.nix ../../common/components/de/sddm.nix ../../common/components/de/plasma6.nix @@ -37,12 +37,12 @@ in { ../../modules/nixos/vedirect-reader.nix ../../home/tasia/home.nix + ../../modules/nixos/tildefriends.nix ]; networking = { hostName = "yaseen"; - # firewall.enable = lib.mkForce false; firewall = { allowedTCPPorts = [ 8080 # ? @@ -67,7 +67,7 @@ in { ]; virtualisation.docker.enable = true; - # services.flatpak.enable = false; + services.flatpak.enable = true; services.syncthing = { user = "tasia"; @@ -78,7 +78,6 @@ in { # Needed to build enry boot.binfmt.emulatedSystems = ["aarch64-linux"]; - services.flatpak.enable = true; environment.systemPackages = with pkgs; [ inputs.tildefriends.packages.${system}.default diff --git a/modules/nixos/tildefriends.nix b/modules/nixos/tildefriends.nix index 24a9020..7fe4814 100644 --- a/modules/nixos/tildefriends.nix +++ b/modules/nixos/tildefriends.nix @@ -11,24 +11,32 @@ with lib; let # Shorter name to access final settings a # user of hello.nix module HAS ACTUALLY SET. # cfg is a typical convention. - cfg = config.services.hello; + cfg = config.services.tildefriends; in { # Declare what settings a user of this "hello.nix" module CAN SET. - options.services.hello = { - enable = mkEnableOption "hello service"; - greeter = mkOption { - type = types.str; - default = "world"; - }; + options.services.tildefriends = { + enable = mkEnableOption "tildefriends service"; + # greeter = mkOption { + # type = types.str; + # default = "world"; + # }; }; # Define what other settings, services and resources should be active IF # a user of this "hello.nix" module ENABLED this module # by setting "services.hello.enable = true;". config = mkIf cfg.enable { - systemd.services.hello = { + systemd.services.tildefriends = { + after = ["network.target"]; wantedBy = ["multi-user.target"]; - serviceConfig.ExecStart = "${pkgs.hello}/bin/hello -g'Hello, ${escapeShellArg cfg.greeter}!'"; + serviceConfig = { + WorkingDirectory = /home/tasia/Documents/tildefriends-db; + ExecStart = "${pkgs.tildefriends}/bin/tildefriends"; + + # ExecStart = "${pkgs.tmux}/bin/tmux -S /tmp/tmux.socket new-session -s my-session -d"; + # ExecStop = "${pkgs.tmux}/bin/tmux -S /tmp/tmux.socket kill-session -t my-session"; + # Type = "forking"; + }; }; }; }