diff --git a/hmModules/apps/foot/app.nix b/hmModules/apps/foot/app.nix deleted file mode 100644 index 5911613..0000000 --- a/hmModules/apps/foot/app.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ config, lib, ... }: - -{ - options.foot = { - enable = lib.mkEnableOption "Enables foot"; - make_default = lib.mkEnableOption "Makes foot default terminal emulator"; - font = lib.mkOption { default = ""; }; - font_size = lib.mkOption { default = 24; }; - theme = { - catppuccin.enable = lib.mkEnableOption "Enables catppuccin theme for foot"; - }; - }; - - config = lib.mkIf config.foot.enable { - programs.foot = { - enable = true; - settings = { - main.font = "${config.foot.font}:size=${builtins.toString config.foot.font_size}"; - colors-dark = lib.mkIf config.foot.theme.catppuccin.enable { - cursor = "11111b f5e0dc"; - foreground = "cdd6f4"; - background = "1e1e2e"; - - regular0 = "45475a"; - regular1 = "f38ba8"; - regular2 = "a6e3a1"; - regular3 = "f9e2af"; - regular4 = "89b4fa"; - regular5 = "f5c2e7"; - regular6 = "94e2d5"; - regular7 = "bac2de"; - - bright0 = "585b70"; - bright1 = "f38ba8"; - bright2 = "a6e3a1"; - bright3 = "f9e2af"; - bright4 = "89b4fa"; - bright5 = "f5c2e7"; - bright6 = "94e2d5"; - bright7 = "a6adc8"; - - "16" = "fab387"; - "17" = "f5e0dc"; - - selection-foreground = "cdd6f4"; - selection-background = "414356"; - - search-box-no-match = "11111b f38ba8"; - search-box-match = "cdd6f4 313244"; - - jump-labels = "11111b fab387"; - urls = "89b4fa"; - }; - colors-light = lib.mkIf config.foot.theme.catppuccin.enable { - cursor = "eff1f5 dc8a78"; - foreground = "4c4f69"; - background = "eff1f5"; - - regular0 = "5c5f77"; - regular1 = "d20f39"; - regular2 = "40a02b"; - regular3 = "df8e1d"; - regular4 = "1e66f5"; - regular5 = "ea76cb"; - regular6 = "179299"; - regular7 = "acb0be"; - - bright0 = "6c6f85"; - bright1 = "d20f39"; - bright2 = "40a02b"; - bright3 = "df8e1d"; - bright4 = "1e66f5"; - bright5 = "ea76cb"; - bright6 = "179299"; - bright7 = "bcc0cc"; - - "16" = "fe640b"; - "17" = "dc8a78"; - - selection-foreground = "4c4f69"; - selection-background = "ccced7"; - - search-box-no-match = "dce0e8 d20f39"; - search-box-match = "4c4f69 ccd0da"; - - jump-labels = "dce0e8 fe640b"; - urls = "1e66f5"; - }; - }; - }; - defaultApps.terminal = lib.mkIf config.foot.make_default "foot"; - }; -} diff --git a/hmModules/automatic/default.nix b/hmModules/automatic/default.nix index 3420208..18c78ef 100644 --- a/hmModules/automatic/default.nix +++ b/hmModules/automatic/default.nix @@ -23,8 +23,6 @@ home.sessionVariables = { GRADLE_USER_HOME = "${config.xdg.dataHome}/gradle"; - CARGO_HOME = "${config.xdg.dataHome}/cargo"; - JULIA_DEPOT_PATH = "${config.xdg.dataHome}/julia:$JULIA_DEPOT_PATH"; CUDA_CACHE_PATH = "${config.xdg.cacheHome}/nv"; }; diff --git a/nixosModules/apps/steam/app.nix b/nixosModules/apps/steam/app.nix index 01806d7..6311d9b 100644 --- a/nixosModules/apps/steam/app.nix +++ b/nixosModules/apps/steam/app.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, ... }: { options.steam = { @@ -11,15 +11,6 @@ enable = true; remotePlay.openFirewall = true; dedicatedServer.openFirewall = true; - package = pkgs.steam.override { - extraBwrapArgs = [ - "--bind $XDG_STATE_HOME/FakeSteamHome $HOME" - "--unsetenv XDG_CACHE_HOME" - "--unsetenv XDG_CONFIG_HOME" - "--unsetenv XDG_DATA_HOME" - "--unsetenv XDG_STATE_HOME" - ]; - }; }; programs.gamemode.enable = lib.mkIf config.steam.gamemode true; }; diff --git a/users/onizuka/default.nix b/users/onizuka/default.nix index a39eeaa..b221b66 100644 --- a/users/onizuka/default.nix +++ b/users/onizuka/default.nix @@ -22,12 +22,9 @@ trash.enable = true; fish.enable = true; - foot = { - enable = true; - make_default = true; - font = "Cascadia Code"; - theme.catppuccin.enable = true; - }; + kitty.enable = true; + kitty.make_default = true; + kitty.font = "Cascadia Code"; git.enable = true; git.username = "Julia Lange"; git.email = "public@julialange.org"; @@ -61,11 +58,13 @@ lf.enable = true; lf.hiddenfiles = [ - "${config.home.homeDirectory}/.mozilla" # Unsupported - "${config.home.homeDirectory}/.librewolf" # Unsupported - "${config.home.homeDirectory}/.ssh" # openssh assumes - "${config.home.homeDirectory}/.manpath" # man-db has it hardcoded - "${config.home.homeDirectory}/.face" # caelestia-shell requires + "${config.home.homeDirectory}/.librewolf" + "${config.home.homeDirectory}/.nix-defexpr" + "${config.home.homeDirectory}/.nix-profile" + "${config.home.homeDirectory}/.nv" + "${config.home.homeDirectory}/.pki" + "${config.home.homeDirectory}/.steam*" + "${config.home.homeDirectory}/.zshenv" ]; zoxide.enable = true;