diff --git a/flake.nix b/flake.nix index bea78f9..9181bb2 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,8 @@ description = "JawZ NixOS flake setup"; inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; - nixpkgs-paint.url = "github:nixos/nixpkgs?ref=nixos-24.05"; + nixpkgs5.url = "github:nixos/nixpkgs?ref=nixos-24.05"; + nixpkgs11.url = "github:nixos/nixpkgs?ref=nixos-24.11"; ucodenix.url = "github:e-tho/ucodenix"; doom-emacs.url = "github:marienz/nix-doom-emacs-unstraightened"; ghostty.url = "github:ghostty-org/ghostty"; @@ -48,7 +49,8 @@ config.allowUnfree = true; }; pkgs = mkpkgs inputs.nixpkgs; - pkgsP = mkpkgs inputs.nixpkgs-paint; + pkgs5 = mkpkgs inputs.nixpkgs5; + pkgs11 = mkpkgs inputs.nixpkgs11; lib = inputs.nixpkgs.lib // inputs.home-manager.lib; createConfig = name: @@ -60,7 +62,7 @@ modules = [ { nixpkgs.overlays = [ - (import ./overlay.nix { inherit pkgs pkgsP; }) + (import ./overlay.nix { inherit pkgs pkgs5 pkgs11; }) inputs.doom-emacs.overlays.default ]; } diff --git a/hosts/workstation/configuration.nix b/hosts/workstation/configuration.nix index 2548a68..9be5509 100644 --- a/hosts/workstation/configuration.nix +++ b/hosts/workstation/configuration.nix @@ -12,38 +12,75 @@ "resilio/host" = { }; "resilio/password" = { }; }; - home-manager.users.jawz.xdg.configFile."jellyfin-rpc/main.json".text = builtins.toJSON { - jellyfin = { - url = "https://flix.servidos.lat"; - api_key = "abe7cdf35e5c453a9bceb004f4792b4a"; - username = "jawz"; - music = { - display = [ - "year" - "album" - ]; - separator = "-"; + home-manager.users.jawz = { + programs.ghostty = { + enable = true; + package = pkgs.ghostty; + enableBashIntegration = true; + installBatSyntax = true; + installVimSyntax = true; + settings = { }; + themes = { + catppuccin-mocha = { + background = "1e1e2e"; + cursor-color = "f5e0dc"; + foreground = "cdd6f4"; + palette = [ + "0=#45475a" + "1=#f38ba8" + "2=#a6e3a1" + "3=#f9e2af" + "4=#89b4fa" + "5=#f5c2e7" + "6=#94e2d5" + "7=#bac2de" + "8=#585b70" + "9=#f38ba8" + "10=#a6e3a1" + "11=#f9e2af" + "12=#89b4fa" + "13=#f5c2e7" + "14=#94e2d5" + "15=#a6adc8" + ]; + selection-background = "353749"; + selection-foreground = "cdd6f4"; + }; }; }; - discord = { - application_id = "1311453366978875392"; - buttons = [ - { - name = "dynamic"; - url = "dynamic"; - } - { - name = "dynamic"; - url = "dynamic"; - } - ]; - }; - imgur = { - client_id = "1ca05dbfc674d39"; - }; - images = { - enable_images = true; - imgur_images = true; + xdg.configFile."jellyfin-rpc/main.json".text = builtins.toJSON { + jellyfin = { + url = "https://flix.servidos.lat"; + api_key = "abe7cdf35e5c453a9bceb004f4792b4a"; + username = "jawz"; + music = { + display = [ + "year" + "album" + ]; + separator = "-"; + }; + }; + discord = { + application_id = "1311453366978875392"; + buttons = [ + { + name = "dynamic"; + url = "dynamic"; + } + { + name = "dynamic"; + url = "dynamic"; + } + ]; + }; + imgur = { + client_id = "1ca05dbfc674d39"; + }; + images = { + enable_images = true; + imgur_images = true; + }; }; }; networking = { @@ -72,16 +109,14 @@ users = { groups.nixremote.gid = 555; users = { - jawz.packages = - builtins.attrValues { - inherit (pkgs) - distrobox # install packages from other os - gocryptfs # encrypted filesystem! shhh!!! - torrenttools # create torrent files from the terminal! - # vcsi # video thumbnails for torrents, can I replace it with ^? - ; - } - ++ [ inputs.ghostty.packages.x86_64-linux.default ]; + jawz.packages = builtins.attrValues { + inherit (pkgs) + distrobox # install packages from other os + gocryptfs # encrypted filesystem! shhh!!! + torrenttools # create torrent files from the terminal! + # vcsi # video thumbnails for torrents, can I replace it with ^? + ; + }; nixremote = { isNormalUser = true; createHome = true;