macos patch

9 files changed, 94 insertions, 155 deletions

diff --git a/profiles/core/configuration.nix b/profiles/core/configuration.nix
index be03f3c..87403eb 100644
--- a/profiles/core/configuration.nix
+++ b/profiles/core/configuration.nix
@@ -6,35 +6,18 @@
 }: with lib; {
   imports = [ (mkAliasOptionModule [ "ivi" ] [ "users" "users" ivi.username ]) ];
 
-  services.resolved.fallbackDns = [
-      "1.1.1.1#one.one.one.one"
-      "1.0.0.1#one.one.one.one"
-      "2606:4700:4700::1111#one.one.one.one"
-      "2606:4700:4700::1001#one.one.one.one"
-  ];
   time.timeZone = "Europe/Amsterdam";
   users.users = {
       ${ivi.username} = {
+        home = "/Users/ivi";
         uid = 1000;
-        isNormalUser = true;
         description = ivi.realName;
-        extraGroups = ["wheel" "networkmanager" "docker" "transmission"];
         openssh.authorizedKeys.keys = ivi.sshKeys;
       };
       root = {
         openssh.authorizedKeys.keys = config.ivi.openssh.authorizedKeys.keys;
       };
   };
-  security = {
-    sudo = {
-      wheelNeedsPassword = false;
-      extraConfig = ''
-        Defaults env_keep+="EDITOR"
-        Defaults env_keep+="SSH_CONNECTION SSH_CLIENT SSH_TTY"
-        Defaults env_keep+="http_proxy https_proxy"
-      '';
-    };
-  };
   environment.systemPackages = with pkgs; [
     man-pages
     man-pages-posix
@@ -53,11 +36,6 @@
     pinentry-curses
     gnused
     gnutls
-    pciutils
-    dnsutils
-    iputils
-    inetutils
-    usbutils
     zoxide
     binwalk
     unzip
diff --git a/profiles/core/hm.nix b/profiles/core/hm.nix
index 2d3d085..9e5174d 100644
--- a/profiles/core/hm.nix
+++ b/profiles/core/hm.nix
@@ -1,11 +1,9 @@
 {inputs, config, lib, ...}: with lib; {
   imports = [
-    inputs.home-manager.nixosModules.default
+    inputs.home-manager.darwinModules.default
     (mkAliasOptionModule [ "hm" ] [ "home-manager" "users" ivi.username ])
   ];
 
-  system.extraDependencies = collectFlakeInputs inputs.home-manager;
-
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
@@ -14,7 +12,7 @@
   };
 
   hm = {
-    home.stateVersion = config.system.stateVersion;
+    home.stateVersion = "24.05";
     home.enableNixpkgsReleaseCheck = false;
 
     systemd.user.startServices = "sd-switch";
diff --git a/profiles/core/home.nix b/profiles/core/home.nix
index 3e27540..5a659ae 100644
--- a/profiles/core/home.nix
+++ b/profiles/core/home.nix
@@ -4,44 +4,15 @@
   ...
 }: {
   hm = {
+    home.packages = with pkgs; [
+      github-cli
+    ];
     fonts.fontconfig.enable = true;
     # https://github.com/nix-community/home-manager/issues/4692
     # home.file.".local/bin".source = config.lib.meta.mkMutableSymlink /mut/bin;
     xdg = {
       enable = true;
-      mimeApps = {
-        enable = true;
-        defaultApplications = {
-          "text/x-shellscript"        =  ["text.desktop"];
-          "application/x-bittorrent"  =  ["torrent.desktop"];
-          "text/plain"                =  ["text.desktop"];
-          "application/postscript"    =  ["pdf.desktop"];
-          "application/pdf"           =  ["pdf.desktop"];
-          "image/png"                 =  ["img.desktop"];
-          "image/jpeg"                =  ["img.desktop"];
-          "image/gif"                 =  ["img.desktop"];
-          "application/rss+xml"       =  ["rss.desktop"];
-          "video/x-matroska"          =  ["video.desktop"];
-          "video/mp4"                 =  ["video.desktop"];
-          "x-scheme-handler/lbry"     =  ["lbry.desktop"];
-          "inode/directory"           =  ["file.desktop"];
-          "application/x-ica"         =  ["wfica.desktop"];
-          "x-scheme-handler/magnet"   =  ["torrent.desktop"];
-          "x-scheme-handler/mailto"   =  ["mail.desktop"];
-          "x-scheme-handler/msteams"  =  ["teams.desktop"];
-        };
-      };
-      mime.enable = true;
-      desktopEntries = {
-        text= { type = "Application"; name = "Text editor"; exec = "${pkgs.st}/bin/st -e kak %u"; };
-        file = { type = "Application"; name = "File Manager"; exec = "${pkgs.st}/bin/st -e lfub %u"; };
-        torrent = { type = "Application"; name = "Torrent"; exec = "${pkgs.coreutils}/bin/env transadd %U"; };
-        img = { type = "Application"; name = "Image Viewer"; exec = "${pkgs.sxiv}/bin/sxiv -a %u"; };
-        video = { type = "Application"; name = "Video Viewer"; exec = "${pkgs.mpv}/bin/mpv -quiet %f"; };
-        mail = { type = "Application"; name = "Mail"; exec = "${pkgs.st}/bin/st -e neomutt %u"; };
-        pdf = { type = "Application"; name = "PDF reader"; exec = "${pkgs.zathura}/bin/zathura %u"; };
-        rss = { type = "Application"; name = "RSS feed addition"; exec = "${pkgs.coreutils}/bin/env rssadd %u"; };
-      };
+      mime.enable = false;
     };
 
     programs.ssh = {
@@ -184,7 +155,7 @@
       };
     };
     services.gpg-agent = {
-      enable = true;
+      enable = false;
       enableSshSupport = true;
       defaultCacheTtl = 34550000;
       maxCacheTtl = 34550000;
diff --git a/profiles/station/mpv.nix b/profiles/station/mpv.nix
index b5a9fce..71b152c 100644
--- a/profiles/station/mpv.nix
+++ b/profiles/station/mpv.nix
@@ -1,13 +1,11 @@
 
 {
-  flake,
-  config,
   pkgs,
   ...
 }: {
   hm = {
     programs.mpv = {
-        enable = true;
+        enable = false;
         scripts = [
             (with pkgs; stdenv.mkDerivation rec {
                pname = "mpv-sockets";
diff --git a/profiles/station/music.nix b/profiles/station/music.nix
index b26a2ee..9ab9327 100644
--- a/profiles/station/music.nix
+++ b/profiles/station/music.nix
@@ -1,21 +1,21 @@
 { config, pkgs, lib, ... }: {
-    secrets.mopidy.owner = lib.ivi.username;
-    hm.home.packages = [pkgs.mpc-cli];
-    hm.services.mopidy = {
-        enable = true;
-        extensionPackages = with pkgs; [mopidy-spotify mopidy-mpd];
-        settings = {
-          mpd = {
-        enabled = true;
-        hostname = "127.0.0.1";
-        port = 6600;
-        max_connections = 20;
-        connection_timeout = 60;
-        };};
-        extraConfigFiles = [
-          config.secrets.mopidy.path
-        ];
-    };
+    # secrets.mopidy.owner = lib.ivi.username;
+    # hm.home.packages = [pkgs.mpc-cli];
+    # hm.services.mopidy = {
+    #     enable = true;
+    #     extensionPackages = with pkgs; [mopidy-spotify mopidy-mpd];
+    #     settings = {
+    #       mpd = {
+    #     enabled = true;
+    #     hostname = "127.0.0.1";
+    #     port = 6600;
+    #     max_connections = 20;
+    #     connection_timeout = 60;
+    #     };};
+    #     extraConfigFiles = [
+    #       config.secrets.mopidy.path
+    #     ];
+    # };
     hm.programs.ncmpcpp = {
         enable = true;
         bindings = [
diff --git a/profiles/station/nonfree.nix b/profiles/station/nonfree.nix
index cd6f5fc..8bee42a 100644
--- a/profiles/station/nonfree.nix
+++ b/profiles/station/nonfree.nix
@@ -1,16 +1,13 @@
-{config, pkgs, lib, ...}: {
+{pkgs, lib, ...}: {
     hm.home.packages = with pkgs; [
-        (discord.override {
-          withVencord = true;
-        })
+        teams
+        discord
         slack
-        discord-ptb
-        discord-canary
-        citrix_workspace
     ];
     nixpkgs.config.allowUnfreePredicate = pkg:
         builtins.elem (lib.getName pkg) [
           # Add additional package names here
+          "teams-1.6.00.4464"
           "discord"
           "discord-ptb"
           "discord-canary"
@@ -21,10 +18,10 @@
           "steam-run"
         ];
 
-    programs.steam = {
-        enable = true;
-        remotePlay.openFirewall = true;
-        dedicatedServer.openFirewall = true;
-    };
-    hardware.opengl.driSupport32Bit = true;
+    # programs.steam = {
+    #     enable = true;
+    #     remotePlay.openFirewall = true;
+    #     dedicatedServer.openFirewall = true;
+    # };
+    # hardware.opengl.driSupport32Bit = true;
 }
diff --git a/profiles/station/packages.nix b/profiles/station/packages.nix
index 7f5b5ef..c9d1af8 100644
--- a/profiles/station/packages.nix
+++ b/profiles/station/packages.nix
@@ -1,53 +1,50 @@
 {
-  flake,
-  config,
   pkgs,
   ...
 }: {
   hm = {
     home.packages = with pkgs; [
-      krew
-      dasel
-      initool
-      python311Packages.editorconfig
-      gcc
-      pkgsi686Linux.glibc
-      gnumake
-      raylib
-      gdb
-      maim
-      calcurse
-      profanity
-      file
-      ueberzug
-      mypaint
-      lynx
-      pstree
-      pywal
-      bashInteractive
       k9s
-      powershell
-      azure-cli
-      inotify-tools
-      alejandra
-      statix
-      github-cli
-      lazygit
-      argocd
-      bc
-      sxiv
-      nushell
-      sent
-      (nerdfonts.override {fonts = ["FiraCode"];})
-      noto-fonts
-      noto-fonts-emoji
-      docker
-      k9s
-      dmenu
-      librewolf
-      firefox-wayland
-      xclip
-      libreoffice
+      # krew
+      # dasel
+      # # initool
+      # python311Packages.editorconfig
+      # gcc
+      # # pkgsi686Linux.glibc
+      # gnumake
+      # raylib
+      # # gdb
+      # maim
+      # calcurse
+      # profanity
+      # file
+      # ueberzug
+      # mypaint
+      # lynx
+      # pstree
+      # pywal
+      # bashInteractive
+      # k9s
+      # powershell
+      # azure-cli
+      # inotify-tools
+      # alejandra
+      # statix
+      # github-cli
+      # lazygit
+      # argocd
+      # bc
+      # # sxiv
+      # nushell
+      # # sent
+      # (nerdfonts.override {fonts = ["FiraCode"];})
+      # noto-fonts
+      # noto-fonts-emoji
+      # # dmenu
+      # # librewolf
+      # # firefox-wayland
+      # # libreoffice
+      # # xclip
     ];
   };
 }
diff --git a/profiles/station/suckless.nix b/profiles/station/suckless.nix
index 8986e6d..f0742c4 100644
--- a/profiles/station/suckless.nix
+++ b/profiles/station/suckless.nix
@@ -8,7 +8,7 @@
   nixpkgs.overlays = [(import (self + "/overlays/suckless.nix") {inherit pkgs; home = config.ivi.home;})];
   hm = {
     xsession = {
-      enable = true;
+      enable = false;
       initExtra = ''
       ${pkgs.xorg.xmodmap}/bin/xmodmap -e "remove mod1 = Alt_R"
       ${pkgs.xorg.xmodmap}/bin/xmodmap -e "add mod3 = Alt_R"
@@ -18,7 +18,7 @@
     '';
     };
     services.picom = {
-      enable = true;
+      enable = false;
       activeOpacity = 0.99;
       inactiveOpacity = 0.7;
       opacityRules = [
@@ -37,7 +37,7 @@
       };
     };
     services.dunst = {
-      enable = true;
+      enable = false;
       settings = {
         global = {
           monitor = 0;
@@ -70,9 +70,9 @@
       };
     };
     home.packages = with pkgs; [
-      st
-      dwm
-      dwmblocks
+      # st
+      # dwm
+      # dwmblocks
       libnotify
     ];
   };
diff --git a/profiles/station/virtualisation.nix b/profiles/station/virtualisation.nix
index 63dd746..4e9425e 100644
--- a/profiles/station/virtualisation.nix
+++ b/profiles/station/virtualisation.nix
@@ -1,14 +1,14 @@
 { pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
-    virt-viewer
-  ];
-  virtualisation.libvirtd.enable = true;
-  programs.virt-manager.enable = true;
-  hm.dconf.settings = {
-    "org/virt-manager/virt-manager/connections" = {
-      autoconnect = ["qemu:///system"];
-      uris = ["qemu:///system"];
-    };
-  };
-  ivi.extraGroups = [ "libvirtd" ];
+  # environment.systemPackages = with pkgs; [
+  #   virt-viewer
+  # ];
+  # virtualisation.libvirtd.enable = true;
+  # programs.virt-manager.enable = true;
+  # hm.dconf.settings = {
+  #   "org/virt-manager/virt-manager/connections" = {
+  #     autoconnect = ["qemu:///system"];
+  #     uris = ["qemu:///system"];
+  #   };
+  # };
+  # ivi.extraGroups = [ "libvirtd" ];
 }