diff --git a/flake.lock b/flake.lock index dec8252e..7406a9b3 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1707757702, - "narHash": "sha256-eLdchU0wVbqhIj4DBwju76VWyykfei3UjlBbWoSLT+Y=", + "lastModified": 1707842167, + "narHash": "sha256-aZHKkiCo0OKURhDrQz2vOQX7mONPHR5eEKfTnkWi10c=", "owner": "redyf", "repo": "Neve", - "rev": "5dbdccf17d85c8befcb92d64b8c2fa4ed6383ca7", + "rev": "da0cd49b95853129de345fe4dcc10b4d90b22f52", "type": "github" }, "original": { @@ -531,11 +531,11 @@ ] }, "locked": { - "lastModified": 1707602461, - "narHash": "sha256-bcorq66MMPqkrTwk25ywn4Q2I2jDeUAExL9ASH6I6mE=", + "lastModified": 1707919853, + "narHash": "sha256-qxmBGDzutuJ/tsX4gp+Mr7fjxOZBbeT9ixhS5o4iFOw=", "owner": "nix-community", "repo": "home-manager", - "rev": "fb0196ad9d18554e035de27d4f2a906ba050b407", + "rev": "043ba285c6dc20f36441d48525402bcb9743c498", "type": "github" }, "original": { @@ -553,11 +553,11 @@ ] }, "locked": { - "lastModified": 1706955260, - "narHash": "sha256-W3y0j77IDVbmbajudHoUr46RpswujUCl+D5Vru53UsI=", + "lastModified": 1707467182, + "narHash": "sha256-/Bw/xgCXfj4nXDd8Xq+r1kaorfsYkkomMf5w5MpsDyA=", "owner": "nix-community", "repo": "home-manager", - "rev": "880d9bc2110f7cae59698f715b8ca42cdc53670c", + "rev": "5b9156fa9a8b8beba917b8f9adbfd27bf63e16af", "type": "github" }, "original": { @@ -575,11 +575,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1707586793, - "narHash": "sha256-Vdf5QGzkZe6UUdVZ80YT78id7Yw5ww9Fku0rEyPAkCg=", + "lastModified": 1707911087, + "narHash": "sha256-nl/qnwsO6Trbt6l9V0HGDF3j0+q8oNWtZWwxX3IxByw=", "owner": "hyprwm", "repo": "hyprland", - "rev": "e4bb5fa4af1a6c36aab1c28651b5403dc4952f93", + "rev": "06087914807f88d2a9fc76c8108985f6327598de", "type": "github" }, "original": { @@ -820,11 +820,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1706637303, - "narHash": "sha256-K6SqE9diWDCoEQ+MzuVlTfNrAKcdIa/dLHBtKfz445U=", + "lastModified": 1707825078, + "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=", "owner": "misterio77", "repo": "nix-colors", - "rev": "fc080c51d2a219b40d886870e364243783ed5ca1", + "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1", "type": "github" }, "original": { @@ -862,11 +862,11 @@ ] }, "locked": { - "lastModified": 1706833576, - "narHash": "sha256-w7BL0EWRts+nD1lbLECIuz6fRzmmV+z8oWwoY7womR0=", + "lastModified": 1707707289, + "narHash": "sha256-YuDt/eSTXMEHv8jS8BEZJgqCcG8Tr3cyqaZjJFXZHsw=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "bdbae6ecff8fcc322bf6b9053c0b984912378af7", + "rev": "44f50a5ecaab72a61d5fd8e5c5717bc4bf9c25dd", "type": "github" }, "original": { @@ -919,11 +919,11 @@ ] }, "locked": { - "lastModified": 1707405218, - "narHash": "sha256-ZQ366Oo8WJbCqXAZET7N0Sz6RQ3G2IbqVtxQRSa3SXc=", + "lastModified": 1707873059, + "narHash": "sha256-simzllUEmzVqmQogcGCorfIbJpodAhgGSr6vuFtd4XQ=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "843e2f04c716092797ffa4ce14c446adce2f09ef", + "rev": "0aa24e93f75370454f0e03747b6836ac2a2c9fca", "type": "github" }, "original": { @@ -941,11 +941,11 @@ ] }, "locked": { - "lastModified": 1707476384, - "narHash": "sha256-9YortZTCO9r7wFHX92t+npUDmD5VcKrkVmwaPCvEiXI=", + "lastModified": 1707761607, + "narHash": "sha256-OKNdTgnyhZpmqdgba8s78/QvowyTIMJDp0iLxv570bU=", "owner": "nix-community", "repo": "nixos-wsl", - "rev": "76ca59d8d4423b27c0238bc31401692ebc571365", + "rev": "c8ddba82ca6b791be1acaae4b336ff8e857ec70b", "type": "github" }, "original": { @@ -956,11 +956,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1707711327, - "narHash": "sha256-JaiR0Er0Bx80CT5POOYR1I1tLM7VvC2/ny6mOmkoRQw=", + "lastModified": 1707743206, + "narHash": "sha256-AehgH64b28yKobC/DAWYZWkJBxL/vP83vkY+ag2Hhy4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "01737456dfe4907fb5bdc8af39ac8c6d6b1fb551", + "rev": "2d627a2a704708673e56346fcb13d25344b8eaf3", "type": "github" }, "original": { @@ -1017,11 +1017,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1706191920, - "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", + "lastModified": 1707546158, + "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", + "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0", "type": "github" }, "original": { @@ -1063,11 +1063,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1707268954, - "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", + "lastModified": 1707689078, + "narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", + "rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8", "type": "github" }, "original": { @@ -1079,11 +1079,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1706191920, - "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", + "lastModified": 1707546158, + "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", + "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0", "type": "github" }, "original": { @@ -1118,11 +1118,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1707739963, - "narHash": "sha256-DpECm6j0fjOaBqcpVhmU76fCHbhEfROd9SjHuE2JvMk=", + "lastModified": 1707759973, + "narHash": "sha256-pcrVeFhagWn5cj+bMFFRHWGluutS8BPxZ3l0P8kFuWg=", "owner": "nix-community", "repo": "nixvim", - "rev": "3871b56b15857333d3c3f6d0e76fc1df51afe664", + "rev": "a70f58034010c503881fe7fd569c2ddcc607c5d7", "type": "github" }, "original": { @@ -1142,11 +1142,11 @@ "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1707595282, - "narHash": "sha256-F96hGG5ZCJiwZFBvlUrW8uLyhhz1/QJiqk+vaCjtWjw=", + "lastModified": 1707905367, + "narHash": "sha256-XqzKBGi8ItHQhnICLB36MHzABGW7JFQDuG0EURjRO0Q=", "owner": "nix-community", "repo": "nixvim", - "rev": "e0926bc41bd06e0f4e86631872ec1a1aa41a4ba2", + "rev": "f755eeb961a4d13ec72921cb4dbc4f2d6c8a58bb", "type": "github" }, "original": { @@ -1157,11 +1157,11 @@ }, "nur": { "locked": { - "lastModified": 1707603217, - "narHash": "sha256-OM/nTvq9qQqkODobIOe+UzNtLNC9rASrmblHgFkPXHM=", + "lastModified": 1707925558, + "narHash": "sha256-4mVOGMhbfsWHLn7s31CA04DXJJ55zjm+Tw+InFXD5OA=", "owner": "nix-community", "repo": "NUR", - "rev": "a0e185354efd1ef8701224bbe1fc68c532436dc1", + "rev": "bfd822b11661a701bff17c720b42965fd32d1394", "type": "github" }, "original": { @@ -1215,11 +1215,11 @@ ] }, "locked": { - "lastModified": 1706424699, - "narHash": "sha256-Q3RBuOpZNH2eFA1e+IHgZLAOqDD9SKhJ/sszrL8bQD4=", + "lastModified": 1707297608, + "narHash": "sha256-ADjo/5VySGlvtCW3qR+vdFF4xM9kJFlRDqcC9ZGI8EA=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf", + "rev": "0db2e67ee49910adfa13010e7f012149660af7f0", "type": "github" }, "original": { @@ -1518,11 +1518,11 @@ "xdph": "xdph_2" }, "locked": { - "lastModified": 1707586793, - "narHash": "sha256-Vdf5QGzkZe6UUdVZ80YT78id7Yw5ww9Fku0rEyPAkCg=", + "lastModified": 1707911087, + "narHash": "sha256-nl/qnwsO6Trbt6l9V0HGDF3j0+q8oNWtZWwxX3IxByw=", "owner": "hyprwm", "repo": "hyprland", - "rev": "e4bb5fa4af1a6c36aab1c28651b5403dc4952f93", + "rev": "06087914807f88d2a9fc76c8108985f6327598de", "type": "github" }, "original": { @@ -1607,11 +1607,11 @@ ] }, "locked": { - "lastModified": 1706145785, - "narHash": "sha256-j9MP4fv2U/vdRKAXXc2gyMTmYwVnHP6kHx1/y6jprrU=", + "lastModified": 1706521509, + "narHash": "sha256-AInZ50acOJ3wzUwGzNr1TmxGTMx+8j6oSTzz4E7Vbp8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "5a592647587cd20b9692a347df6939b6d371b3bb", + "rev": "c06fd88b3da492b8f9067be021b9184f7012b5a8", "type": "github" }, "original": { @@ -1637,11 +1637,11 @@ ] }, "locked": { - "lastModified": 1706145785, - "narHash": "sha256-j9MP4fv2U/vdRKAXXc2gyMTmYwVnHP6kHx1/y6jprrU=", + "lastModified": 1706521509, + "narHash": "sha256-AInZ50acOJ3wzUwGzNr1TmxGTMx+8j6oSTzz4E7Vbp8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "5a592647587cd20b9692a347df6939b6d371b3bb", + "rev": "c06fd88b3da492b8f9067be021b9184f7012b5a8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 08bf670a..a8c9f331 100644 --- a/flake.nix +++ b/flake.nix @@ -63,30 +63,29 @@ }; }; - outputs = inputs: - let - inherit (inputs) hyprland nixpkgs; - supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; - - # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'. - forAllSystems = nixpkgs.lib.genAttrs supportedSystems; - - # Nixpkgs instantiated for supported system types. - nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; }); - lib = inputs.snowfall-lib.mkLib { - inherit inputs; - src = ./.; - - snowfall = { - meta = { - name = "nixdots"; - title = "nixdots"; - }; + outputs = inputs: let + inherit (inputs) hyprland nixpkgs; + supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"]; + + # Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'. + forAllSystems = nixpkgs.lib.genAttrs supportedSystems; + + # Nixpkgs instantiated for supported system types. + nixpkgsFor = forAllSystems (system: import nixpkgs {inherit system;}); + lib = inputs.snowfall-lib.mkLib { + inherit inputs; + src = ./.; - namespace = "custom"; + snowfall = { + meta = { + name = "nixdots"; + title = "nixdots"; }; + + namespace = "custom"; }; - in + }; + in lib.mkFlake { inherit inputs; src = ./.; @@ -98,11 +97,11 @@ # integrates nur within Home-Manager nur = import - (builtins.fetchTarball { - url = "https://github.com/nix-community/NUR/archive/master.tar.gz"; - sha256 = "sha256:1gr3l5fcjsd7j9g6k9jamby684k356a36h82cwck2vcxf8yw8xa0"; - }) - { inherit pkgs; }; + (builtins.fetchTarball { + url = "https://github.com/nix-community/NUR/archive/master.tar.gz"; + sha256 = "sha256:0ia5fbhrq2r1f6z5yxf4nxg8qx37360r8awfgjylckavhj76cizc"; + }) + {inherit pkgs;}; }; }; @@ -197,21 +196,19 @@ # deploy-lib.deployChecks inputs.self.deploy) # inputs.deploy-rs.lib; - templates = import ./templates { }; - - devShells = forAllSystems (system: - let - pkgs = nixpkgsFor.${system}; - in - { - default = pkgs.mkShell { - buildInputs = with pkgs; [ - git - nixpkgs-fmt - statix - ]; - }; - }); + templates = import ./templates {}; + + devShells = forAllSystems (system: let + pkgs = nixpkgsFor.${system}; + in { + default = pkgs.mkShell { + buildInputs = with pkgs; [ + git + nixpkgs-fmt + statix + ]; + }; + }); formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixpkgs-fmt; }; } diff --git a/modules/nixos/apps/firefox/default.nix b/modules/nixos/apps/firefox/default.nix index e6c56791..b09d0339 100644 --- a/modules/nixos/apps/firefox/default.nix +++ b/modules/nixos/apps/firefox/default.nix @@ -1,14 +1,14 @@ -{ options -, config -, pkgs -, lib -, ... +{ + options, + config, + pkgs, + lib, + ... }: with lib; with lib.custom; let cfg = config.apps.firefox; -in -{ +in { options.apps.firefox = with types; { enable = mkBoolOpt false "Enable or disable firefox browser"; }; @@ -16,53 +16,55 @@ in config = mkIf cfg.enable { home.extraOptions.programs.firefox = { enable = true; + # package = pkgs.floorp; + # profiles.test = { + # search.default = "Google"; + # search.force = true; + # extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + # darkreader + # decentraleyes + # clearurls + # stylus + # auto-tab-discard + # onepassword-password-manager + # vimium + # react-devtools + # ublock-origin + # ]; + # }; }; - # home.programs.firefox = { - # enable = true; - # profiles.redyf = { - # search.default = "Google"; - # search.force = true; - # extensions = with pkgs.nur.repos.rycee.firefox-addons; [ - # darkreader - # decentraleyes - # clearurls - # stylus - # auto-tab-discard - # vimium - # ublock-origin - # ]; - # }; - # }; - # - # xdg.mimeApps = { - # enable = true; - # associations.added = { - # "application/pdf" = ["firefox.desktop"]; - # "video/mp4" = ["mpv.desktop"]; - # "x-scheme-handler/http" = ["firefox.desktop"]; - # "x-scheme-handler/https" = ["firefox.desktop"]; - # "text/html" = ["firefox.desktop"]; - # }; - # defaultApplications = { - # "application/pdf" = ["firefox.desktop"]; - # "application/x-extension-htm" = ["firefox.desktop"]; - # "application/x-extension-html" = ["firefox.desktop"]; - # "application/x-extension-shtml" = ["firefox.desktop"]; - # "application/x-extension-xht" = ["firefox.desktop"]; - # "application/x-extension-xhtml" = ["firefox.desktop"]; - # "application/x-www-browser" = ["firefox.desktop"]; - # "application/xhtml+xml" = ["firefox.desktop"]; - # "text/html" = ["firefox.desktop"]; - # "x-scheme-handler/chrome" = ["firefox.desktop"]; - # "x-scheme-handler/http" = ["firefox.desktop"]; - # "x-scheme-handler/https" = ["firefox.desktop"]; - # "x-scheme-handler/ftp" = ["firefox.desktop"]; - # "x-scheme-handler/about" = ["firefox.desktop"]; - # "x-scheme-handler/unknown" = ["firefox.desktop"]; - # "x-scheme-handler/webcal" = ["firefox.desktop"]; - # "x-www-browser" = ["firefox.desktop"]; - # "video/mp4" = ["mpv.desktop"]; - # }; - # }; }; } +# +# xdg.mimeApps = { +# enable = true; +# associations.added = { +# "application/pdf" = ["firefox.desktop"]; +# "video/mp4" = ["mpv.desktop"]; +# "x-scheme-handler/http" = ["firefox.desktop"]; +# "x-scheme-handler/https" = ["firefox.desktop"]; +# "text/html" = ["firefox.desktop"]; +# }; +# defaultApplications = { +# "application/pdf" = ["firefox.desktop"]; +# "application/x-extension-htm" = ["firefox.desktop"]; +# "application/x-extension-html" = ["firefox.desktop"]; +# "application/x-extension-shtml" = ["firefox.desktop"]; +# "application/x-extension-xht" = ["firefox.desktop"]; +# "application/x-extension-xhtml" = ["firefox.desktop"]; +# "application/x-www-browser" = ["firefox.desktop"]; +# "application/xhtml+xml" = ["firefox.desktop"]; +# "text/html" = ["firefox.desktop"]; +# "x-scheme-handler/chrome" = ["firefox.desktop"]; +# "x-scheme-handler/http" = ["firefox.desktop"]; +# "x-scheme-handler/https" = ["firefox.desktop"]; +# "x-scheme-handler/ftp" = ["firefox.desktop"]; +# "x-scheme-handler/about" = ["firefox.desktop"]; +# "x-scheme-handler/unknown" = ["firefox.desktop"]; +# "x-scheme-handler/webcal" = ["firefox.desktop"]; +# "x-www-browser" = ["firefox.desktop"]; +# "video/mp4" = ["mpv.desktop"]; +# }; +# }; +# }; + diff --git a/modules/nixos/cli-apps/tmux/default.nix b/modules/nixos/cli-apps/tmux/default.nix index 87fa8ad5..df00df58 100644 --- a/modules/nixos/cli-apps/tmux/default.nix +++ b/modules/nixos/cli-apps/tmux/default.nix @@ -1,15 +1,15 @@ -{ options -, config -, pkgs -, lib -, inputs -, ... +{ + options, + config, + pkgs, + lib, + inputs, + ... }: with lib; with lib.custom; let cfg = config.cli-apps.tmux; -in -{ +in { options.cli-apps.tmux = with types; { enable = mkBoolOpt false "Enable or disable the tmux terminal."; }; @@ -38,10 +38,6 @@ in bind -n M-H previous-window bind -n M-L next-window - # Alt arrow keys to switch windows - # bind -T root M-Left previous-window - # bind -T root M-Right next-window - # Open panes in current directory bind '"' split-window -v -c "#{pane_current_path}" bind % split-window -h -c "#{pane_current_path}" diff --git a/modules/nixos/desktop/addons/xdg-portal/default.nix b/modules/nixos/desktop/addons/xdg-portal/default.nix index 79919638..3a99d010 100644 --- a/modules/nixos/desktop/addons/xdg-portal/default.nix +++ b/modules/nixos/desktop/addons/xdg-portal/default.nix @@ -1,15 +1,15 @@ -{ options -, inputs -, config -, lib -, pkgs -, ... +{ + options, + inputs, + config, + lib, + pkgs, + ... }: with lib; with lib.custom; let cfg = config.desktop.addons.xdg-portal; -in -{ +in { options.desktop.addons.xdg-portal = with types; { enable = mkBoolOpt false "Whether or not to add support for xdg portal."; }; diff --git a/modules/nixos/hardware/nvidia/default.nix b/modules/nixos/hardware/nvidia/default.nix index b809afdc..bac7e8fe 100644 --- a/modules/nixos/hardware/nvidia/default.nix +++ b/modules/nixos/hardware/nvidia/default.nix @@ -1,21 +1,21 @@ -{ options -, pkgs -, config -, lib -, ... +{ + options, + pkgs, + config, + lib, + ... }: with lib; with lib.custom; let cfg = config.hardware.nvidia; -in -{ +in { options.hardware.nvidia = with types; { enable = mkBoolOpt false "Enable drivers and patches for Nvidia hardware."; }; config = mkIf cfg.enable { - boot.kernelParams = [ "nvidia.NVreg_PreserveVideoMemoryAllocations=1" ]; - services.xserver.videoDrivers = [ "nvidia" ]; + boot.kernelParams = ["nvidia.NVreg_PreserveVideoMemoryAllocations=1"]; + services.xserver.videoDrivers = ["nvidia"]; hardware = { nvidia = { open = false; @@ -27,7 +27,7 @@ in opengl = { enable = true; driSupport32Bit = true; - extraPackages = with pkgs; [ nvidia-vaapi-driver ]; + extraPackages = with pkgs; [nvidia-vaapi-driver]; }; }; @@ -49,7 +49,7 @@ in WLR_NO_HARDWARE_CURSORS = "1"; # Fix cursor rendering issue on wlr nvidia. DEFAULT_BROWSER = "${pkgs.firefox}/bin/firefox"; # Set default browser }; - shellAliases = { nvidia-settings = "nvidia-settings --config='$XDG_CONFIG_HOME'/nvidia/settings"; }; + shellAliases = {nvidia-settings = "nvidia-settings --config='$XDG_CONFIG_HOME'/nvidia/settings";}; }; }; } diff --git a/modules/nixos/suites/desktop/default.nix b/modules/nixos/suites/desktop/default.nix index 30231754..eaa931e0 100644 --- a/modules/nixos/suites/desktop/default.nix +++ b/modules/nixos/suites/desktop/default.nix @@ -1,21 +1,21 @@ -{ options -, config -, lib -, pkgs -, ... +{ + options, + config, + lib, + pkgs, + ... }: with lib; with lib.custom; let cfg = config.suites.desktop; -in -{ +in { options.suites.desktop = with types; { enable = mkBoolOpt false "Enable the desktop suite"; }; config = mkIf cfg.enable { apps = { - firefox = enabled; + firefox = disabled; floorp = enabled; spicetify = enabled; }; diff --git a/modules/nixos/system/fonts/default.nix b/modules/nixos/system/fonts/default.nix index 26e376f2..50c929d3 100644 --- a/modules/nixos/system/fonts/default.nix +++ b/modules/nixos/system/fonts/default.nix @@ -1,22 +1,22 @@ -{ options -, config -, pkgs -, lib -, ... +{ + options, + config, + pkgs, + lib, + ... }: with lib; with lib.custom; let cfg = config.system.fonts; -in -{ +in { options.system.fonts = with types; { enable = mkBoolOpt false "Whether or not to manage fonts."; - fonts = mkOpt (listOf package) [ ] "Custom font packages to install."; + fonts = mkOpt (listOf package) [] "Custom font packages to install."; }; config = mkIf cfg.enable { environment = { - systemPackages = with pkgs; [ font-manager ]; + systemPackages = with pkgs; [font-manager]; variables = { # Enable icons in tooling since we have nerdfonts. LOG_ICONS = "true"; @@ -28,23 +28,23 @@ in fontconfig = { enable = true; defaultFonts = { - serif = [ "Times, Noto Serif" ]; - sansSerif = [ "Helvetica Neue LT Std, Helvetica, Noto Sans" ]; - monospace = [ "Courier Prime, Courier, Noto Sans Mono" ]; + serif = ["Iosevka Aile, Times, Noto Serif"]; + sansSerif = ["Iosevka Aile, Helvetica Neue LT Std, Helvetica, Noto Sans"]; + monospace = ["Courier Prime, Courier, Noto Sans Mono"]; }; }; packages = with pkgs; [ - sf-mono-liga-bin - Monolisa - noto-fonts dejavu_fonts font-awesome fira-code-symbols - powerline-symbols + (iosevka-bin.override {variant = "aile";}) material-design-icons - ubuntu_font_family - (nerdfonts.override { fonts = [ "IBMPlexMono" "CascadiaCode" "FiraMono" "JetBrainsMono" ]; }) + Monolisa + (nerdfonts.override {fonts = ["FiraMono" "JetBrainsMono"];}) + noto-fonts + powerline-symbols + # sf-mono-liga-bin ] ++ cfg.fonts; }; diff --git a/modules/nixos/system/shell/default.nix b/modules/nixos/system/shell/default.nix index 70dfcc18..663d28f5 100644 --- a/modules/nixos/system/shell/default.nix +++ b/modules/nixos/system/shell/default.nix @@ -29,8 +29,6 @@ in p = "pfetch"; fetch = "neofetch w3m"; grep = "grep --color=auto"; - ls = "eza"; - la = "eza -a"; mv = "mv -i"; rip = "rip -i"; rebuild = "cd ~/nixdots && doas nixos-rebuild switch --flake .#redyf"; @@ -219,8 +217,6 @@ in p = "pfetch"; fetch = "neofetch w3m"; grep = "grep --color=auto"; - ls = "eza"; - la = "eza -a"; mv = "mv -i"; rip = "rip -i"; rebuild = "cd ~/nixdots && doas nixos-rebuild switch --flake .#redyf";