base/gui-programs.nix

@@ -52,6 +52,7 @@ in {
       inherit
         (pkgs)
         chrysalis
+        element-desktop
         evince
         feh
         firefox
@@ -61,6 +62,8 @@ in {
         mpv
         obs-studio
         pavucontrol
+        signal-desktop
+        slack
         spotify
         tdesktop
         teams

flake.lock

@@ -64,11 +64,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1695108154,
+        "lastModified": 1693208669,
-        "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
+        "narHash": "sha256-hHFaaUsZ860wvppPeiu7nJn/nXZjJfnqAQEu9SPFE9I=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "07682fff75d41f18327a871088d20af2710d4744",
+        "rev": "5bac4a1c06cd77cf8fc35a658ccb035a6c50cd2c",
         "type": "github"
       },
       "original": {
@@ -128,11 +128,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1695272228,
+        "lastModified": 1693183237,
-        "narHash": "sha256-4uw2OdJPVyjdB+xcDst9SecrNIpxKXJ2usN3M5HVa7o=",
+        "narHash": "sha256-c7OtyBkZ/vZE/WosBpRGRtkbWZjDHGJP7fg1FyB9Dsc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "55ac2a9d2024f15c56adf20da505b29659911da8",
+        "rev": "ea5234e7073d5f44728c499192544a84244bf35a",
         "type": "github"
       },
       "original": {

flake.nix

@@ -143,20 +143,6 @@
             ]
             ++ sharedModules;
         };
-
-        hephaestus = nixpkgs.lib.nixosSystem rec {
-          inherit system;
-          modules =
-            [
-              ./hephaestus.nix
-
-              inputs.nixos-hardware.nixosModules.common-cpu-amd
-              inputs.nixos-hardware.nixosModules.common-gpu-amd
-              inputs.nixos-hardware.nixosModules.common-pc-laptop
-              inputs.nixos-hardware.nixosModules.common-pc-ssd
-            ]
-            ++ sharedModules;
-        };
       };
     }
     // inputs.flake-utils.lib.eachDefaultSystem (system: {

hephaestus.nix

@@ -1,23 +0,0 @@
-{...}: {
-  imports = [
-    # Default configuration
-    ./base
-
-    # Module definitions
-    ./modules
-
-    # Service definitions
-    ./services
-
-    # Host-specific config
-    ./hosts/hephaestus
-  ];
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.05"; # Did you read the comment?
-}

hosts/hephaestus/default.nix

@@ -1,98 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
-  imports = [
-    # Include the results of the hardware scan.
-    ./hardware-configuration.nix
-    ./home.nix
-    ./secrets.nix
-  ];
-
-  boot.kernelPackages = pkgs.linuxPackages;
-
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  boot.initrd.secrets = {
-    "/crypto_keyfile.bin" = null;
-  };
-
-  boot.tmp.useTmpfs = true;
-
-  services.btrfs = {
-    autoScrub = {
-      enable = true;
-      fileSystems = ["/"];
-    };
-  };
-
-  networking.hostName = "hephaestus"; # Define your hostname.
-  networking.domain = "alarsyo.net";
-
-  networking.networkmanager.enable = true;
-
-  # Set your time zone.
-  time.timeZone = "Europe/Paris";
-
-  # List services that you want to enable:
-  my.services = {
-    tailscale.enable = true;
-    pipewire.enable = true;
-  };
-
-  virtualisation.docker.enable = true;
-  virtualisation.libvirtd.enable = true;
-  programs.dconf.enable = true;
-
-  services = {
-    tlp = {
-      settings = {
-        START_CHARGE_THRESH_BAT0 = 70;
-        STOP_CHARGE_THRESH_BAT0 = 80;
-      };
-    };
-    fwupd.enable = true;
-    openssh.enable = true;
-  };
-
-  my.gui.enable = true;
-  my.displayManager.sddm.enable = lib.mkForce false;
-
-  hardware.bluetooth = {
-    enable = true;
-    powerOnBoot = false;
-    settings.General.Experimental = true;
-  };
-
-    # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "fr_FR.UTF-8";
-    LC_IDENTIFICATION = "fr_FR.UTF-8";
-    LC_MEASUREMENT = "fr_FR.UTF-8";
-    LC_MONETARY = "fr_FR.UTF-8";
-    LC_NAME = "fr_FR.UTF-8";
-    LC_NUMERIC = "fr_FR.UTF-8";
-    LC_PAPER = "fr_FR.UTF-8";
-    LC_TELEPHONE = "fr_FR.UTF-8";
-    LC_TIME = "fr_FR.UTF-8";
-  };
-
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
-  # Enable the KDE Plasma Desktop Environment.
-  services.xserver.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
-
-  # Configure console keymap
-  console.keyMap = "us";
-}

hosts/hephaestus/hardware-configuration.nix

@@ -1,41 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "usb_storage" "sd_mod" "sdhci_pci" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/54ded736-367c-4081-9978-9e2d8f61cb1b";
-      fsType = "btrfs";
-      options = [ "subvol=@" ];
-    };
-
-  boot.initrd.luks.devices."luks-df96458d-45a1-4a30-8633-58feeff603f8".device = "/dev/disk/by-uuid/df96458d-45a1-4a30-8633-58feeff603f8";
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/826A-23F7";
-      fsType = "vfat";
-    };
-
-  swapDevices = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp2s0f0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

hosts/hephaestus/home.nix

@@ -1,39 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
-  home-manager.users.alarsyo = {
-    my.home.laptop.enable = true;
-
-    # Keyboard settings & i3 settings
-    my.home.x.enable = true;
-    my.home.x.i3bar.temperature.chip = "k10temp-pci-*";
-    my.home.x.i3bar.temperature.inputs = ["Tccd1"];
-    my.home.x.i3bar.networking.throughput_interfaces = ["wlp3s0"];
-    my.home.emacs.enable = true;
-
-    my.theme = config.home-manager.users.alarsyo.my.themes.solarizedLight;
-
-    home.packages = builtins.attrValues {
-      inherit
-        (pkgs)
-        # some websites only work there :(
-        
-        chromium
-        darktable
-        # dev
-        
-        rustup
-        gdb
-        valgrind
-        arandr
-        zotero
-        ;
-
-      inherit (pkgs.packages) spot;
-
-      inherit (pkgs.wineWowPackages) stable;
-    };
-  };
-}

hosts/hephaestus/secrets.nix

@@ -1,20 +0,0 @@
-{
-  config,
-  lib,
-  options,
-  ...
-}: {
-  config.age = {
-    secrets = let
-      toSecret = name: {...} @ attrs:
-        {
-          file = ./../../modules/secrets + "/${name}.age";
-        }
-        // attrs;
-    in
-      lib.mapAttrs toSecret {
-        "users/alarsyo-hashed-password" = {};
-        "users/root-hashed-password" = {};
-      };
-  };
-}

modules/secrets/secrets.nix

@@ -4,11 +4,10 @@ let
 
   boreal = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAagal1aqZh52wEmgsw7fkCzO41o4Cx+nV4wJGZuX1RP root@boreal";
   hades = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMxw8CtKUPAiPdKDEnuS7UyRrZN5BkUwsy5UPVF8V+lt root@hades";
-  hephaestus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA7Cp+n5+huof68QlAoJV8bVf5h5p9kEZFAVpltWopdL root@hephaestus";
   poseidon = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKYhZYMbWQG9TSQ2qze8GgFo2XrZzgu/GuSOGwenByJo root@poseidon";
   zephyrus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILU4JfIADH9MXUnVe+3ezYK9WXsqy/jJcm1zFkmL4aSU root@zephyrus";
 
-  machines = [boreal hades hephaestus poseidon zephyrus];
+  machines = [boreal hades poseidon zephyrus];
 
   all = users ++ machines;
 in {