Unify things and rename things

6 files changed, 327 insertions, 0 deletions

diff --git a/nixos/Makefile b/nixos/Makefile
new file mode 100644
index 0000000..ba8182a
--- /dev/null
+++ b/nixos/Makefile
@@ -0,0 +1,5 @@
+all:
+	sudo nixos-rebuild switch -I nixos-config=`hostname`.nix
+
+up:
+	sudo nixos-rebuild switch --upgrade -I nixos-config=`hostname`.nix
diff --git a/nixos/common.nix b/nixos/common.nix
new file mode 100644
index 0000000..c736938
--- /dev/null
+++ b/nixos/common.nix
@@ -0,0 +1,159 @@
+{ config, pkgs, ... }:
+
+{
+  networking.networkmanager.enable = true;
+
+  time.timeZone = "Europe/Paris";
+
+  i18n.defaultLocale = "en_US.UTF-8";
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "fr_FR.utf8";
+    LC_IDENTIFICATION = "fr_FR.utf8";
+    LC_MEASUREMENT = "fr_FR.utf8";
+    LC_MONETARY = "fr_FR.utf8";
+    LC_NAME = "fr_FR.utf8";
+    LC_NUMERIC = "fr_FR.utf8";
+    LC_PAPER = "fr_FR.utf8";
+    LC_TELEPHONE = "fr_FR.utf8";
+    LC_TIME = "fr_FR.utf8";
+  };
+
+  console = {
+    font = "sun12x22";
+    #keyMap = "fr";
+    useXkbConfig = true; # use xkbOptions in tty.
+  };
+
+  # Enable the X11 windowing system.
+  services.xserver.enable = true;
+
+  # Configure keymap in X11
+  services.xserver.layout = "fr";
+  services.xserver.xkbOptions = "caps:escape";
+
+  # Enable CUPS to print documents.
+  # services.printing.enable = true;
+
+  # Enable sound.
+  sound.enable = true;
+  hardware.pulseaudio.enable = false;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+  };
+
+  # Enable touchpad support (enabled default in most desktopManager).
+  services.xserver.libinput.enable = true;
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.lx = {
+    isNormalUser = true;
+    description = "Alex";
+    extraGroups =
+      [ "networkmanager" "wheel" "yggdrasil" ]; # Enable ‘sudo’ for the user.
+  };
+
+  nixpkgs.config.allowUnfree = true;
+  nix.gc.automatic = true;
+  nix.gc.options = "--delete-older-than 30d";
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+
+  environment.systemPackages = with pkgs; [
+    home-manager
+
+    profont
+    symbola
+
+    vim
+    vimPlugins.vim-nix
+    vimPlugins.fzf-vim
+    vimPlugins.nerdtree
+    tmux
+    git
+    git-lfs
+    pass
+    openssl
+    htop
+    powertop
+    iotop
+    jnettop
+    socat
+    nethogs
+    speedtest-cli
+    ncdu
+    dfc
+    wget
+    gcc
+    gnumake
+    rclone
+    restic
+    borgbackup
+    nomad
+    consul
+    nixfmt
+
+    alacritty
+    firefox
+    qutebrowser
+    (tor-browser-bundle-bin.override { useHardenedMalloc = false; })
+    lagrange
+    thunderbird
+    keepassxc
+    vlc
+    mpv
+    spotify
+    jellyfin-media-player
+    nheko
+  ];
+
+  programs.vim.defaultEditor = true;
+
+  programs.steam = {
+    enable = true;
+    remotePlay.openFirewall =
+      true; # Open ports in the firewall for Steam Remote Play
+    dedicatedServer.openFirewall =
+      true; # Open ports in the firewall for Source Dedicated Server
+  };
+
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  programs.mtr.enable = true;
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
+
+  # List services that you want to enable:
+
+  # Enable the OpenSSH daemon.
+  # services.openssh.enable = true;
+
+  services.yggdrasil = {
+    enable = true;
+    persistentKeys = true;
+    settings = { Peers = [ "tls://37.187.118.206:53103" ]; };
+  };
+
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
+  # Copy the NixOS configuration file and link it from the resulting system
+  # (/run/current-system/configuration.nix). This is useful in case you
+  # accidentally delete configuration.nix.
+  system.copySystemConfiguration = true;
+
+  # 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 = "22.11"; # Did you read the comment?
+}
+
diff --git a/nixos/gnome.nix b/nixos/gnome.nix
new file mode 100644
index 0000000..9d02459
--- /dev/null
+++ b/nixos/gnome.nix
@@ -0,0 +1,31 @@
+{ config, pkgs, ... }: {
+  services.xserver.displayManager.gdm.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
+  environment.gnome.excludePackages = [
+    pkgs.gnome.cheese
+    pkgs.gnome-photos
+    pkgs.gnome.gnome-music
+    #pkgs.gnome.gnome-terminal
+    pkgs.gnome.gedit
+    pkgs.epiphany
+    pkgs.gnome.geary
+    #pkgs.evince
+    #pkgs.gnome.gnome-characters
+    pkgs.gnome.totem
+    pkgs.gnome.tali
+    pkgs.gnome.iagno
+    pkgs.gnome.hitori
+    pkgs.gnome.atomix
+    pkgs.gnome-tour
+    pkgs.gnome-console
+  ];
+
+  environment.systemPackages = with pkgs; [
+    qgnomeplatform
+
+    gnome.gnome-tweaks
+    gnomeExtensions.appindicator
+    gnomeExtensions.dash-to-panel
+    gnome.gnome-terminal
+  ];
+}
diff --git a/nixos/kde.nix b/nixos/kde.nix
new file mode 100644
index 0000000..653a8eb
--- /dev/null
+++ b/nixos/kde.nix
@@ -0,0 +1,6 @@
+{ config, pkgs, ... }: {
+  services.xserver.displayManager.sddm.enable = true;
+  services.xserver.desktopManager.plasma5.enable = true;
+
+  environment.systemPackages = with pkgs.libsForQt5; [ kgpg ark ];
+}
diff --git a/nixos/kusanagi.nix b/nixos/kusanagi.nix
new file mode 100644
index 0000000..eea3f9e
--- /dev/null
+++ b/nixos/kusanagi.nix
@@ -0,0 +1,56 @@
+# 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")
+    ./common.nix
+    ./kde.nix
+    #./gnome.nix
+  ];
+
+  networking.hostName = "kusanagi";
+
+  # Use systemd-boot
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.plymouth.enable = true;
+
+  boot.initrd.availableKernelModules =
+    [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ "dm-snapshot" ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  boot.initrd.luks.devices = {
+    crypted = {
+      device = "/dev/disk/by-uuid/e3271725-effb-4b00-a5d4-8a7a64f55420";
+      allowDiscards = true;
+    };
+  };
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/2f606c6b-8009-4158-b367-2e0cf1a57ade";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/0143-7D54";
+    fsType = "vfat";
+  };
+
+  fileSystems."/home" = {
+    device = "/dev/disk/by-uuid/f955ce34-f25e-4abf-8732-bcf17465f78c";
+    fsType = "ext4";
+  };
+
+  swapDevices =
+    [{ device = "/dev/disk/by-uuid/c78cfb77-75ee-4aae-9b24-b91f8eebb7c2"; }];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  hardware.cpu.intel.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/nixos/lindy.nix b/nixos/lindy.nix
new file mode 100644
index 0000000..04ba248
--- /dev/null
+++ b/nixos/lindy.nix
@@ -0,0 +1,70 @@
+# 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")
+    ./common.nix
+    ./kde.nix
+    #./gnome.nix
+  ];
+
+  networking.hostName = "lindy";
+
+  # Use Grub
+  boot.loader.grub.enable = true;
+  boot.loader.grub.device = "nodev";
+  boot.loader.grub.extraGrubInstallArgs = [ "--bootloader-id=NixOS" ];
+  boot.loader.efi.efiSysMountPoint = "/boot/efi";
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.plymouth.enable = true;
+
+  boot.initrd.availableKernelModules =
+    [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" ];
+  boot.initrd.kernelModules = [ "dm-snapshot" ];
+  boot.kernelModules = [ "kvm-intel" "wl" ];
+  boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
+
+  boot.initrd.luks.devices = {
+    cryptssd = {
+      device = "/dev/disk/by-uuid/1b074a78-9116-420e-b872-7bf49ca10ce1";
+      allowDiscards = true;
+    };
+  };
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/2e64e6fc-ab7c-4620-b56b-faee641bd2a6";
+    fsType = "ext4";
+  };
+
+  fileSystems."/home" = {
+    device = "/dev/disk/by-uuid/1ef4b6f4-975d-4e04-9d88-0640e83ed0b4";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/0728e7e5-8e21-44bd-9287-eb066d489a0e";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot/efi" = {
+    device = "/dev/disk/by-uuid/02D0-F1C6";
+    fsType = "vfat";
+  };
+
+  swapDevices =
+    [{ device = "/dev/disk/by-uuid/5950785a-9793-4d04-b791-8f4dbc497ec3"; }];
+
+  users.users.lx.home = "/home/lx.nix";
+
+  # Nvidia graphics
+  services.xserver.videoDrivers = [ "nvidia" ];
+  hardware.opengl.enable = true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
+  hardware.cpu.intel.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
+}