diff --git a/darwin/common-homebrew.ulu.nix b/darwin/common-homebrew.ulu.nix deleted file mode 100644 index 4406aa8..0000000 --- a/darwin/common-homebrew.ulu.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ ... }: -{ - flake.darwinModules.common-homebrew = - { ... }: - { - homebrew = { - enable = true; - onActivation = { - autoUpdate = true; - upgrade = true; - cleanup = "none"; - }; - brews = [ ]; - casks = [ ]; - }; - }; -} diff --git a/darwin/common-packages.ulu.nix b/darwin/common-packages.ulu.nix deleted file mode 100644 index 7297313..0000000 --- a/darwin/common-packages.ulu.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ ... }: -{ - flake.darwinModules.common-packages = - { pkgs, ... }: - { - environment.systemPackages = with pkgs; [ - pinentry_mac - fastfetch - starship - clinfo - zoxide - unzip - gnupg - btop - htop - tree - wget - eza - bat - git - fzf - zip - fd - ]; - }; -} diff --git a/darwin/common-system.ulu.nix b/darwin/common-system.ulu.nix deleted file mode 100644 index 8290427..0000000 --- a/darwin/common-system.ulu.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ ... }: -{ - flake.darwinModules.common-system = - { - pkgs, - config, - lib, - ... - }: - let - inherit (lib) mkAfter; - in - { - nix.enable = false; - - time.timeZone = "Europe/Istanbul"; - - fonts.packages = with pkgs; [ - noto-fonts - noto-fonts-cjk-sans - noto-fonts-cjk-serif - noto-fonts-color-emoji - nerd-fonts.jetbrains-mono - ]; - - system.defaults = { - NSGlobalDomain = { - AppleInterfaceStyle = "Dark"; - InitialKeyRepeat = 15; - KeyRepeat = 2; - ApplePressAndHoldEnabled = false; - AppleShowAllFiles = true; - AppleShowAllExtensions = true; - "com.apple.springing.enabled" = true; - "com.apple.springing.delay" = 0.0; - }; - CustomSystemPreferences = { - "com.apple.desktopservices" = { - DSDontWriteNetworkStores = true; - DSDontWriteUSBStores = true; - }; - "com.apple.AdLib" = { - allowApplePersonalizedAdvertising = false; - allowIdentifierForAdvertising = false; - forceLimitAdTracking = true; - personalizedAdsMigrated = false; - }; - }; - dock = { - autohide = true; - orientation = "bottom"; - tilesize = 48; - }; - finder = { - AppleShowAllExtensions = true; - ShowPathbar = true; - FXEnableExtensionChangeWarning = false; - NewWindowTarget = "Home"; - FXPreferredViewStyle = "Nlsv"; - }; - loginwindow = { - DisableConsoleAccess = true; - GuestEnabled = false; - }; - LaunchServices.LSQuarantine = false; - }; - - system.activationScripts.postActivation.text = mkAfter '' - echo "unhiding ${config.users.users.${config.system.primaryUser}.home}/Library..." - /usr/bin/chflags nohidden ${config.users.users.${config.system.primaryUser}.home}/Library - ''; - }; -} diff --git a/darwin/common-user.ulu.nix b/darwin/common-user.ulu.nix deleted file mode 100644 index 19aba8b..0000000 --- a/darwin/common-user.ulu.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ ... }: -{ - flake.darwinModules.common-user = - { pkgs, ... }: - { - system.primaryUser = "sohryu"; - users.users.sohryu = { - name = "sohryu"; - home = "/Users/sohryu"; - shell = pkgs.zsh; - }; - - programs.zsh.enable = true; - environment.systemPackages = [ pkgs.nh ]; - environment.variables.NH_FLAKE = "/Users/sohryu/copland"; - }; -} diff --git a/hosts/sohryu-darwin.ulu.nix b/hosts/sohryu-darwin.ulu.nix deleted file mode 100644 index 1acb2c3..0000000 --- a/hosts/sohryu-darwin.ulu.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ config, inputs, ... }: -let - system = "x86_64-darwin"; -in -{ - flake.darwinConfigurations.sohryu-darwin = inputs.nix-darwin.lib.darwinSystem { - specialArgs = { - inherit inputs system; - }; - - modules = [ - { nixpkgs.hostPlatform = system; } - - inputs.home-manager.darwinModules.home-manager - - { - nixpkgs.config.allowUnfree = true; - nixpkgs.config.allowDeprecatedx86_64Darwin = true; - - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - extraSpecialArgs = { - inherit inputs system; - }; - users.sohryu = { - imports = [ - config.flake.homeModules.home-base - config.flake.homeModules.home-ghostty - config.flake.homeModules.home-nushell - config.flake.homeModules.home-nushell-bash-compat - config.flake.homeModules.home-nushell-completions - config.flake.homeModules.home-nushell-prompt - config.flake.homeModules.home-nushell-commandline-copy - config.flake.homeModules.home-nushell-last - config.flake.homeModules.home-theme - config.flake.homeModules.home-theme-kemuri - config.flake.homeModules.home-theme-ghostty - config.flake.homeModules.home-theme-nushell - config.flake.homeModules.home-direnv - config.flake.homeModules.home-jujutsu - config.flake.homeModules.home-jujutsu-difftastic - config.flake.homeModules.home-jujutsu-mergiraf - config.flake.homeModules.home-jujutsu-watchman - config.flake.homeModules.home-gh - config.flake.homeModules.home-radicle - ]; - home.username = "sohryu"; - home.homeDirectory = "/Users/sohryu"; - home.stateVersion = "25.05"; - }; - }; - } - - config.flake.darwinModules.hostname-assert - { elars.expectedHostName = "sohryu-darwin"; } - # pool - config.flake.darwinModules.common-git - config.flake.darwinModules.common-homebrew - config.flake.darwinModules.common-system - config.flake.darwinModules.common-user - config.flake.darwinModules.common-packages - - # import - - { - networking.hostName = "sohryu-darwin"; - networking.computerName = "sohryu-darwin"; - system.stateVersion = 5; - } - ]; - }; -}