From dc23fb1effdc1ab883311ee1b00709a52d2093a5 Mon Sep 17 00:00:00 2001 From: Kabbone Date: Sat, 7 Mar 2026 17:14:16 +0100 Subject: [PATCH] cleanup lights --- hosts/default.nix | 23 --- hosts/desktop/home.nix | 3 - hosts/dmz/default.nix | 2 +- hosts/dmz/home.nix | 3 - hosts/home.nix | 2 +- hosts/jupiter/default.nix | 2 +- hosts/jupiter/home.nix | 3 - hosts/kabtop/default.nix | 2 +- hosts/kabtop/home.nix | 3 - hosts/kabtopci/default.nix | 2 +- hosts/kabtopci/home.nix | 3 - hosts/kubemaster-1/default.nix | 2 +- hosts/kubemaster-1/home.nix | 3 - hosts/lifebook/default.nix | 4 - hosts/lifebook/home.nix | 3 - hosts/nas/default.nix | 74 ------- hosts/nas/hardware-configuration.nix | 255 ------------------------ hosts/nas/home.nix | 39 ---- hosts/nasbackup/default.nix | 2 +- hosts/nasbackup/home.nix | 3 - hosts/server/default.nix | 101 ---------- hosts/server/hardware-configuration.nix | 138 ------------- hosts/server/home.nix | 39 ---- hosts/steamdeck/default.nix | 4 - hosts/steamdeck/home.nix | 3 - 25 files changed, 7 insertions(+), 711 deletions(-) delete mode 100644 hosts/nas/default.nix delete mode 100644 hosts/nas/hardware-configuration.nix delete mode 100644 hosts/nas/home.nix delete mode 100644 hosts/server/default.nix delete mode 100644 hosts/server/hardware-configuration.nix delete mode 100644 hosts/server/home.nix diff --git a/hosts/default.nix b/hosts/default.nix index 84ee2d6..f802c15 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -118,29 +118,6 @@ in ]; }; - server = lib.nixosSystem { # Desktop profile - inherit system; - specialArgs = { inherit inputs user location nixos-hardware agenix nixpkgs impermanence; }; - modules = [ - agenix.nixosModules.default - microvm.nixosModules.host - ./server - ./configuration_server.nix - ../modules/hardware/hydraCache.nix - nixos-hardware.nixosModules.common-cpu-amd - nixos-hardware.nixosModules.common-pc-ssd - - home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { inherit user; }; - home-manager.users.${user} = { - imports = [(import ./home_server.nix)] ++ [(import ./server/home.nix)]; - }; - } - ]; - }; - kabtop = lib.nixosSystem { # Desktop profile inherit system; specialArgs = { inherit inputs user location nixos-hardware agenix nixpkgs pkgs-unstable impermanence; }; diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index e602304..e0516fc 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -36,9 +36,6 @@ nitrokey-app kicad - # Display - #light # xorg.xbacklight not supported. Other option is just use xrandr. - # Power Management #auto-cpufreq # Power management #tlp # Power management diff --git a/hosts/dmz/default.nix b/hosts/dmz/default.nix index d2bcc94..29033ab 100644 --- a/hosts/dmz/default.nix +++ b/hosts/dmz/default.nix @@ -39,7 +39,7 @@ }; }; - programs = { # No xbacklight, this is the alterantive + programs = { zsh.enable = true; }; diff --git a/hosts/dmz/home.nix b/hosts/dmz/home.nix index 03d34bb..a086573 100644 --- a/hosts/dmz/home.nix +++ b/hosts/dmz/home.nix @@ -23,9 +23,6 @@ packages = with pkgs; [ # Applications - # Display - #light # xorg.xbacklight not supported. Other option is just use xrandr. - # Power Management #auto-cpufreq # Power management #tlp # Power management diff --git a/hosts/home.nix b/hosts/home.nix index dce2c91..9e245c2 100644 --- a/hosts/home.nix +++ b/hosts/home.nix @@ -59,7 +59,7 @@ hdparm python3 android-tools - calibre + #calibre mtpfs vimiv-qt freecad diff --git a/hosts/jupiter/default.nix b/hosts/jupiter/default.nix index ae5c96b..5a24cdb 100644 --- a/hosts/jupiter/default.nix +++ b/hosts/jupiter/default.nix @@ -48,7 +48,7 @@ # ]; # }; - programs = { # No xbacklight, this is the alterantive + programs = { zsh.enable = true; ssh.startAgent = false; gnupg.agent = { diff --git a/hosts/jupiter/home.nix b/hosts/jupiter/home.nix index 03d34bb..a086573 100644 --- a/hosts/jupiter/home.nix +++ b/hosts/jupiter/home.nix @@ -23,9 +23,6 @@ packages = with pkgs; [ # Applications - # Display - #light # xorg.xbacklight not supported. Other option is just use xrandr. - # Power Management #auto-cpufreq # Power management #tlp # Power management diff --git a/hosts/kabtop/default.nix b/hosts/kabtop/default.nix index c6f538d..4416df0 100644 --- a/hosts/kabtop/default.nix +++ b/hosts/kabtop/default.nix @@ -55,7 +55,7 @@ }; }; - programs = { # No xbacklight, this is the alterantive + programs = { zsh.enable = true; ssh.startAgent = false; gnupg.agent = { diff --git a/hosts/kabtop/home.nix b/hosts/kabtop/home.nix index 03d34bb..a086573 100644 --- a/hosts/kabtop/home.nix +++ b/hosts/kabtop/home.nix @@ -23,9 +23,6 @@ packages = with pkgs; [ # Applications - # Display - #light # xorg.xbacklight not supported. Other option is just use xrandr. - # Power Management #auto-cpufreq # Power management #tlp # Power management diff --git a/hosts/kabtopci/default.nix b/hosts/kabtopci/default.nix index 46d626f..19876aa 100644 --- a/hosts/kabtopci/default.nix +++ b/hosts/kabtopci/default.nix @@ -38,7 +38,7 @@ }; }; - programs = { # No xbacklight, this is the alterantive + programs = { zsh.enable = true; }; diff --git a/hosts/kabtopci/home.nix b/hosts/kabtopci/home.nix index 03d34bb..a086573 100644 --- a/hosts/kabtopci/home.nix +++ b/hosts/kabtopci/home.nix @@ -23,9 +23,6 @@ packages = with pkgs; [ # Applications - # Display - #light # xorg.xbacklight not supported. Other option is just use xrandr. - # Power Management #auto-cpufreq # Power management #tlp # Power management diff --git a/hosts/kubemaster-1/default.nix b/hosts/kubemaster-1/default.nix index aac8d62..4a0ae57 100644 --- a/hosts/kubemaster-1/default.nix +++ b/hosts/kubemaster-1/default.nix @@ -39,7 +39,7 @@ }; }; - programs = { # No xbacklight, this is the alterantive + programs = { zsh.enable = true; }; diff --git a/hosts/kubemaster-1/home.nix b/hosts/kubemaster-1/home.nix index 03d34bb..a086573 100644 --- a/hosts/kubemaster-1/home.nix +++ b/hosts/kubemaster-1/home.nix @@ -23,9 +23,6 @@ packages = with pkgs; [ # Applications - # Display - #light # xorg.xbacklight not supported. Other option is just use xrandr. - # Power Management #auto-cpufreq # Power management #tlp # Power management diff --git a/hosts/lifebook/default.nix b/hosts/lifebook/default.nix index f92b64a..2988b2c 100644 --- a/hosts/lifebook/default.nix +++ b/hosts/lifebook/default.nix @@ -58,10 +58,6 @@ ]; }; - programs = { # No xbacklight, this is the alterantive - light.enable = true; - }; - systemd.sleep.extraConfig = "HibernateDelaySec=1h"; services = { logind.settings.Login.HandleLidSwitch = "suspend-then-hibernate"; # Laptop does not go to sleep when lid is closed diff --git a/hosts/lifebook/home.nix b/hosts/lifebook/home.nix index 6d3e2e3..406e926 100644 --- a/hosts/lifebook/home.nix +++ b/hosts/lifebook/home.nix @@ -33,9 +33,6 @@ intel-gpu-tools pulsemixer - # Display - light # xorg.xbacklight not supported. Other option is just use xrandr. - # Power Management #auto-cpufreq # Power management #tlp # Power management diff --git a/hosts/nas/default.nix b/hosts/nas/default.nix deleted file mode 100644 index 2788530..0000000 --- a/hosts/nas/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -# -# Specific system configuration settings for desktop -# -# flake.nix -# ├─ ./hosts -# │ └─ ./laptop -# │ ├─ default.nix * -# │ └─ hardware-configuration.nix -# └─ ./modules -# ├─ ./desktop -# │ └─ ./hyprland -# │ └─ hyprland.nix -# ├─ ./modules -# │ └─ ./programs -# │ └─ waybar.nix -# └─ ./hardware -# └─ default.nix -# - -{ config, pkgs, user, ... }: - -{ - imports = # For now, if applying to other system, swap files - [(import ./hardware-configuration.nix)] ++ # Current system hardware config @ /etc/nixos/hardware-configuration.nix - (import ../../modules/wm/virtualisation) ++ # Docker - (import ../../modules/services/nas) ++ # Server Services - (import ../../modules/hardware); # Hardware devices - - boot = { # Boot options - kernelPackages = pkgs.linuxPackages_latest; - - loader = { # EFI Boot - systemd-boot.enable = true; - efi = { - canTouchEfiVariables = true; - efiSysMountPoint = "/boot"; - }; - timeout = 1; # Grub auto select time - }; - }; - -# environment = { -# systemPackages = with pkgs; [ -## simple-scan -## intel-media-driver -## alacritty -# ]; -# }; - - programs = { # No xbacklight, this is the alterantive - zsh.enable = true; - ssh.startAgent = false; - gnupg.agent = { - enable = false; - enableSSHSupport = true; - pinentryPackage = pkgs.pinentry-curses; - }; - }; - - services = { - #auto-cpufreq.enable = true; - avahi = { # Needed to find wireless printer - enable = true; - nssmdns = true; - publish = { # Needed for detecting the scanner - enable = true; - addresses = true; - userServices = true; - }; - }; - - }; - -} diff --git a/hosts/nas/hardware-configuration.nix b/hosts/nas/hardware-configuration.nix deleted file mode 100644 index 6217b65..0000000 --- a/hosts/nas/hardware-configuration.nix +++ /dev/null @@ -1,255 +0,0 @@ -# -# Hardware settings for Teclast F5 10" Laptop -# NixOS @ sda2 -# -# flake.nix -# └─ ./hosts -# └─ ./laptop -# └─ hardware-configuration.nix * -# -# 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 + "/profiles/qemu-guest.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; - boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ]; - boot.initrd.secrets = { - "/root/NASKeyfile" = - /root/NASKeyfile; - }; - boot.initrd.luks.devices = { - NAS-RAID1 = { - device = "/dev/disk/by-uuid/57e6446d-faca-4b67-9063-e8d9afb80088"; - keyFile = "/root/NASKeyfile"; - }; - NAS-RAID2 = { - device = "/dev/disk/by-uuid/b9edc489-ac37-4b28-981d-442722df7ae2"; - keyFile = "/root/NASKeyfile"; - }; - }; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - boot.tmp.useTmpfs = false; - boot.tmp.cleanOnBoot = true; - zramSwap.enable = true; - - services.btrfs.autoScrub = { - enable = true; - interval = "monthly"; - fileSystems = [ - "/" - "/mnt/Pluto" - ]; - }; - - services.btrbk = { - instances = { - hf = { - onCalendar = "hourly"; - settings = { - incremental = "yes"; - snapshot_create = "ondemand"; - snapshot_dir = "@snapshots"; - timestamp_format = "long"; - - snapshot_preserve = "2m 2w 5d 5h"; - snapshot_preserve_min = "latest"; - - volume = { - "/mnt/snapshots/root" = { - snapshot_create = "always"; - subvolume = { - "@" = {}; - "@home" = {}; - "@nas/Home" = {}; - }; - }; - }; - }; - }; - lf = { - onCalendar = "daily"; - settings = { - incremental = "yes"; - snapshot_create = "ondemand"; - snapshot_dir = "@snapshots"; - timestamp_format = "long"; - - snapshot_preserve = "2m 2w 5d"; - snapshot_preserve_min = "latest"; - - volume = { - "/mnt/snapshots/Pluto" = { - snapshot_create = "always"; - subvolume = { - "@" = {}; - "@/Backups" = {}; - "@/Games" = {}; - "@/IT" = {}; - "@/Media" = {}; - "@/Pictures" = {}; - "@/Rest" = {}; - }; - }; - }; - }; - }; - }; - }; - - fileSystems."/" = - { device = "/dev/disk/by-label/NIXROOT"; - fsType = "btrfs"; - options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async" ]; - }; - - fileSystems."/home" = - { device = "/dev/disk/by-label/NIXROOT"; - fsType = "btrfs"; - options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async" ]; - }; - - fileSystems."/srv" = - { device = "/dev/disk/by-label/NIXROOT"; - fsType = "btrfs"; - options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async" ]; - }; - - fileSystems."/nix" = - { device = "/dev/disk/by-label/NIXROOT"; - fsType = "btrfs"; - options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async" ]; - }; - - fileSystems."/swap" = - { device = "/dev/disk/by-label/NIXROOT"; - fsType = "btrfs"; - options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async" ]; - }; - - fileSystems."/mnt/snapshots/root" = - { device = "/dev/disk/by-label/NIXROOT"; - fsType = "btrfs"; - options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ]; - }; - - fileSystems."/mnt/snapshots/Mars" = - { device = "/dev/disk/by-label/NIXROOT"; - fsType = "btrfs"; - options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ]; - }; - - fileSystems."/mnt/snapshots/Pluto" = - { device = "/dev/disk/by-label/NAS-RAID"; - fsType = "btrfs"; - options = [ "compress=zstd,space_cache=v2,noatime,subvolid=5" ]; - }; - - fileSystems."/mnt/Pluto" = - { device = "/dev/disk/by-label/NAS-RAID"; - fsType = "btrfs"; - options = [ "compress=zstd,space_cache=v2,noatime,subvol=@" ]; - }; - - fileSystems."/mnt/Mars" = - { device = "/dev/disk/by-label/NIXROOT"; - fsType = "btrfs"; - options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nas,discard=async" ]; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-label/NIXBOOT"; - fsType = "vfat"; - }; - - fileSystems."/export/Pluto" = - { device = "/mnt/Pluto"; - options = [ "bind" ]; - }; - - fileSystems."/export/Mars" = - { device = "/mnt/Mars"; - options = [ "bind" ]; - }; - - swapDevices = [ { device = "/swap/swapfile"; } ]; - - networking = { - vswitches = { - vs0 = { - interfaces = { - enp0s31f6 = { }; - lo1 = { - type = "internal"; - }; - enp0s31f6iot = { - type = "internal"; - vlan = 100; - }; - }; - }; - }; - useDHCP = false; # Deprecated - hostName = "nas"; - domain = "home.opel-online.de"; - networkmanager = { - enable = false; - }; - timeServers = [ - "192.168.2.1" - ]; - interfaces = { -# enp0s31f6 = { -# useDHCP = true; # For versatility sake, manually edit IP on nm-applet. -# ipv4.addresses = [ { -# address = "45.142.114.153"; -# prefixLength = 24; -# } ]; -# ipv6.addresses = [ { -# address = "2a00:ccc1:101:19D::2"; -# prefixLength = 64; -# } ]; -# }; - lo1 = { - useDHCP = true; - macAddress = "f6:14:f3:7b:1f:f7"; - }; - }; -# defaultGateway = "45.142.114.1"; - defaultGateway6 = { - address = "fe80::1"; - interface = "lo1"; - }; -# nameservers = [ "9.9.9.9" "2620:fe::fe" ]; - #firewall = { - # enable = false; - # #allowedUDPPorts = [ 53 67 ]; - # #allowedTCPPorts = [ 53 80 443 9443 ]; - #}; - }; - - systemd.services = { - "ovsdb".partOf = [ "network-setup.service" ]; - "ovs-vswitchd".partOf = [ "network-setup.service" ]; - "network-addresses-lo1" = { - requires = [ "network-setup.service" ]; - }; - }; - - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - powerManagement = { - cpuFreqGovernor = lib.mkDefault "powersave"; - powertop.enable = true; - powerUpCommands = '' - ${pkgs.hdparm}/sbin/hdparm -S 150 /dev/disk/by-uuid/57e6446d-faca-4b67-9063-e8d9afb80088 - ${pkgs.hdparm}/sbin/hdparm -S 150 /dev/disk/by-uuid/b9edc489-ac37-4b28-981d-442722df7ae2 - ''; - }; - -} diff --git a/hosts/nas/home.nix b/hosts/nas/home.nix deleted file mode 100644 index 03d34bb..0000000 --- a/hosts/nas/home.nix +++ /dev/null @@ -1,39 +0,0 @@ -# -# Home-manager configuration for laptop -# -# flake.nix -# ├─ ./hosts -# │ └─ ./laptop -# │ └─ home.nix * -# └─ ./modules -# └─ ./desktop -# └─ ./hyprland -# └─ hyprland.nix -# - -{ pkgs, ... }: - -{ - imports = - [ - ../../modules/home.nix # Window Manager - ]; - - home = { # Specific packages for laptop - packages = with pkgs; [ - # Applications - - # Display - #light # xorg.xbacklight not supported. Other option is just use xrandr. - - # Power Management - #auto-cpufreq # Power management - #tlp # Power management - ]; - }; - - programs = { - alacritty.settings.font.size = 11; - }; - -} diff --git a/hosts/nasbackup/default.nix b/hosts/nasbackup/default.nix index e16db95..7315f8b 100644 --- a/hosts/nasbackup/default.nix +++ b/hosts/nasbackup/default.nix @@ -39,7 +39,7 @@ }; }; - programs = { # No xbacklight, this is the alterantive + programs = { zsh.enable = true; ssh.startAgent = false; gnupg.agent = { diff --git a/hosts/nasbackup/home.nix b/hosts/nasbackup/home.nix index 03d34bb..a086573 100644 --- a/hosts/nasbackup/home.nix +++ b/hosts/nasbackup/home.nix @@ -23,9 +23,6 @@ packages = with pkgs; [ # Applications - # Display - #light # xorg.xbacklight not supported. Other option is just use xrandr. - # Power Management #auto-cpufreq # Power management #tlp # Power management diff --git a/hosts/server/default.nix b/hosts/server/default.nix deleted file mode 100644 index 7c927b7..0000000 --- a/hosts/server/default.nix +++ /dev/null @@ -1,101 +0,0 @@ -# -# Specific system configuration settings for desktop -# -# flake.nix -# ├─ ./hosts -# │ └─ ./laptop -# │ ├─ default.nix * -# │ └─ hardware-configuration.nix -# └─ ./modules -# ├─ ./desktop -# │ └─ ./hyprland -# │ └─ hyprland.nix -# ├─ ./modules -# │ └─ ./programs -# │ └─ waybar.nix -# └─ ./hardware -# └─ default.nix -# - -{ config, pkgs, user, agenix, impermanence, ... }: - -{ - imports = # For now, if applying to other system, swap files - [(import ./hardware-configuration.nix)] ++ # Current system hardware config @ /etc/nixos/hardware-configuration.nix - [(import ../../modules/wm/virtualisation/docker.nix)] ++ # Docker - (import ../../modules/services/server) ++ # Server Services - (import ../../modules/hardware); # Hardware devices - - boot = { # Boot options - kernelPackages = pkgs.linuxPackages_latest; - - loader = { # EFI Boot - grub = { - enable = true; - device = "/dev/sda"; - }; - timeout = 1; # Grub auto select time - }; - }; - - environment = { - etc = { - "fail2ban/filter.d/gitea.conf" = { - source = ../../modules/services/server/fail2ban/filter/gitea.conf; - mode = "0444"; - }; - "fail2ban/filter.d/nextcloud.conf" = { - source = ../../modules/services/server/fail2ban/filter/nextcloud.conf; - mode = "0444"; - }; - }; - }; - - programs = { # No xbacklight, this is the alterantive - zsh.enable = true; - ssh.startAgent = false; - gnupg.agent = { - enable = true; - enableSSHSupport = true; - pinentryPackage = pkgs.pinentry-curses; - }; - }; - - services = { - #auto-cpufreq.enable = true; - qemuGuest.enable = true; - #avahi = { # Needed to find wireless printer - # enable = true; - # nssmdns = true; - # publish = { # Needed for detecting the scanner - # enable = true; - # addresses = true; - # userServices = true; - # }; - #}; - fail2ban = { - enable = true; - maxretry = 5; - jails.DEFAULT.settings = { - findtime = "15m"; - }; - jails = { - gitea = '' - enabled = true - filter = gitea - backend = systemd - action = iptables-allports - ''; - nextcloud = '' - backend = auto - enabled = true - filter = nextcloud - logpath = /var/lib/nextcloud/data/nextcloud.log - action = iptables-allports - ''; - }; - }; - - }; - -} diff --git a/hosts/server/hardware-configuration.nix b/hosts/server/hardware-configuration.nix deleted file mode 100644 index 05539e5..0000000 --- a/hosts/server/hardware-configuration.nix +++ /dev/null @@ -1,138 +0,0 @@ -# -# Hardware settings for Teclast F5 10" Laptop -# NixOS @ sda2 -# -# flake.nix -# └─ ./hosts -# └─ ./laptop -# └─ hardware-configuration.nix * -# -# 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 + "/profiles/qemu-guest.nix") - ]; - - boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "ahci" "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - boot.tmp.useTmpfs = false; - boot.tmp.cleanOnBoot = true; - zramSwap.enable = true; - - services.btrfs.autoScrub = { - enable = true; - interval = "monthly"; - fileSystems = [ - "/" - ]; - }; - - services.btrbk = { - instances = { - hf = { - onCalendar = "hourly"; - settings = { - incremental = "yes"; - snapshot_create = "ondemand"; - snapshot_dir = "@snapshots"; - timestamp_format = "long"; - - snapshot_preserve = "2m 2w 5d 5h"; - snapshot_preserve_min = "latest"; - - volume = { - "/mnt/snapshots/root" = { - snapshot_create = "always"; - subvolume = { - "@" = {}; - "@home" = {}; - }; - }; - }; - }; - }; - }; - }; - - fileSystems."/" = - { device = "/dev/disk/by-label/NIXROOT"; - fsType = "btrfs"; - options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async" ]; - }; - - fileSystems."/home" = - { device = "/dev/disk/by-label/NIXROOT"; - fsType = "btrfs"; - options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async" ]; - }; - - fileSystems."/srv" = - { device = "/dev/disk/by-label/NIXROOT"; - fsType = "btrfs"; - options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async" ]; - }; - - fileSystems."/nix" = - { device = "/dev/disk/by-label/NIXROOT"; - fsType = "btrfs"; - options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async" ]; - }; - - fileSystems."/swap" = - { device = "/dev/disk/by-label/NIXROOT"; - fsType = "btrfs"; - options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async" ]; - }; - - fileSystems."/mnt/snapshots/root" = - { device = "/dev/disk/by-label/NIXROOT"; - fsType = "btrfs"; - options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ]; - }; - - - #swapDevices = [ { device = "/swap/swapfile"; } ]; - swapDevices = [ ]; - - networking = { - useDHCP = false; # Deprecated - hostName = "kabtop"; - domain = "kabtop.de"; - networkmanager = { - enable = false; - }; - interfaces = { - ens18 = { - useDHCP = false; # For versatility sake, manually edit IP on nm-applet. - ipv4.addresses = [ { - address = "45.142.114.153"; - prefixLength = 24; - } ]; - ipv6.addresses = [ { - address = "2a00:ccc1:101:19D::2"; - prefixLength = 64; - } ]; - }; - }; - defaultGateway = "45.142.114.1"; - defaultGateway6 = { - address = "fe80::1"; - interface = "ens18"; - }; - - nameservers = [ "9.9.9.9" "2620:fe::fe" ]; - firewall = { - enable = true; - allowedUDPPorts = [ ]; - allowedTCPPorts = [ 80 443 ]; - }; - }; - - #hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/server/home.nix b/hosts/server/home.nix deleted file mode 100644 index 03d34bb..0000000 --- a/hosts/server/home.nix +++ /dev/null @@ -1,39 +0,0 @@ -# -# Home-manager configuration for laptop -# -# flake.nix -# ├─ ./hosts -# │ └─ ./laptop -# │ └─ home.nix * -# └─ ./modules -# └─ ./desktop -# └─ ./hyprland -# └─ hyprland.nix -# - -{ pkgs, ... }: - -{ - imports = - [ - ../../modules/home.nix # Window Manager - ]; - - home = { # Specific packages for laptop - packages = with pkgs; [ - # Applications - - # Display - #light # xorg.xbacklight not supported. Other option is just use xrandr. - - # Power Management - #auto-cpufreq # Power management - #tlp # Power management - ]; - }; - - programs = { - alacritty.settings.font.size = 11; - }; - -} diff --git a/hosts/steamdeck/default.nix b/hosts/steamdeck/default.nix index f9ab795..5c0cec7 100644 --- a/hosts/steamdeck/default.nix +++ b/hosts/steamdeck/default.nix @@ -58,10 +58,6 @@ nitrokey.enable = true; }; - programs = { # No xbacklight, this is the alterantive - light.enable = true; - }; - services = { # blueman.enable = true; printing = { # Printing and drivers for TS5300 diff --git a/hosts/steamdeck/home.nix b/hosts/steamdeck/home.nix index 7336a31..bccec77 100644 --- a/hosts/steamdeck/home.nix +++ b/hosts/steamdeck/home.nix @@ -38,9 +38,6 @@ pulsemixer #yuzu-early-access - # Display - light # xorg.xbacklight not supported. Other option is just use xrandr. - # Power Management #auto-cpufreq # Power management #tlp # Power management