From b6c3978d49c2b6d66aad538447d74897fec5882a Mon Sep 17 00:00:00 2001 From: Patryk Niedźwiedziński Date: Sat, 26 Dec 2020 22:44:34 +0100 Subject: Drop darwin setup bye apple --- home.nix | 13 ++----------- platforms/darwin/aliases.nix | 3 --- platforms/darwin/configuration.nix | 39 -------------------------------------- platforms/darwin/default.nix | 34 --------------------------------- 4 files changed, 2 insertions(+), 87 deletions(-) delete mode 100644 platforms/darwin/aliases.nix delete mode 100644 platforms/darwin/configuration.nix delete mode 100644 platforms/darwin/default.nix diff --git a/home.nix b/home.nix index 08bf15d..8eafac1 100644 --- a/home.nix +++ b/home.nix @@ -12,20 +12,12 @@ let # }; common_packages = import ./platforms/common-packages.nix pkgs; - isDarwin = builtins.currentSystem == "x86_64-darwin"; - platformSetup = - if isDarwin then [ - ./platforms/darwin - ] else [ + platformSetup = [ # ./platforms/linux # ./programs/rclone.nix ]; in { - # Errors on linux - manual.manpages.enable = if isDarwin then true else false; - dconf.enable = if isDarwin then true else false; - programs.obs-studio = { enable = true; plugins = with pkgs; [ obs-wlrobs obs-v4l2sink ]; @@ -34,8 +26,7 @@ in # Home Manager needs a bit of information about you and the # paths it should manage. home.username = "pn"; - home.homeDirectory = - if isDarwin then "/Users/pn" else "/home/pn"; + home.homeDirectory = "/home/pn"; imports = [ # Platform specific config diff --git a/platforms/darwin/aliases.nix b/platforms/darwin/aliases.nix deleted file mode 100644 index f7ef00a..0000000 --- a/platforms/darwin/aliases.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - darwin-rebuild = "darwin-rebuild -I darwin-config=$HOME/.config/nixpkgs/platforms/darwin/configuration.nix"; -} diff --git a/platforms/darwin/configuration.nix b/platforms/darwin/configuration.nix deleted file mode 100644 index e168782..0000000 --- a/platforms/darwin/configuration.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ config, pkgs, ... }: - -let - common_packages = import ../common-packages.nix pkgs; -in -{ - # List packages installed in system profile. To search by name, run: - # $ nix-env -qaP | grep wget - environment.systemPackages = with pkgs; [ - # Packages - hello - ] - ++ common_packages; - - system.defaults.dock = { - orientation = "left"; - autohide = true; - autohide-time-modifier = "1.0"; - mineffect = "scale"; - minimize-to-application = true; - static-only = true; - }; - - # Use a custom configuration.nix location. - # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix - environment.darwinConfig = "$HOME/.config/nixpkgs/platforms/darwin/configuration.nix"; - - # Auto upgrade nix package and the daemon service. - # services.nix-daemon.enable = true; - # nix.package = pkgs.nix; - - # Create /etc/bashrc that loads the nix-darwin environment. - programs.zsh.enable = true; # default shell on catalina - # programs.fish.enable = true; - - # Used for backwards compatibility, please read the changelog before changing. - # $ darwin-rebuild changelog - system.stateVersion = 4; -} diff --git a/platforms/darwin/default.nix b/platforms/darwin/default.nix deleted file mode 100644 index 5b41a4e..0000000 --- a/platforms/darwin/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ config, ... }: -let - spotifyUsername = "pboss.n@gmail.com"; - passwdCmd = "pass show spotify.com | head -n 1"; -in -{ - xdg.configFile."spotifyd/spotifyd.conf".text = '' - [global] - # Fill this in with your Spotify login. - username = ${spotifyUsername} - password_cmd = "${passwdCmd}" - - - # How this machine shows up in Spotify Connect. - device_name = spotifyd - device_type = computer - - # This is the default location of Spotify's cache, so just replace LOGIN_NAME - # with your macOS login name (type `whoami` at a Terminal window). - cache_path = ${config.home.homeDirectory}/Library/Application Support/Spotify/PersistentCache/Storage - no_audio_cache = false - - # Various playback options. Tweak these if Spotify is too quiet. - bitrate = 320 - volume_normalisation = true - normalisation_pregain = -10 - - # These need to be set, but don't need to be changed. - backend = rodio - mixer = PCM - volume_controller = softvol - zeroconf_port = 1234 - ''; -} -- cgit 1.4.1