przystosowanie konfiguracji pod siebie

hosts/Garand-Desktop/default.nix

@@ -1,4 +1,5 @@
-{ ... }: {
+{ ... }:
+{
   imports = [
     ./hardware.nix
     ./host-packages.nix

hosts/Garand-Desktop/hardware.nix

@@ -1,14 +1,27 @@
 # 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, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "nvme"
+    "xhci_pci"
+    "ahci"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.initrd.luks.devices = {
     cryptroot = {
@@ -19,23 +32,30 @@
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/e3ac1df3-ce8f-44cd-901f-a8cd3f6955b7";
-      fsType = "ext4";
-    };
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/e3ac1df3-ce8f-44cd-901f-a8cd3f6955b7";
+    fsType = "ext4";
+  };
 
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/0713b82c-bf8c-424f-96e1-5d883e50b451";
-      fsType = "ext4";
-    };
+  fileSystems."/home" = {
+    device = "/dev/disk/by-uuid/0713b82c-bf8c-424f-96e1-5d883e50b451";
+    fsType = "ext4";
+  };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/783D-A507";
-      fsType = "vfat";
-      options = [ "fmask=0022" "dmask=0022" ];
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/783D-A507";
+    fsType = "vfat";
+    options = [
+      "fmask=0022"
+      "dmask=0022"
+    ];
+  };
 
-  swapDevices = [ ];
+  swapDevices = lib.mkForce [
+    {
+      device = "/dev/disk/by-uuid/8e8cc3dc-5754-4757-a2d7-53e6a2c3b5a4";
+    }
+  ];
 
   # 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

hosts/Garand-Desktop/host-packages.nix

@@ -1,7 +1,6 @@
-{pkgs, ...}: {
+{ pkgs, ... }:
+{
   environment.systemPackages = with pkgs; [
-    audacity
-    discord
-    nodejs
+    # audacity
   ];
 }

hosts/Garand-Desktop/variables.nix

@@ -9,17 +9,6 @@
   # SDDM background is set with stylixImage
   displayManager = "tui";
 
-  # Emable/disable bundled applications
-  tmuxEnable = false;
-  alacrittyEnable = false;
-  weztermEnable = false;
-  ghosttyEnable = false;
-  vscodeEnable = true;
-  # Note: This is evil-helix with VIM keybindings by default
-  helixEnable = false;
-  #To install: Enable here, zcli rebuild, then run zcli doom install
-  doomEmacsEnable = false;
-
   # Hyprland Settings
   # Examples:
   # extraMonitorSettings = "monitor = Virtual-1,1920x1080@60,auto,1";
@@ -57,26 +46,21 @@
   # Enable Printing Support
   printEnable = true;
 
-  # Enable Thunar GUI File Manager
-  # Yazi is default File Manager
-  thunarEnable = true;
-
-  # Themes, waybar and animation.
-  #  Only uncomment your selection
-  # The others much be commented out.
-
   # Set Stylix Image
   # This will set your color palette
   # Default background
-  # Add new images to ~/zaneyos/wallpapers
+  # Add new images to ~/garandos/wallpapers
   stylixImage = ../../wallpapers/attack-on-titan-mikasa-ackerman.jpg;
-  #stylixImage = ../../wallpapers/mountainscapedark.jpg;
-  #stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
-  #stylixImage = ../../wallpapers/Anime-Purple-eyes.png;
-  #stylixImage = ../../wallpapers/Rainnight.jpg;
-  #stylixImage = ../../wallpapers/zaney-wallpaper.jpg;
-  #stylixImage = ../../wallpapers/nix-wallpapers-strips-logo.jpg;
-  #stylixImage = ../../wallpapers/beautifulmountainscape.jpg;
+  #stylixImage = ../../wallpapers/DW_Pacts.jpg;
+  #stylixImage = ../../wallpapers/edward-elric-fullmetal-alchemist.jpg;
+  #stylixImage = ../../wallpapers/fire-nation.jpg;
+  #stylixImage = ../../wallpapers/four-elements.jpg;
+  #stylixImage = ../../wallpapers/Grounded_Wallpaper_4K.jpg;
+  #stylixImage = ../../wallpapers/jablon.jpg;
+  #stylixImage = ../../wallpapers/rammstein-log-two.jpg;
+  #stylixImage = ../../wallpapers/rammstein-log-one.jpg;
+  #stylixImage = ../../wallpapers/rammstein-log-three.jpg;
+  #stylixImage = ../../wallpapers/rammstein-one.jpg;
 
   # Set Waybar
   #  Available Options:
@@ -84,7 +68,7 @@
   #waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix;
   #waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix;
   #waybarChoice = ../../modules/home/waybar/waybar-simple.nix;
-  # Throwback to ZaneyOS v1.0
+  # Throwback to GarandOS v1.0
   #waybarChoice = ../../modules/home/waybar/waybar-jerry.nix;
   # Very colorful and bright colors
   #waybarChoice = ../../modules/home/waybar/waybar-nekodyke.nix;
@@ -98,8 +82,8 @@
   # animations-end4.nix (end-4 project very fluid)
   # animations-dynamic.nix (ml4w project)
   # animations-moving.nix (ml4w project)
-  animChoice = ../../modules/home/hyprland/animations-def.nix;
-  #animChoice = ../../modules/home/hyprland/animations-end4.nix;
+  # animChoice = ../../modules/home/hyprland/animations-def.nix;
+  animChoice = ../../modules/home/hyprland/animations-end4.nix;
   #animChoice = ../../modules/home/hyprland/animations-dynamic.nix;
   #animChoice = ../../modules/home/hyprland/animations-moving.nix;