diff options
author | Franck Cuny <franck@fcuny.net> | 2024-12-08 14:59:03 -0800 |
---|---|---|
committer | Franck Cuny <franck@fcuny.net> | 2024-12-08 15:36:32 -0800 |
commit | 48ea2837adff1483d6d5e8dd6f65611914ddda88 (patch) | |
tree | 8adb236371b1b3db63d450bb98b583b5d0f67cc6 /nix/hosts | |
parent | refactor overall configuration (diff) | |
download | world-48ea2837adff1483d6d5e8dd6f65611914ddda88.tar.gz |
more refactoring
Diffstat (limited to '')
-rw-r--r-- | nix/hosts/common/nix.nix | 28 | ||||
-rw-r--r-- | nix/hosts/darwin/default.nix | 1 | ||||
-rw-r--r-- | nix/hosts/darwin/homebrew.nix | 21 | ||||
-rw-r--r-- | nix/hosts/darwin/macos.nix | 39 | ||||
-rw-r--r-- | nix/hosts/darwin/mba/default.nix | 16 | ||||
-rw-r--r-- | nix/hosts/darwin/work/default.nix | 11 |
6 files changed, 0 insertions, 116 deletions
diff --git a/nix/hosts/common/nix.nix b/nix/hosts/common/nix.nix deleted file mode 100644 index 2ef6b48..0000000 --- a/nix/hosts/common/nix.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ pkgs, ... }: { - nix = { - package = pkgs.nixVersions.stable; - - gc = { - user = "root"; - automatic = true; - interval = [{ - Hour = 7; - Minute = 0; - Weekday = 0; - }]; - options = "--delete-older-than 7d"; - }; - - settings = { - trusted-users = [ "@admin" "fcuny" ]; - experimental-features = [ "nix-command" "flakes" ]; - }; - }; - - nixpkgs.config = { - allowUnfree = true; - permittedInsecurePackages = [ - "nix-2.16.2" # FIXME https://github.com/nix-community/nixd/issues/357 - ]; - }; -} diff --git a/nix/hosts/darwin/default.nix b/nix/hosts/darwin/default.nix deleted file mode 100644 index 2da9dbc..0000000 --- a/nix/hosts/darwin/default.nix +++ /dev/null @@ -1 +0,0 @@ -{ ... }: { imports = [ ./homebrew.nix ./macos.nix ]; } diff --git a/nix/hosts/darwin/homebrew.nix b/nix/hosts/darwin/homebrew.nix deleted file mode 100644 index 52543da..0000000 --- a/nix/hosts/darwin/homebrew.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ ... }: { - # Required for homebrew on aarch64 - environment.systemPath = [ "/opt/homebrew/bin" "/opt/homebrew/sbin" ]; - - homebrew = { - enable = true; - onActivation.autoUpdate = true; - onActivation.upgrade = true; - - casks = [ - "1password-cli" - "docker" - "element" - "emacs" - "iterm2" - "transmission" - "vlc" - "wireshark" - ]; - }; -} diff --git a/nix/hosts/darwin/macos.nix b/nix/hosts/darwin/macos.nix deleted file mode 100644 index 36f680a..0000000 --- a/nix/hosts/darwin/macos.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ pkgs, ... }: { - system.defaults.dock.autohide = true; - system.defaults.dock.orientation = "left"; - system.defaults.dock.showhidden = false; - system.defaults.dock.show-recents = false; - # don’t rearrange spaces based on the most recent use - system.defaults.dock.mru-spaces = false; - system.defaults.finder.AppleShowAllExtensions = true; - system.defaults.screencapture.location = "~/Documents/screenshots"; - system.defaults.SoftwareUpdate.AutomaticallyInstallMacOSUpdates = true; - - fonts.packages = with pkgs; [ - emacs-all-the-icons-fonts - google-fonts - roboto - source-code-pro - source-serif-pro - source-sans-pro - go-font - ]; - - system.keyboard = { - enableKeyMapping = true; - remapCapsLockToControl = true; - }; - - # Touch ID for sudo auth - security.pam.enableSudoTouchIdAuth = true; - - services.nix-daemon.enable = true; - - system.defaults.CustomUserPreferences = { - "com.apple.desktopservices" = { - # Avoid creating .DS_Store files on network or USB volumes - DSDontWriteNetworkStores = true; - DSDontWriteUSBStores = true; - }; - }; -} diff --git a/nix/hosts/darwin/mba/default.nix b/nix/hosts/darwin/mba/default.nix deleted file mode 100644 index 21189a8..0000000 --- a/nix/hosts/darwin/mba/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs, self, ... }: { - networking.hostName = "mba-fcuny"; - - users.users.fcuny.home = "/Users/fcuny"; - users.users.fcuny.shell = pkgs.fish; - programs.fish.enable = true; - environment.shells = [ pkgs.fish ]; - - system.stateVersion = 5; - - home-manager.users.fcuny = - import "${self}/nix/profiles/home-manager/personal.nix"; - - # brew packages I only want to get installed on this machine - homebrew.casks = [ "zoom" ]; -} diff --git a/nix/hosts/darwin/work/default.nix b/nix/hosts/darwin/work/default.nix deleted file mode 100644 index 9d5f2c0..0000000 --- a/nix/hosts/darwin/work/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, self, ... }: { - users.users.fcuny.home = "/Users/fcuny"; - users.users.fcuny.shell = pkgs.fish; - programs.fish.enable = true; - environment.shells = [ pkgs.fish ]; - - system.stateVersion = 5; - - home-manager.users.fcuny = - import "${self}/nix/profiles/home-manager/work.nix"; -} |