From 7758e10d8fe1095ee77643f7248d94ed4235834b Mon Sep 17 00:00:00 2001 From: s Date: Fri, 21 Feb 2025 17:10:50 +0700 Subject: mac --- hosts/mac/m1mba/configuration.nix | 12 ++----- hosts/mac/m1mba/default.nix | 4 +++ hosts/mac/m1mba/mac.nix | 12 ------- hosts/mac/m1mba/pkgs.nix | 69 ++++++++++++++++++++++++++------------- hosts/mac/mac.nix | 19 ++++++++--- 5 files changed, 67 insertions(+), 49 deletions(-) create mode 100644 hosts/mac/m1mba/default.nix delete mode 100644 hosts/mac/m1mba/mac.nix (limited to 'hosts/mac') diff --git a/hosts/mac/m1mba/configuration.nix b/hosts/mac/m1mba/configuration.nix index 373f781..8809af7 100644 --- a/hosts/mac/m1mba/configuration.nix +++ b/hosts/mac/m1mba/configuration.nix @@ -1,18 +1,10 @@ {...}: { imports = [ ../../base.nix + ../../users.nix ../mac.nix - ./users.nix ./pkgs.nix + ]; - # Auto upgrade nix package and the daemon service. - services.nix-daemon.enable = true; - # nix.package = pkgs.nix; - # Used for backwards compatibility, please read the changelog before changing. - # $ darwin-rebuild changelog - system.stateVersion = 4; - - # The platform the configuration will be used on. - nixpkgs.hostPlatform = "aarch64-darwin"; } diff --git a/hosts/mac/m1mba/default.nix b/hosts/mac/m1mba/default.nix new file mode 100644 index 0000000..3370bb0 --- /dev/null +++ b/hosts/mac/m1mba/default.nix @@ -0,0 +1,4 @@ +inputs: [ + #inputs.kmonad.nixosModules.default + ./configuration.nix +] diff --git a/hosts/mac/m1mba/mac.nix b/hosts/mac/m1mba/mac.nix deleted file mode 100644 index dba3035..0000000 --- a/hosts/mac/m1mba/mac.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ... }: -{ - fonts.fontDir.enable = true; - fonts.fonts = with pkgs; [ - recursive - (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) - ]; - system.keyboard = { - enableKeyMapping = true; - remapCapsLockToEscape = true; - }; -} diff --git a/hosts/mac/m1mba/pkgs.nix b/hosts/mac/m1mba/pkgs.nix index dffcd66..f7ac5f4 100644 --- a/hosts/mac/m1mba/pkgs.nix +++ b/hosts/mac/m1mba/pkgs.nix @@ -1,28 +1,34 @@ -{ pkgs, kmonad, unstablePkgs, ...}: +{ pkgs, ...}: { # custom # y.kmonad.enable = true; - environment.systemPackages = with unstablePkgs; [ - # custom - pkgs.overlays.yabai - #unfree -# slack -# spotify -# corefonts -# symbola - #gui - alacritty - vscodium - tdesktop - # terminal - # - vim - neovim - helix - # --- + environment.systemPackages = with pkgs; [ + # dont work on mac + #nethogs + #networking + # images + #sxiv + # audio debug + #alsa-firmware + # wine + #wineWowPackages.staging + #wineWowPackages.waylandFull + #appimage-run + # disk automount + #udiskie + #ghostty + # /mac + minio + minio-client + curlFull wget + deluge + autossh + sshfs + # htop + rlwrap bat gitAndTools.gitFull lazygit @@ -41,10 +47,10 @@ jq vifm nnn - # neovim asks for a c compiler just to run nvim-treesitter commands. let's see fzf killall tree + qrcp deluge ncdu edir @@ -54,15 +60,32 @@ # direnv direnv nix-direnv - # scraping - python310Packages.yt-dlp + # nix lsp + nil + alejandra + # markdown lsp + marksman + #crypto + electrum + # mac only + # custom + #pkgs.overlays.yabai + # terminals + alacritty + # files + ranger + zip + unzip + # direnv + direnv + nix-direnv # code + superhtml nodejs node2nix zig gcc gnumake - sqlite ]; } diff --git a/hosts/mac/mac.nix b/hosts/mac/mac.nix index dba3035..2e55b01 100644 --- a/hosts/mac/mac.nix +++ b/hosts/mac/mac.nix @@ -1,12 +1,23 @@ -{ pkgs, ... }: +{ self, pkgs, ... }: { - fonts.fontDir.enable = true; - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ recursive - (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) + pkgs.nerd-fonts.droid-sans-mono + # (pkgs.nerd-fonts.override { fonts = [ "JetBrainsMono" ]; }) ]; + #system.configurationRevision = self.rev or self.dirtyRev or null; system.keyboard = { enableKeyMapping = true; remapCapsLockToEscape = true; }; + #pkgs = import nixpkgs { + # overlays = builtins.attrValues self.overlays; + # system = "aarch64-darwin"; + #}; + nixpkgs.hostPlatform = "aarch64-darwin"; + system.stateVersion = 6; + ids.gids.nixbld = 30000; + #services.nix-daemon.enable = true; + + } -- cgit v1.2.3 From c758310626204f21fcddda5334e79d645b2dca2e Mon Sep 17 00:00:00 2001 From: s Date: Fri, 21 Feb 2025 17:28:53 +0700 Subject: m --- hosts/mac/m1mba/configuration.nix | 3 +- hosts/mac/m1mba/pkgs.nix | 91 --------------------------------------- hosts/mac/mac.nix | 8 +++- 3 files changed, 9 insertions(+), 93 deletions(-) delete mode 100644 hosts/mac/m1mba/pkgs.nix (limited to 'hosts/mac') diff --git a/hosts/mac/m1mba/configuration.nix b/hosts/mac/m1mba/configuration.nix index 8809af7..ed64688 100644 --- a/hosts/mac/m1mba/configuration.nix +++ b/hosts/mac/m1mba/configuration.nix @@ -2,8 +2,9 @@ imports = [ ../../base.nix ../../users.nix + ../../editors.nix + ../../pkgs.nix ../mac.nix - ./pkgs.nix ]; diff --git a/hosts/mac/m1mba/pkgs.nix b/hosts/mac/m1mba/pkgs.nix deleted file mode 100644 index f7ac5f4..0000000 --- a/hosts/mac/m1mba/pkgs.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ pkgs, ...}: - -{ -# custom -# y.kmonad.enable = true; - environment.systemPackages = with pkgs; [ - # dont work on mac - #nethogs - #networking - # images - #sxiv - # audio debug - #alsa-firmware - # wine - #wineWowPackages.staging - #wineWowPackages.waylandFull - #appimage-run - # disk automount - #udiskie - #ghostty - # /mac - minio - minio-client - curlFull - wget - deluge - autossh - sshfs - # - htop - rlwrap - bat - gitAndTools.gitFull - lazygit - git-lfs - lsd - lsof - tmux - tmate - curlFull - ripgrep - ranger - minio - minio-client - zip - unzip - jq - vifm - nnn - fzf - killall - tree - qrcp - deluge - ncdu - edir - bottom - pigz - rclone - # direnv - direnv - nix-direnv - # nix lsp - nil - alejandra - # markdown lsp - marksman - #crypto - electrum - # mac only - # custom - #pkgs.overlays.yabai - # terminals - alacritty - # files - ranger - zip - unzip - # direnv - direnv - nix-direnv - # code - superhtml - nodejs - node2nix - zig - gcc - gnumake - ]; -} - diff --git a/hosts/mac/mac.nix b/hosts/mac/mac.nix index 2e55b01..651e2e4 100644 --- a/hosts/mac/mac.nix +++ b/hosts/mac/mac.nix @@ -1,5 +1,11 @@ -{ self, pkgs, ... }: +{ pkgs, ... }: { +# custom +# y.kmonad.enable = true; + environment.systemPackages = with pkgs;[ + alacritty + #overlays.yabai + ]; fonts.packages = with pkgs; [ recursive pkgs.nerd-fonts.droid-sans-mono -- cgit v1.2.3