From db961848a37ded802b5626ce52f194dfb0edc5a1 Mon Sep 17 00:00:00 2001 From: Madeleine Date: Sat, 23 Dec 2023 18:58:23 +0000 Subject: [PATCH] Renaming, update, switch to Element on NixOS --- flake.lock | 12 ++++++------ flake.nix | 7 ++++--- maddie/common/{smart-home.nix => home-assistant.nix} | 0 maddie/nixos/messaging.nix | 3 +-- systems/{mmacbookpro => macos}/apps.nix | 0 systems/{mmacbookpro => macos}/dock.nix | 0 systems/{mmacbookpro => macos}/finder.nix | 0 systems/{mmacbookpro => macos}/fonts.nix | 0 systems/{mmacbookpro => macos}/gpg.nix | 0 systems/{mmacbookpro => macos}/keyboard.nix | 0 systems/{mmacbookpro => macos}/networking.nix | 0 systems/{mmacbookpro => macos}/nix.nix | 0 systems/{mmacbookpro => macos}/packages.nix | 0 systems/{mmacbookpro => macos}/setDock.nix | 0 systems/{mmacbookpro => macos}/settings.nix | 0 systems/{mmacbookpro => macos}/ssh.nix | 0 systems/{mmacbookpro => macos}/sudo.nix | 0 systems/{mmacbookpro => macos}/zsh.nix | 0 systems/{mdesktop => nixos}/android.nix | 0 systems/{mdesktop => nixos}/audio.nix | 0 systems/{mdesktop => nixos}/avahi.nix | 2 +- systems/{mdesktop => nixos}/bluetooth.nix | 0 systems/{mdesktop => nixos}/boot.nix | 0 systems/{mdesktop => nixos}/cpu.nix | 0 systems/{mdesktop => nixos}/disks.nix | 0 systems/{mdesktop => nixos}/doas.nix | 0 systems/{mdesktop => nixos}/firewall.nix | 0 systems/{mdesktop => nixos}/fonts.nix | 0 systems/{mdesktop => nixos}/gpg.nix | 2 +- systems/{mdesktop => nixos}/locale.nix | 0 systems/{mdesktop => nixos}/man.nix | 0 systems/{mdesktop => nixos}/networking.nix | 0 systems/{mdesktop => nixos}/nix-ld.nix | 0 systems/{mdesktop => nixos}/nix.nix | 0 systems/{mdesktop => nixos}/nixos.nix | 0 systems/{mdesktop => nixos}/noise-supression.nix | 0 systems/{mdesktop => nixos}/nvidia.nix | 0 systems/{mdesktop => nixos}/openrazer.nix | 0 systems/{mdesktop => nixos}/openrgb.nix | 0 systems/{mdesktop => nixos}/packages.nix | 0 systems/{mdesktop => nixos}/security.nix | 0 systems/{mdesktop => nixos}/services.nix | 0 systems/{mdesktop => nixos}/ssh.nix | 0 systems/{mdesktop => nixos}/syncthing.nix | 0 systems/{mdesktop => nixos}/systemd.nix | 0 systems/{mdesktop => nixos}/users.nix | 0 systems/{mdesktop => nixos}/virtualisation.nix | 0 systems/{mdesktop => nixos}/xorg.nix | 0 systems/{mdesktop => nixos}/yubikey.nix | 0 systems/{mdesktop => nixos}/zsh.nix | 0 50 files changed, 13 insertions(+), 13 deletions(-) rename maddie/common/{smart-home.nix => home-assistant.nix} (100%) rename systems/{mmacbookpro => macos}/apps.nix (100%) rename systems/{mmacbookpro => macos}/dock.nix (100%) rename systems/{mmacbookpro => macos}/finder.nix (100%) rename systems/{mmacbookpro => macos}/fonts.nix (100%) rename systems/{mmacbookpro => macos}/gpg.nix (100%) rename systems/{mmacbookpro => macos}/keyboard.nix (100%) rename systems/{mmacbookpro => macos}/networking.nix (100%) rename systems/{mmacbookpro => macos}/nix.nix (100%) rename systems/{mmacbookpro => macos}/packages.nix (100%) rename systems/{mmacbookpro => macos}/setDock.nix (100%) rename systems/{mmacbookpro => macos}/settings.nix (100%) rename systems/{mmacbookpro => macos}/ssh.nix (100%) rename systems/{mmacbookpro => macos}/sudo.nix (100%) rename systems/{mmacbookpro => macos}/zsh.nix (100%) rename systems/{mdesktop => nixos}/android.nix (100%) rename systems/{mdesktop => nixos}/audio.nix (100%) rename systems/{mdesktop => nixos}/avahi.nix (89%) rename systems/{mdesktop => nixos}/bluetooth.nix (100%) rename systems/{mdesktop => nixos}/boot.nix (100%) rename systems/{mdesktop => nixos}/cpu.nix (100%) rename systems/{mdesktop => nixos}/disks.nix (100%) rename systems/{mdesktop => nixos}/doas.nix (100%) rename systems/{mdesktop => nixos}/firewall.nix (100%) rename systems/{mdesktop => nixos}/fonts.nix (100%) rename systems/{mdesktop => nixos}/gpg.nix (83%) rename systems/{mdesktop => nixos}/locale.nix (100%) rename systems/{mdesktop => nixos}/man.nix (100%) rename systems/{mdesktop => nixos}/networking.nix (100%) rename systems/{mdesktop => nixos}/nix-ld.nix (100%) rename systems/{mdesktop => nixos}/nix.nix (100%) rename systems/{mdesktop => nixos}/nixos.nix (100%) rename systems/{mdesktop => nixos}/noise-supression.nix (100%) rename systems/{mdesktop => nixos}/nvidia.nix (100%) rename systems/{mdesktop => nixos}/openrazer.nix (100%) rename systems/{mdesktop => nixos}/openrgb.nix (100%) rename systems/{mdesktop => nixos}/packages.nix (100%) rename systems/{mdesktop => nixos}/security.nix (100%) rename systems/{mdesktop => nixos}/services.nix (100%) rename systems/{mdesktop => nixos}/ssh.nix (100%) rename systems/{mdesktop => nixos}/syncthing.nix (100%) rename systems/{mdesktop => nixos}/systemd.nix (100%) rename systems/{mdesktop => nixos}/users.nix (100%) rename systems/{mdesktop => nixos}/virtualisation.nix (100%) rename systems/{mdesktop => nixos}/xorg.nix (100%) rename systems/{mdesktop => nixos}/yubikey.nix (100%) rename systems/{mdesktop => nixos}/zsh.nix (100%) diff --git a/flake.lock b/flake.lock index e898a61..32a6169 100644 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1702110869, - "narHash": "sha256-hgbzPjIMLYJf3Ekq9qZCpDcIZn1BZmOp7d6PMkIWknU=", + "lastModified": 1703155327, + "narHash": "sha256-Q25AEghhhOp+ImNN4PsAExi7DIB1INMlBSaggGz7q4w=", "owner": "nix-community", "repo": "home-manager", - "rev": "7db6291d95693374d408f4877c265ec7481f222b", + "rev": "8b797c8eea1eba7dfb47f6964103e6e0d134255f", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1701693815, - "narHash": "sha256-7BkrXykVWfkn6+c1EhFA3ko4MLi3gVG0p9G96PNnKTM=", + "lastModified": 1703105089, + "narHash": "sha256-1F7hDLj58OQCADRtG2DRKpmJ8QVza0M0NK/kfLWLs3k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "09ec6a0881e1a36c29d67497693a67a16f4da573", + "rev": "2b9c57d33e3d5be6262e124fc66e3a8bc650b93d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d0bbf6d..cc54360 100644 --- a/flake.nix +++ b/flake.nix @@ -20,8 +20,9 @@ config.allowUnsupportedSystem = false; config.allowBroken = false; config.permittedInsecurePackages = [ - "libgcrypt-1.8.10" + #"libgcrypt-1.8.10" "libxls-1.6.2" + "electron-25.9.0" ]; overlays = import ./overlays.nix; system = "x86_64-linux"; @@ -55,7 +56,7 @@ home-manager.users.${username}.imports = utils.nixFilesIn ./maddie/common ++ utils.nixFilesIn ./maddie/nixos; home-manager.extraSpecialArgs = { inherit username; pkgs = nixpkgs_x86_64; }; } - ] ++ utils.nixFilesIn ./systems/mdesktop; + ] ++ utils.nixFilesIn ./systems/macos; }; darwinConfigurations."MMacBookPro" = darwin.lib.darwinSystem @@ -70,7 +71,7 @@ home-manager.users.${username}.imports = utils.nixFilesIn ./maddie/common ++ utils.nixFilesIn ./maddie/macos; home-manager.extraSpecialArgs = { inherit username; pkgs = nixpkgs_aarch64_darwin; }; } - ] ++ utils.nixFilesIn ./systems/mmacbookpro; + ] ++ utils.nixFilesIn ./systems/nixos; }; formatter.x86_64-linux = nixpkgs_x86_64.legacyPackages.x86_64-linux.nixpkgs-fmt; diff --git a/maddie/common/smart-home.nix b/maddie/common/home-assistant.nix similarity index 100% rename from maddie/common/smart-home.nix rename to maddie/common/home-assistant.nix diff --git a/maddie/nixos/messaging.nix b/maddie/nixos/messaging.nix index 0a97090..cc3b990 100644 --- a/maddie/nixos/messaging.nix +++ b/maddie/nixos/messaging.nix @@ -2,8 +2,7 @@ { home.packages = with pkgs; [ - schildichat-desktop # Matrix client, fork of element - signal-desktop # Signal client + element-desktop # Standard matrix client cinny-desktop # Pretty matrix client discord-canary # Discord client ripcord # Better discord client diff --git a/systems/mmacbookpro/apps.nix b/systems/macos/apps.nix similarity index 100% rename from systems/mmacbookpro/apps.nix rename to systems/macos/apps.nix diff --git a/systems/mmacbookpro/dock.nix b/systems/macos/dock.nix similarity index 100% rename from systems/mmacbookpro/dock.nix rename to systems/macos/dock.nix diff --git a/systems/mmacbookpro/finder.nix b/systems/macos/finder.nix similarity index 100% rename from systems/mmacbookpro/finder.nix rename to systems/macos/finder.nix diff --git a/systems/mmacbookpro/fonts.nix b/systems/macos/fonts.nix similarity index 100% rename from systems/mmacbookpro/fonts.nix rename to systems/macos/fonts.nix diff --git a/systems/mmacbookpro/gpg.nix b/systems/macos/gpg.nix similarity index 100% rename from systems/mmacbookpro/gpg.nix rename to systems/macos/gpg.nix diff --git a/systems/mmacbookpro/keyboard.nix b/systems/macos/keyboard.nix similarity index 100% rename from systems/mmacbookpro/keyboard.nix rename to systems/macos/keyboard.nix diff --git a/systems/mmacbookpro/networking.nix b/systems/macos/networking.nix similarity index 100% rename from systems/mmacbookpro/networking.nix rename to systems/macos/networking.nix diff --git a/systems/mmacbookpro/nix.nix b/systems/macos/nix.nix similarity index 100% rename from systems/mmacbookpro/nix.nix rename to systems/macos/nix.nix diff --git a/systems/mmacbookpro/packages.nix b/systems/macos/packages.nix similarity index 100% rename from systems/mmacbookpro/packages.nix rename to systems/macos/packages.nix diff --git a/systems/mmacbookpro/setDock.nix b/systems/macos/setDock.nix similarity index 100% rename from systems/mmacbookpro/setDock.nix rename to systems/macos/setDock.nix diff --git a/systems/mmacbookpro/settings.nix b/systems/macos/settings.nix similarity index 100% rename from systems/mmacbookpro/settings.nix rename to systems/macos/settings.nix diff --git a/systems/mmacbookpro/ssh.nix b/systems/macos/ssh.nix similarity index 100% rename from systems/mmacbookpro/ssh.nix rename to systems/macos/ssh.nix diff --git a/systems/mmacbookpro/sudo.nix b/systems/macos/sudo.nix similarity index 100% rename from systems/mmacbookpro/sudo.nix rename to systems/macos/sudo.nix diff --git a/systems/mmacbookpro/zsh.nix b/systems/macos/zsh.nix similarity index 100% rename from systems/mmacbookpro/zsh.nix rename to systems/macos/zsh.nix diff --git a/systems/mdesktop/android.nix b/systems/nixos/android.nix similarity index 100% rename from systems/mdesktop/android.nix rename to systems/nixos/android.nix diff --git a/systems/mdesktop/audio.nix b/systems/nixos/audio.nix similarity index 100% rename from systems/mdesktop/audio.nix rename to systems/nixos/audio.nix diff --git a/systems/mdesktop/avahi.nix b/systems/nixos/avahi.nix similarity index 89% rename from systems/mdesktop/avahi.nix rename to systems/nixos/avahi.nix index f28d394..e8a45fd 100644 --- a/systems/mdesktop/avahi.nix +++ b/systems/nixos/avahi.nix @@ -3,7 +3,7 @@ { services.avahi = { enable = true; - nssmdns = true; + nssmdns4 = true; publish = { enable = true; addresses = true; diff --git a/systems/mdesktop/bluetooth.nix b/systems/nixos/bluetooth.nix similarity index 100% rename from systems/mdesktop/bluetooth.nix rename to systems/nixos/bluetooth.nix diff --git a/systems/mdesktop/boot.nix b/systems/nixos/boot.nix similarity index 100% rename from systems/mdesktop/boot.nix rename to systems/nixos/boot.nix diff --git a/systems/mdesktop/cpu.nix b/systems/nixos/cpu.nix similarity index 100% rename from systems/mdesktop/cpu.nix rename to systems/nixos/cpu.nix diff --git a/systems/mdesktop/disks.nix b/systems/nixos/disks.nix similarity index 100% rename from systems/mdesktop/disks.nix rename to systems/nixos/disks.nix diff --git a/systems/mdesktop/doas.nix b/systems/nixos/doas.nix similarity index 100% rename from systems/mdesktop/doas.nix rename to systems/nixos/doas.nix diff --git a/systems/mdesktop/firewall.nix b/systems/nixos/firewall.nix similarity index 100% rename from systems/mdesktop/firewall.nix rename to systems/nixos/firewall.nix diff --git a/systems/mdesktop/fonts.nix b/systems/nixos/fonts.nix similarity index 100% rename from systems/mdesktop/fonts.nix rename to systems/nixos/fonts.nix diff --git a/systems/mdesktop/gpg.nix b/systems/nixos/gpg.nix similarity index 83% rename from systems/mdesktop/gpg.nix rename to systems/nixos/gpg.nix index dd75311..0ae30b9 100644 --- a/systems/mdesktop/gpg.nix +++ b/systems/nixos/gpg.nix @@ -5,6 +5,6 @@ programs.gnupg.agent = { enable = true; enableSSHSupport = false; - pinentryFlavor = "gtk2"; + pinentryFlavor = "gnome3"; }; } diff --git a/systems/mdesktop/locale.nix b/systems/nixos/locale.nix similarity index 100% rename from systems/mdesktop/locale.nix rename to systems/nixos/locale.nix diff --git a/systems/mdesktop/man.nix b/systems/nixos/man.nix similarity index 100% rename from systems/mdesktop/man.nix rename to systems/nixos/man.nix diff --git a/systems/mdesktop/networking.nix b/systems/nixos/networking.nix similarity index 100% rename from systems/mdesktop/networking.nix rename to systems/nixos/networking.nix diff --git a/systems/mdesktop/nix-ld.nix b/systems/nixos/nix-ld.nix similarity index 100% rename from systems/mdesktop/nix-ld.nix rename to systems/nixos/nix-ld.nix diff --git a/systems/mdesktop/nix.nix b/systems/nixos/nix.nix similarity index 100% rename from systems/mdesktop/nix.nix rename to systems/nixos/nix.nix diff --git a/systems/mdesktop/nixos.nix b/systems/nixos/nixos.nix similarity index 100% rename from systems/mdesktop/nixos.nix rename to systems/nixos/nixos.nix diff --git a/systems/mdesktop/noise-supression.nix b/systems/nixos/noise-supression.nix similarity index 100% rename from systems/mdesktop/noise-supression.nix rename to systems/nixos/noise-supression.nix diff --git a/systems/mdesktop/nvidia.nix b/systems/nixos/nvidia.nix similarity index 100% rename from systems/mdesktop/nvidia.nix rename to systems/nixos/nvidia.nix diff --git a/systems/mdesktop/openrazer.nix b/systems/nixos/openrazer.nix similarity index 100% rename from systems/mdesktop/openrazer.nix rename to systems/nixos/openrazer.nix diff --git a/systems/mdesktop/openrgb.nix b/systems/nixos/openrgb.nix similarity index 100% rename from systems/mdesktop/openrgb.nix rename to systems/nixos/openrgb.nix diff --git a/systems/mdesktop/packages.nix b/systems/nixos/packages.nix similarity index 100% rename from systems/mdesktop/packages.nix rename to systems/nixos/packages.nix diff --git a/systems/mdesktop/security.nix b/systems/nixos/security.nix similarity index 100% rename from systems/mdesktop/security.nix rename to systems/nixos/security.nix diff --git a/systems/mdesktop/services.nix b/systems/nixos/services.nix similarity index 100% rename from systems/mdesktop/services.nix rename to systems/nixos/services.nix diff --git a/systems/mdesktop/ssh.nix b/systems/nixos/ssh.nix similarity index 100% rename from systems/mdesktop/ssh.nix rename to systems/nixos/ssh.nix diff --git a/systems/mdesktop/syncthing.nix b/systems/nixos/syncthing.nix similarity index 100% rename from systems/mdesktop/syncthing.nix rename to systems/nixos/syncthing.nix diff --git a/systems/mdesktop/systemd.nix b/systems/nixos/systemd.nix similarity index 100% rename from systems/mdesktop/systemd.nix rename to systems/nixos/systemd.nix diff --git a/systems/mdesktop/users.nix b/systems/nixos/users.nix similarity index 100% rename from systems/mdesktop/users.nix rename to systems/nixos/users.nix diff --git a/systems/mdesktop/virtualisation.nix b/systems/nixos/virtualisation.nix similarity index 100% rename from systems/mdesktop/virtualisation.nix rename to systems/nixos/virtualisation.nix diff --git a/systems/mdesktop/xorg.nix b/systems/nixos/xorg.nix similarity index 100% rename from systems/mdesktop/xorg.nix rename to systems/nixos/xorg.nix diff --git a/systems/mdesktop/yubikey.nix b/systems/nixos/yubikey.nix similarity index 100% rename from systems/mdesktop/yubikey.nix rename to systems/nixos/yubikey.nix diff --git a/systems/mdesktop/zsh.nix b/systems/nixos/zsh.nix similarity index 100% rename from systems/mdesktop/zsh.nix rename to systems/nixos/zsh.nix