From 8ee13c38a992ab84c3c797f175839c5403f27863 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Tue, 3 Jun 2025 16:06:33 +0200 Subject: [PATCH] Remove old odin config modules --- instances/odin/common_configuration.nix | 346 ------------------------ instances/odin/configuration-intel.nix | 19 -- instances/odin/configuration-nvidia.nix | 38 --- 3 files changed, 403 deletions(-) delete mode 100644 instances/odin/common_configuration.nix delete mode 100644 instances/odin/configuration-intel.nix delete mode 100644 instances/odin/configuration-nvidia.nix diff --git a/instances/odin/common_configuration.nix b/instances/odin/common_configuration.nix deleted file mode 100644 index e139bd7..0000000 --- a/instances/odin/common_configuration.nix +++ /dev/null @@ -1,346 +0,0 @@ -{ config -, pkgs -, lib -, ... -}: -{ - - age.secrets = { - ntfy-odin = { - file = ../../secrets/ntfy-odin.age; - owner = "bertof"; - }; - odin_wg_priv.file = ../../secrets/odin_wg_priv.age; - }; - - # Use the systemd-boot EFI boot loader. - boot = { - # kernelPackages = pkgs.linuxPackages_latest; - # kernelPackages = pkgs.linuxPackages_6_7_hardened; - # kernelPackages = pkgs.linuxPackages_6_8; - kernelParams = [ "acpi_osi=Linux-Dell-Video" ]; - initrd.checkJournalingFS = true; # Use same ACPI identifier as Dell Ubuntu - loader = { - systemd-boot = { - enable = true; - editor = false; - }; - efi.canTouchEfiVariables = true; - }; - extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; - - # Cross-build arm - binfmt.emulatedSystems = [ - "armv7l-linux" - "aarch64-linux" - ]; - }; - - hardware = { - enableRedistributableFirmware = true; - - graphics.enable = true; - - # Tablet - opentabletdriver = { - enable = true; - daemon.enable = true; - }; - }; - - networking = { - hostName = "odin"; - networkmanager.enable = true; - # networkmanager.wifi.backend = "iwd"; - - # Configure network proxy if necessary - # proxy.default = "http://user:password@proxy:port/"; - # proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Open ports in the firewall. - # firewall.allowedTCPPorts = [ ... ]; - # firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # firewall.enable = false; - - # wg-quick.interfaces = { - # wg0 = { - # autostart = false; - # address = [ "10.0.0.2/24" "fdc9:281f:04d7:9ee9::2/64" ]; - # dns = [ "10.0.0.1" "fdc9:281f:04d7:9ee9::1" ]; - # privateKeyFile = config.age.secrets.odin_wg_priv.path; - - # peers = [ - # { - # # baldur - # # allowedIPs = [ "10.0.0.3/32" "fdc9:281f:04d7:9ee9::3/128" ]; - # allowedIPs = [ "0.0.0.0/0" "::/0" ]; - # endpoint = "baldur.bertof.net:51820"; - # presharedKeyFile = config.age.secrets.wg_psk.path; - # publicKey = "K57ikgFSR1O0CXWBxfQEu7uxSOsp3ePj/NMRets5pVc="; - # } - # { - # # odin - # publicKey = "LDBhvzeYmHJ0z5ch+N559GWjT3It1gZvGR/9WtCfURw="; - # presharedKeyFile = config.age.secrets.wg_psk.path; - # allowedIPs = [ "10.0.0.2/24" "fdc9:281f:04d7:9ee9::2/128" ]; - # } - # { - # # oppo - # publicKey = "OBk6bHKuIYLwD7cwjmAuMn57jXqbDwCL52jhQxiHnnA="; - # presharedKeyFile = config.age.secrets.wg_psk.path; - # allowedIPs = [ "10.0.0.3/24" "fdc9:281f:04d7:9ee9::3/128" ]; - # } - # { - # # thor - # publicKey = "rpwR6n4IE96VZAmQDBufsWE/a9G7d8fpkvY1OwsbOhk="; - # presharedKeyFile = config.age.secrets.wg_psk.path; - # allowedIPs = [ "10.0.0.4/24" "fdc9:281f:04d7:9ee9::4/128" ]; - # } - # ]; - # }; - # }; - }; - - services = { - # X11 windowing system. - xserver = { - enable = true; - # Enable the GNOME 3 Desktop Environment. - # desktopManager.gnome.enable = true; - # desktopManager.plasma5 = { - # enable = true; - # runUsingSystemd = true; - # }; - # windowManager.bspwm.enable = true; - - xkb = { - layout = "it,us"; - options = "eurosign:e,terminate:ctrl_alt_bksp,compose:rctrl,grp:menu_toggle"; - }; - - displayManager.gdm = { - enable = true; - autoSuspend = false; - }; - # displayManager.sddm = { - # enable = true; - # autoNumlock = true; - # theme = - # "${pkgs.sddm-theme-clairvoyance}/usr/share/sddm/themes/clairvoyance"; - # }; - }; - displayManager = { - enable = true; - defaultSession = "hyprland"; - }; - libinput.enable = true; - - keybase.enable = true; - - pipewire = { - enable = true; - pulse.enable = true; - jack.enable = true; - alsa = { - enable = true; - support32Bit = true; - }; - # media-session.enable = true; - }; - - # Enable CUPS to print documents. - printing = { - enable = true; - drivers = [ - pkgs.gutenprint - # pkgs.cups-kyocera - pkgs.cups-kyodialog - ]; - }; - - # Disable auto handling of power button - logind = { - powerKey = "ignore"; - lidSwitch = "hibernate"; - }; - }; - - # Set your time zone. - time.timeZone = "Europe/Rome"; - - # Select internationalisation properties. - i18n.defaultLocale = "it_IT.UTF-8"; - console = { - font = "Lat2-Terminus16"; - keyMap = "it"; - }; - - environment = { - pathsToLink = [ "/share/zsh" ]; - sessionVariables.LD_LIBRARY_PATH = lib.mkForce "${config.services.pipewire.package.jack}/lib"; # Temporary fix for WebKitGTK - systemPackages = builtins.attrValues { - inherit (pkgs) - tmux - helix - vim - git - ntfs3g - ; - }; - }; - - programs = { - dconf.enable = true; - flashrom.enable = true; - gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - steam = { - enable = true; - package = pkgs.steam.override { - extraPkgs = pkgs: [ pkgs.icu ]; - extraProfile = '' - export GSETTINGS_SCHEMA_DIR="${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}/glib-2.0/schemas/" - ''; - }; - remotePlay.openFirewall = true; - }; - zsh.enable = true; - }; - # services.joycond.enable = true; - - # Enable the OpenSSH daemon. - services.openssh = { - enable = true; - openFirewall = true; - }; - - # Cooling management - services.thermald.enable = true; - - services.smartd.enable = true; - services.snapper = { - configs = - let - common = { - ALLOW_USERS = [ "bertof" ]; - TIMELINE_CREATE = true; - TIMELINE_CLEANUP = true; - }; - in - { - bertof_home = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof"; }; - bertof_music = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Musica"; }; - bertof_downloads = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Scaricati"; }; - bertof_images = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Immagini"; }; - bertof_videos = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Video"; }; - bertof_documents = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Documenti"; }; - bertof_games_ssd = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Giochi/SSD"; }; - # bertof_games_sata = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Giochi/SATA"; }; - # bertof_games_hdd = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Giochi/HDD"; }; - bertof_git = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof/Documenti/Git"; }; - }; - }; - - hardware = { - steam-hardware.enable = true; - bluetooth = { - enable = true; - # package = pkgs.bluezFull; - }; - }; - - services = { - hardware = { - bolt.enable = true; - }; - dbus = { - packages = [ pkgs.dconf ]; - implementation = "broker"; - }; - gnome.gnome-keyring.enable = true; - blueman.enable = true; - gvfs = { - enable = true; - # package = lib.mkForce pkgs.gnome3.gvfs; - }; - tumbler.enable = true; - # tlp.enable = false; - # avahi = { - # enable = true; - # openFirewall = true; - # nssmdns4 = true; - # publish = { - # enable = true; - # addresses = true; - # domain = true; - # userServices = true; - # workstation = true; - # }; - # extraServiceFiles = { - # ssh = "${pkgs.avahi}/etc/avahi/services/ssh.service"; - # }; - # }; - # Power-profiles - power-profiles-daemon.enable = true; - fprintd = { - enable = true; - tod = { - enable = true; - driver = pkgs.libfprint-2-tod1-goodix; - }; - }; - }; - - # FPRINTD - security = { - rtkit.enable = true; - pam.services = { - xscreensaver.fprintAuth = true; - }; - }; - - # Clamav - # services.clamav = { - # daemon.enable = true; - # updater.enable = true; - # }; - - # services.teamviewer.enable = true; - - # Virtualisation - virtualisation = { - # vswitch.enable = true; - # docker.enable = true; - kvmgt.enable = true; - libvirtd = { - enable = true; - qemu.swtpm.enable = true; - }; - podman.enable = true; - # virtualbox.host.enable = true; - }; - - security.sudo.extraConfig = '' - Defaults pwfeedback - ''; - security.pam.services.sddm.enableGnomeKeyring = true; - security.pam.services.autoUnlockKwallet.enableKwallet = true; - - systemd = { - services."getty@tty1".enable = false; - services."autovt@tty1".enable = false; - }; - - zramSwap.enable = 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/instances/odin/configuration-intel.nix b/instances/odin/configuration-intel.nix deleted file mode 100644 index 4502a93..0000000 --- a/instances/odin/configuration-intel.nix +++ /dev/null @@ -1,19 +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’). - -{ - boot = { - initrd.kernelModules = [ "i915" ]; - blacklistedKernelModules = [ - "nouveau" - "nvidia" - ]; - }; - - # This runs only Intel and nvidia does not drain power. - ##### disable nvidia for a very nice battery life. - hardware.nvidiaOptimus.disable = true; - - services.xserver.videoDrivers = [ "intel" ]; -} diff --git a/instances/odin/configuration-nvidia.nix b/instances/odin/configuration-nvidia.nix deleted file mode 100644 index ab29c90..0000000 --- a/instances/odin/configuration-nvidia.nix +++ /dev/null @@ -1,38 +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’). -{ pkgs -, ... -}: -{ - boot.initrd.kernelModules = [ "i915" ]; - - hardware.nvidia = { - # modesetting.enable = true; - # package = pkgs.linuxPackages.nvidia_x11; - open = false; - prime = { - offload.enable = false; - sync.enable = true; - intelBusId = "PCI:0:2:0"; - nvidiaBusId = "PCI:1:0:0"; - }; - }; - - programs.gamemode = { - enable = true; - settings = { - custom = { - start = "${pkgs.libnotify}/bin/notify-send 'GameMode started'"; - end = "${pkgs.libnotify}/bin/notify-send 'GameMode ended'"; - }; - }; - }; - - programs.alvr = { - enable = true; - openFirewall = true; - }; - - services.xserver.videoDrivers = [ "nvidia" ]; -}