diff --git a/modules/home-manager/shell.nix b/modules/home-manager/shell.nix index d00643a..9dc4d40 100644 --- a/modules/home-manager/shell.nix +++ b/modules/home-manager/shell.nix @@ -19,7 +19,8 @@ edit-nvf = "nvim ~/nixos-dotfiles/modules/nixos/nvf.nix"; # Enhanced file operations - ls = "eza --long -ahF --no-user --no-permissions --git --icons=always --color=always --grid"; + ls = "eza --long -hF --no-user --no-permissions --git --icons=always --color=always --grid"; + la = "eza --long -ahF --no-user --no-permissions --git --icons=always --color=always --grid"; cd = "z"; # Use zoxide for smart directory jumping # Utilities diff --git a/modules/nixos/apple-fonts.nix b/modules/nixos/apple-fonts.nix index cf4fd50..5f6288f 100644 --- a/modules/nixos/apple-fonts.nix +++ b/modules/nixos/apple-fonts.nix @@ -11,22 +11,22 @@ stdenv.mkDerivation rec { pro = fetchurl { url = "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"; - sha256 = "sha256-g/SzgU3vOzm8uRuA6AN/N8Tnrl2Vpya58hx99dGfecI="; + sha256 = "sha256-W0sZkipBtrduInk0oocbFAXX1qy0Z+yk2xUyFfDWx4s="; }; compact = fetchurl { url = "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"; - sha256 = "sha256-SIht9sqmeijEeU4uLwm+tlZtFlTnD/G5GH8haUL6dlU="; + sha256 = "sha256-RWeq4GFt01r8NLrWvvVH5y/R5lhFMFozlzBkUY0dU0g="; }; mono = fetchurl { url = "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg"; - sha256 = "sha256-jnhTTmSy5J8MJotbsI8g5hxotgjvyDbccymjABwajYw="; + sha256 = "sha256-bUoLeOOqzQb5E/ZCzq0cfbSvNO1IhW1xcaLgtV2aeUU="; }; ny = fetchurl { url = "https://devimages-cdn.apple.com/design/resources/download/NY.dmg"; - sha256 = "sha256-Rr0UpJa7kemczCqNn6b8HNtW6PiWO/Ez1LUh/WNk8S8="; + sha256 = "sha256-HC7ttFJswPMm+Lfql49aQzdWR2osjFYHJTdgjtuI+PQ="; }; nativeBuildInputs = [p7zip]; diff --git a/modules/nixos/packages.nix b/modules/nixos/packages.nix index 7aa6d9b..4de0850 100644 --- a/modules/nixos/packages.nix +++ b/modules/nixos/packages.nix @@ -1,6 +1,8 @@ {pkgs, ...}: let # Import custom wallpapers package wallpapers = pkgs.callPackage ./wallpapers.nix {}; + # Import Apple fonts package + apple-fonts = pkgs.callPackage ./apple-fonts.nix {}; in { # System-wide packages available to all users environment.systemPackages = with pkgs; [ @@ -74,5 +76,19 @@ in { # Microsoft fonts corefonts # Arial, Times New Roman, etc. vista-fonts # Calibri, Cambria, etc. + + # Apple fonts + apple-fonts + + # Additional fonts + noto-fonts + noto-fonts-cjk-sans + noto-fonts-color-emoji + liberation_ttf + fira-code + fira-code-symbols + mplus-outline-fonts.githubRelease + dina-font + proggyfonts ]; } diff --git a/modules/nixos/services.nix b/modules/nixos/services.nix index 32f49c8..f6a5ee7 100644 --- a/modules/nixos/services.nix +++ b/modules/nixos/services.nix @@ -35,6 +35,9 @@ # Touchpad/trackpad support for laptops services.libinput.enable = true; + services.udisks2.enable = true; + services.gvfs.enable = true; + # XDG Desktop Portal (for screen sharing, file pickers, etc.) xdg.portal = { enable = true; diff --git a/modules/nixos/wallpapers/Pictures/finalizer.png b/modules/nixos/wallpapers/Pictures/finalizer.png new file mode 100644 index 0000000..661b35b Binary files /dev/null and b/modules/nixos/wallpapers/Pictures/finalizer.png differ diff --git a/modules/nixos/wallpapers/Pictures/firefox.png b/modules/nixos/wallpapers/Pictures/firefox.png new file mode 100644 index 0000000..9a13f0d Binary files /dev/null and b/modules/nixos/wallpapers/Pictures/firefox.png differ diff --git a/modules/nixos/wallpapers/Pictures/forest.png b/modules/nixos/wallpapers/Pictures/forest.png new file mode 100644 index 0000000..fe12aae Binary files /dev/null and b/modules/nixos/wallpapers/Pictures/forest.png differ diff --git a/modules/nixos/wallpapers/Pictures/fsociety.jpg b/modules/nixos/wallpapers/Pictures/fsociety.jpg new file mode 100644 index 0000000..6176494 Binary files /dev/null and b/modules/nixos/wallpapers/Pictures/fsociety.jpg differ diff --git a/modules/nixos/wallpapers/Pictures/great-wave-of-kanagawa-gruvbox.png b/modules/nixos/wallpapers/Pictures/great-wave-of-kanagawa-gruvbox.png new file mode 100644 index 0000000..cb4f073 Binary files /dev/null and b/modules/nixos/wallpapers/Pictures/great-wave-of-kanagawa-gruvbox.png differ diff --git a/modules/nixos/wallpapers/Pictures/gruv-abstract-maze.png b/modules/nixos/wallpapers/Pictures/gruv-abstract-maze.png new file mode 100644 index 0000000..d670bb4 Binary files /dev/null and b/modules/nixos/wallpapers/Pictures/gruv-abstract-maze.png differ diff --git a/modules/nixos/wallpapers/Pictures/gruvbox-pacman-ghosts.png b/modules/nixos/wallpapers/Pictures/gruvbox-pacman-ghosts.png new file mode 100644 index 0000000..3a4da3f Binary files /dev/null and b/modules/nixos/wallpapers/Pictures/gruvbox-pacman-ghosts.png differ diff --git a/modules/nixos/wallpapers/Pictures/gruvbox-rainbow-nix.png b/modules/nixos/wallpapers/Pictures/gruvbox-rainbow-nix.png new file mode 100644 index 0000000..9832948 Binary files /dev/null and b/modules/nixos/wallpapers/Pictures/gruvbox-rainbow-nix.png differ diff --git a/modules/nixos/wallpapers/Pictures/gruvbox15.png b/modules/nixos/wallpapers/Pictures/gruvbox15.png new file mode 100644 index 0000000..984c887 Binary files /dev/null and b/modules/nixos/wallpapers/Pictures/gruvbox15.png differ diff --git a/modules/nixos/wallpapers/Pictures/gruvbox_image11.png b/modules/nixos/wallpapers/Pictures/gruvbox_image11.png new file mode 100644 index 0000000..032fd10 Binary files /dev/null and b/modules/nixos/wallpapers/Pictures/gruvbox_image11.png differ diff --git a/modules/nixos/wallpapers/Pictures/hlgruvorange.png b/modules/nixos/wallpapers/Pictures/hlgruvorange.png new file mode 100644 index 0000000..6d82103 Binary files /dev/null and b/modules/nixos/wallpapers/Pictures/hlgruvorange.png differ diff --git a/modules/nixos/wallpapers/Pictures/mad.jpg b/modules/nixos/wallpapers/Pictures/mad.jpg new file mode 100644 index 0000000..13ec8a1 Binary files /dev/null and b/modules/nixos/wallpapers/Pictures/mad.jpg differ diff --git a/modules/nixos/wallpapers/Pictures/nasa-2.png b/modules/nixos/wallpapers/Pictures/nasa-2.png new file mode 100644 index 0000000..b41e10d Binary files /dev/null and b/modules/nixos/wallpapers/Pictures/nasa-2.png differ diff --git a/modules/nixos/wallpapers/Pictures/nix-gold.png b/modules/nixos/wallpapers/Pictures/nix-gold.png new file mode 100644 index 0000000..7c8c4e5 Binary files /dev/null and b/modules/nixos/wallpapers/Pictures/nix-gold.png differ diff --git a/modules/nixos/wallpapers/Pictures/nix.jpg b/modules/nixos/wallpapers/Pictures/nix.jpg new file mode 100644 index 0000000..edbea5e Binary files /dev/null and b/modules/nixos/wallpapers/Pictures/nix.jpg differ diff --git a/modules/nixos/wallpapers/Pictures/nix.png b/modules/nixos/wallpapers/Pictures/nix.png index fe12aae..f928caa 100644 Binary files a/modules/nixos/wallpapers/Pictures/nix.png and b/modules/nixos/wallpapers/Pictures/nix.png differ diff --git a/modules/nixos/wallpapers/Pictures/nix11.png b/modules/nixos/wallpapers/Pictures/nix11.png new file mode 100644 index 0000000..fe12aae Binary files /dev/null and b/modules/nixos/wallpapers/Pictures/nix11.png differ diff --git a/modules/nixos/wallpapers/Pictures/nixos.png b/modules/nixos/wallpapers/Pictures/nixos.png new file mode 100644 index 0000000..e14f628 Binary files /dev/null and b/modules/nixos/wallpapers/Pictures/nixos.png differ diff --git a/modules/nixos/wallpapers/Pictures/pacman-ghosts.png b/modules/nixos/wallpapers/Pictures/pacman-ghosts.png new file mode 100644 index 0000000..021abeb Binary files /dev/null and b/modules/nixos/wallpapers/Pictures/pacman-ghosts.png differ diff --git a/modules/nixos/wallpapers/Pictures/skull.png b/modules/nixos/wallpapers/Pictures/skull.png new file mode 100644 index 0000000..19dce9e Binary files /dev/null and b/modules/nixos/wallpapers/Pictures/skull.png differ diff --git a/modules/nixos/wallpapers/Pictures/tux.png b/modules/nixos/wallpapers/Pictures/tux.png new file mode 100644 index 0000000..a45cd8a Binary files /dev/null and b/modules/nixos/wallpapers/Pictures/tux.png differ diff --git a/modules/nixos/wallpapers/Pictures/wall_secondary.png b/modules/nixos/wallpapers/Pictures/wall_secondary.png new file mode 100644 index 0000000..d544ec9 Binary files /dev/null and b/modules/nixos/wallpapers/Pictures/wall_secondary.png differ diff --git a/modules/nixos/wallpapers/Pictures/wallhaven-7p6g99.png b/modules/nixos/wallpapers/Pictures/wallhaven-7p6g99.png new file mode 100644 index 0000000..3d3c57b Binary files /dev/null and b/modules/nixos/wallpapers/Pictures/wallhaven-7p6g99.png differ diff --git a/modules/nixos/wallpapers/Pictures/wp11058333.png b/modules/nixos/wallpapers/Pictures/wp11058333.png new file mode 100644 index 0000000..d3afa29 Binary files /dev/null and b/modules/nixos/wallpapers/Pictures/wp11058333.png differ diff --git a/modules/nixos/wallpapers/Pictures/zelda.png b/modules/nixos/wallpapers/Pictures/zelda.png new file mode 100644 index 0000000..ef2e906 Binary files /dev/null and b/modules/nixos/wallpapers/Pictures/zelda.png differ diff --git a/modules/nixos/wallpapers/Pictures/zelda_botw.png b/modules/nixos/wallpapers/Pictures/zelda_botw.png new file mode 100644 index 0000000..08e0bef Binary files /dev/null and b/modules/nixos/wallpapers/Pictures/zelda_botw.png differ