diff --git a/common/linux.nix b/common/linux.nix index cfc63d0..bf5102c 100644 --- a/common/linux.nix +++ b/common/linux.nix @@ -13,7 +13,7 @@ nixpkgs.config = { allowUnfree = true; permittedInsecurePackages = [ - "electron-9.4.4" + /* "electron-9.4.4" */ # authy is currently stuck on electron_9 ]; }; diff --git a/common/packages.nix b/common/packages.nix index fb16e96..7491d5c 100644 --- a/common/packages.nix +++ b/common/packages.nix @@ -9,19 +9,13 @@ in common = [ # utils curl - du-dust - duf gnupg imagemagick - pfetch unzip xdg_utils zip # dev tools - act - asciinema - dive gcc git git-crypt @@ -33,8 +27,6 @@ in shellcheck shfmt starship - tokei - yq-go # automation ansible @@ -76,7 +68,6 @@ in # data tools dbeaver - postgresql # password managers _1password @@ -97,24 +88,18 @@ in nodePackages.prettier nodePackages.yarn - # imaging - gifsicle - # video youtube-dl # networking arp-scan - bandwhich dnsutils - gping iperf networkmanager-openvpn nmap openssl openvpn sshfs # mac requires https://osxfuse.github.io/ - tcpdump vpngate whois @@ -130,9 +115,6 @@ in tfswitch infracost - # gcp - google-cloud-sdk - # nix cachix nix-diff @@ -141,9 +123,6 @@ in nixpkgs-review rnix-lsp - # communication - element-desktop - ## aws aws-connect aws-role-play @@ -172,25 +151,18 @@ in # news srv - # security - sops - yubikey-manager - ] ++ lib.optionals stdenv.isLinux ([ _1password-gui albert - audio-recorder - authy + /* authy */ calibre cryptsetup - firejail glibcLocales gnome3.gnome-tweaks gnomeExtensions.appindicator gptfdisk guake kazam - libreoffice linuxPackages.perf pavucontrol pinentry-curses @@ -201,29 +173,26 @@ in spotify strace usbutils - /* virtmanager */ + virtmanager vlc # Unsupported / broken on darwin: aws-sam-cli bitwarden brave - datasette deluge discord firefox gimp google-chrome minecraft + netdata postman rfd signal-desktop slack steam tailscale - traceroute - wireshark-qt zoom-us - netdata ]); in common; diff --git a/flake.lock b/flake.lock index 1abbff2..d44d0dc 100644 --- a/flake.lock +++ b/flake.lock @@ -81,11 +81,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1647310800, - "narHash": "sha256-DvKvdwXp1K8dtxk+IIGK/HxurmMRhkuTdfj44rDRsdw=", + "lastModified": 1647380792, + "narHash": "sha256-3DQs22URhSNPUCM7DCdbbt+3ZlMTKYhK9qUkfccyBR0=", "owner": "neovim", "repo": "neovim", - "rev": "bef7552f7088ff411bd68fc236cfd7b269ad157e", + "rev": "5a8bf31d328ecdb79453bf1eb22ff10aabbe0422", "type": "github" }, "original": { @@ -102,11 +102,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1647332154, - "narHash": "sha256-fCZWPR53MfOHhVC4VEjYeIWPzJbCo/lLOubNoswfTS0=", + "lastModified": 1647418490, + "narHash": "sha256-zNqjRX50VyspGeZGZoAixIN28h77FkRDZwps+CQJduQ=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "0817ca26e18dbf5eb8dc61a7e68f9d7f6b3fbe68", + "rev": "c84beaf2aa422964d2ef577aedfc6fe1be935730", "type": "github" }, "original": { @@ -133,11 +133,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1647125019, - "narHash": "sha256-PXA76/iIqtbrA0ydCyc7Wpdw7TQTnfEowM87YtTXfB4=", + "lastModified": 1647297614, + "narHash": "sha256-ulGq3W5XsrBMU/u5k9d4oPy65pQTkunR4HKKtTq0RwY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b0e141e3fe13ec21f50429773d2e3890e02a80da", + "rev": "73ad5f9e147c0d2a2061f1d4bd91e05078dc0b58", "type": "github" }, "original": { diff --git a/machines/hephaestus/configuration.nix b/machines/hephaestus/configuration.nix index 8d3ea51..f7afc99 100644 --- a/machines/hephaestus/configuration.nix +++ b/machines/hephaestus/configuration.nix @@ -10,8 +10,6 @@ hardware.nvidia.modesetting.enable = true; hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_470; - security.pam.u2f.enable = true; - networking.hostName = "hephaestus"; networking = {