diff --git a/flake.nix b/flake.nix index 464522d..b1a0903 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,10 @@ inputs.nixpkgs.follows = "unstable"; inputs.systems.follows = "systems"; }; + # Terminal + ghostty = { + url = "github:ghostty-org/ghostty"; + }; # Flatpak nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=main"; # Home manager @@ -47,6 +51,7 @@ , hyprland , nixos-cosmic , nix-flatpak + , ghostty }: let user = { @@ -59,11 +64,9 @@ localNixCaches = { urls = [ "http://minipc1.lab.internal:5000" - "http://hl-minipc1.tailb683c.ts.net:5000" ]; keys = [ "minipc1.lab.internal:eIoib1JgcBEd0YKdW95QlRA2eCKDs+WxNhWhkA1wffc=" - "hl-minipc1.tailb683c.ts.net:eIoib1JgcBEd0YKdW95QlRA2eCKDs+WxNhWhkA1wffc=" ]; }; localDockerRegistries = [ "minipc1.lab.internal:5001" ]; @@ -96,6 +99,7 @@ specialArgs = { inputs = { inherit + ghostty hyprland unstable; }; diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 2c114fe..ecb1dae 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -74,9 +74,6 @@ in awscli # Util libusb1 - - libsForQt5.xdg-desktop-portal-kde - kdePackages.xdg-desktop-portal-kde ]); # # Gaming programs.steam = { @@ -138,4 +135,17 @@ in # Firewall networking.firewall.allowedUDPPorts = openPorts; networking.firewall.allowedTCPPorts = openPorts; + # random dev work + networking.hosts = { + "0.0.0.0" = [ + "auth.me.internal" + "me.internal" + "me.local" + ]; + "127.0.0.1" = [ + "auth.me.internal" + "me.internal" + "me.local" + ]; + }; } diff --git a/modules/nixos/desktop/crypto.nix b/modules/nixos/desktop/crypto.nix index ca63d8e..2affc72 100644 --- a/modules/nixos/desktop/crypto.nix +++ b/modules/nixos/desktop/crypto.nix @@ -16,6 +16,7 @@ in trezor-suite trezord ledger-live-desktop + sparrow ]; # udev rules for crypto wallets services.udev.packages = with pkgs; [ diff --git a/modules/nixos/desktop/packages.nix b/modules/nixos/desktop/packages.nix index 0bac123..6cb18af 100644 --- a/modules/nixos/desktop/packages.nix +++ b/modules/nixos/desktop/packages.nix @@ -1,16 +1,13 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, inputs, ... }: let cfg = config.skyg.nixos.desktop; + ghostty = inputs.ghostty.packages.${pkgs.stdenv.hostPlatform.system}.default; in { config = lib.mkIf cfg.enable { # Flatpak services.flatpak.enable = true; services.flatpak.remotes = [ - { - name = "flathub-beta"; - location = "https://flathub.org/beta-repo/flathub-beta.flatpakrepo"; - } { name = "flathub"; location = "https://dl.flathub.org/repo/flathub.flatpakrepo"; @@ -18,7 +15,7 @@ in ]; # Mobile Connect programs.kdeconnect.enable = true; - environment.systemPackages = with pkgs; [ + environment.systemPackages = [ ghostty ] ++ (with pkgs; [ # General utils busybox gcc @@ -72,7 +69,7 @@ in # Photo Editing krita gimp-with-plugins - ]; + ]); services.flatpak.packages = [ "com.slack.Slack" "com.spotify.Client"