From 8fddd5b9825853c626de1ea7f7fcf7ec40ba7bda Mon Sep 17 00:00:00 2001
From: File Magic <file_magic@protonmail.com>
Date: Mon, 25 May 2026 10:40:05 -0400
Subject: [PATCH] add settings and programs

---
 configuration.nix          | 13 --------
 flake.nix                  |  1 -
 hardware-configuration.nix | 66 +++++++++++++++++++++++---------------
 home.nix                   | 24 +++++++++++---
 hyprland.nix               |  7 ++--
 5 files changed, 63 insertions(+), 48 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index ab4b270..09fc50f 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -3,9 +3,7 @@
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
 {
-  config,
   pkgs,
-  lib,
   ...
 }:
 
@@ -102,20 +100,9 @@
 
   # Install firefox.
   programs = {
-    firefox.enable = true;
     hyprland.enable = true;
   };
 
-  # Allow unfree packages
-  nixpkgs.config.allowUnfree = true;
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-    # neovim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-    #  wget
-  ];
-
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
diff --git a/flake.nix b/flake.nix
index 56ba3ca..0091fbf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,7 +11,6 @@
   };
   outputs =
     {
-      self,
       nixpkgs,
       home-manager,
       ...
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index db33f37..335a175 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -1,37 +1,53 @@
 # 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")
-    ];
+  config,
+  lib,
+  modulesPath,
+  ...
+}:
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot.initrd.availableKernelModules = [
+    "nvme"
+    "xhci_pci"
+    "ahci"
+    "usbhid"
+    "usb_storage"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/mapper/luks-2c1d4d31-36be-4108-8f2c-1987fd4650a8";
-      fsType = "btrfs";
-      options = [ "subvol=@" ];
-    };
-
-  boot.initrd.luks.devices."luks-2c1d4d31-36be-4108-8f2c-1987fd4650a8".device = "/dev/disk/by-uuid/2c1d4d31-36be-4108-8f2c-1987fd4650a8";
-
-  fileSystems."/home" =
-    { device = "/dev/mapper/luks-2c1d4d31-36be-4108-8f2c-1987fd4650a8";
-      fsType = "btrfs";
-      options = [ "subvol=@home" ];
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/4E60-C304";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
+  fileSystems."/" = {
+    device = "/dev/mapper/luks-2c1d4d31-36be-4108-8f2c-1987fd4650a8";
+    fsType = "btrfs";
+    options = [ "subvol=@" ];
+  };
+
+  boot.initrd.luks.devices."luks-2c1d4d31-36be-4108-8f2c-1987fd4650a8".device =
+    "/dev/disk/by-uuid/2c1d4d31-36be-4108-8f2c-1987fd4650a8";
+
+  fileSystems."/home" = {
+    device = "/dev/mapper/luks-2c1d4d31-36be-4108-8f2c-1987fd4650a8";
+    fsType = "btrfs";
+    options = [ "subvol=@home" ];
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/4E60-C304";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
 
   swapDevices = [ ];
 
diff --git a/home.nix b/home.nix
index 8016006..e78d4b4 100644
--- a/home.nix
+++ b/home.nix
@@ -1,10 +1,15 @@
 {
-  config,
+  # config,
   pkgs,
   lib,
   ...
 }:
 {
+  nixpkgs = {
+    config = {
+      allowUnfree = true;
+    };
+  };
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
   home.username = "file_magic";
@@ -43,11 +48,13 @@
     pkgs.package-version-server
     pkgs.nil
 
-    # Steam
-    #pkgs.steam
+    # gaming
+    pkgs.steam
+    # pkgs.lutris
 
     # User Applications
     pkgs.bitwarden-desktop
+    pkgs.firefox
 
     # Windows Manager
     # Screen Sharing
@@ -58,9 +65,13 @@
     # Contex Bar
     pkgs.waybar
     # app launcher
-    pkgs.hyprlauncher
+    pkgs.walker
     # lock screen
     pkgs.hyprlock
+    # screenshot
+    pkgs.grimblast
+    # xdg portal
+    pkgs.xdg-desktop-portal-hyprland
   ];
 
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
@@ -143,6 +154,11 @@
     };
     git = {
       enable = true;
+      settings = {
+        init.defaultBranch = "main";
+        user.email = "file_magic@protonmail.com";
+        user.name = "File Magic";
+      };
     };
   };
 }
diff --git a/hyprland.nix b/hyprland.nix
index d91b910..9f4be0a 100644
--- a/hyprland.nix
+++ b/hyprland.nix
@@ -205,14 +205,11 @@ in
     bind = [
       # App launchers
       (bind "SUPER + RETURN" (dsp.exec "kitty"))
-      (bind "SUPER + D" (dsp.exec "hyprlauncher"))
-      (bind "SUPER + B" (dsp.exec "zen-twilight -P default"))
-      (bind "SUPER + SPACE" (dsp.exec "walker"))
+      (bind "SUPER + D" (dsp.exec "walker"))
       (bind "SUPER + CTRL + V" (dsp.exec "walker -m clipboard"))
 
       # Screenshots
-      (bind "SUPER + CTRL + 4" (dsp.exec "grimblast copysave area"))
-      (bind "SUPER + CTRL + 5" (dsp.exec "grimblast copysave screen"))
+      (bind "SUPER + S" (dsp.exec "grimblast copysave active"))
 
       # Universal copy/paste
       (bind "SUPER + C" (dsp.sendshortcut "CTRL" "Insert"))
-- 
2.54.0