From d6bd6e19ca4b3a812889bb97e41748e33aa9f08f Mon Sep 17 00:00:00 2001 From: Satria Date: Fri, 27 Feb 2026 17:30:22 +0700 Subject: [PATCH 1/2] tweaks, debloat, add kicad --- modules/home/core/apps.nix | 1 + modules/home/rice/hyprland.nix | 2 -- modules/home/rice/keybinds.nix | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/home/core/apps.nix b/modules/home/core/apps.nix index e1224f9..bea3f99 100644 --- a/modules/home/core/apps.nix +++ b/modules/home/core/apps.nix @@ -20,6 +20,7 @@ #winboat libreoffice #keepassxc + kicad-small vlc remmina moonlight-qt diff --git a/modules/home/rice/hyprland.nix b/modules/home/rice/hyprland.nix index 440d066..1c19b75 100644 --- a/modules/home/rice/hyprland.nix +++ b/modules/home/rice/hyprland.nix @@ -153,8 +153,6 @@ "no_focus on, match:class ^$, match:title ^$, match:xwayland 1, match:float 1, match:fullscreen 0, match:pin 0" "stay_focused on, suppress_event fullscreen maximize, dim_around on, float on, match:title ^(Hyprland Polkit Agent|Unlock Login Keyring|KeePassXC -.*)$" - "keep_aspect_ratio on, pin on, match:title ^(Picture in picture)$" - "float on, match:title ^(Open|Print|Save|Rename|Move|Copy|Confirm).*" "float on, match:title ^(Preferences|Settings|Options|About|Passbolt).*" "float on, match:title ^(MainPicker|Volume Control|File Operation Progress|Network Connections|Choose an Application| )$" diff --git a/modules/home/rice/keybinds.nix b/modules/home/rice/keybinds.nix index 550be25..a72eda0 100644 --- a/modules/home/rice/keybinds.nix +++ b/modules/home/rice/keybinds.nix @@ -104,6 +104,8 @@ "SUPER, R, exec, rofi -show drun -show-icons -display-drun '' -run-command \"uwsm app -- {cmd}\"" "SUPER, RETURN, exec, rofi -show window -show-icons -drun-display '' -window-format '{c} {t}'" + "SUPER CTRL, RETURN, exec, rofi rofi -dmenu -p 'run nixpkgs' -lines 0 < /dev/null | xargs -r -I {} kitty -- nix run 'nixpkgs#{}'" + "SUPER ALT, RETURN, exec, rofi rofi -dmenu -p 'shell nixpkgs' -lines 0 < /dev/null | xargs -r -I {} kitty -- nde`ix shell 'nixpkgs#{}'" "SUPER, V, exec, rofi -modi clipboard:cliphist-rofi-img -show clipboard -show-icons" # "SUPER, B, exec, rofi -show calc -modi calc -no-show-match -no-sort" From db6045113d537210b4797636d0f708e035647a82 Mon Sep 17 00:00:00 2001 From: Satria Date: Fri, 27 Feb 2026 19:37:51 +0700 Subject: [PATCH 2/2] some incomplete homelab config + scans --- flake.nix | 4 +++- lib/options.nix | 8 +++++--- modules/scans/homelab.nix | 30 ++++++++++++++++++++++++++++++ modules/system/homelab/git.nix | 3 +++ modules/system/homelab/idp.nix | 3 +++ modules/system/homelab/share.nix | 4 ++-- modules/system/server.nix | 4 ++-- 7 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 modules/scans/homelab.nix create mode 100644 modules/system/homelab/git.nix create mode 100644 modules/system/homelab/idp.nix diff --git a/flake.nix b/flake.nix index 728dfd0..a962113 100644 --- a/flake.nix +++ b/flake.nix @@ -34,7 +34,9 @@ nixosConfigWithHome = host: inputs.nixpkgs.lib.nixosSystem { inherit pkgs; - specialArgs = args; + specialArgs = { + hostname = host; + } // args; modules = [ ./hosts/${host}/config.nix inputs.ctp.nixosModules.catppuccin diff --git a/lib/options.nix b/lib/options.nix index 36a695a..bc63fd5 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -1,9 +1,7 @@ { flake-path = "~/Projects/nix-flake"; # set this to the cloned repo path - hostname = "thinkpad"; username = "satr14"; - timezone = "Asia/Jakarta"; locale = "en_US.UTF-8"; zsh-theme = "refined"; # good themes: refined, re5et, risto, amuse, afowler, pmcgee, itchy, example, strug, pygmalion, muse @@ -16,7 +14,11 @@ resume-dev = "/dev/disk/by-uuid/1721721a-bb5a-4166-a077-9500d30be2ac"; # set to swap partition to enable hibernation, e.g. /dev/disk/by-uuid/1721721a-bb5a-4166-a077-9500d30be2ac homelab = { - domain = "satr14.my.id"; + domain = "satr14.my.id"; # root domain for dns, ssl certs, reverse proxy, etc. + disks = { + share = "/dev/disk/by-uuid/1b9c8e5c-1d0a-4f2b-9c3e-7a0c8e5f6a2b"; # disk for nas share + data = "/dev/disk/by-uuid/2c3d4e5f-6a7b-8c9d-0e1f-2a3b4c5d6e7f"; # disk for app data + }; }; rice = { diff --git a/modules/scans/homelab.nix b/modules/scans/homelab.nix new file mode 100644 index 0000000..ae9dcbc --- /dev/null +++ b/modules/scans/homelab.nix @@ -0,0 +1,30 @@ +# 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 = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/e33ab472-e518-4b4d-89d1-d75cfecb9f06"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/880C-9F0A"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = [ ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; +} \ No newline at end of file diff --git a/modules/system/homelab/git.nix b/modules/system/homelab/git.nix new file mode 100644 index 0000000..49afe3d --- /dev/null +++ b/modules/system/homelab/git.nix @@ -0,0 +1,3 @@ +{ ... }: { + +} \ No newline at end of file diff --git a/modules/system/homelab/idp.nix b/modules/system/homelab/idp.nix new file mode 100644 index 0000000..49afe3d --- /dev/null +++ b/modules/system/homelab/idp.nix @@ -0,0 +1,3 @@ +{ ... }: { + +} \ No newline at end of file diff --git a/modules/system/homelab/share.nix b/modules/system/homelab/share.nix index 041a260..f0af4bf 100644 --- a/modules/system/homelab/share.nix +++ b/modules/system/homelab/share.nix @@ -4,7 +4,7 @@ enable = true; virtualHosts."cdn" = { listen = [{ ip = "*"; port = 3000; }]; - documentRoot = "/srv/dev-disk-by-uuid-f1ee1d17-e852-4e02-ae86-eaf6116a2aeb/NAS"; + documentRoot = "/mnt/share"; extraConfig = '' Options +Indexes +FollowSymLinks Require all granted @@ -22,7 +22,7 @@ "server min protocol" = "SMB2_02"; }; "NAS" = { - path = "/srv/dev-disk-by-uuid-f1ee1d17-e852-4e02-ae86-eaf6116a2aeb/NAS/"; + path = "/mnt/share"; browseable = "yes"; "read only" = "no"; "create mask" = "0664"; diff --git a/modules/system/server.nix b/modules/system/server.nix index 6e4fccf..f6010cb 100644 --- a/modules/system/server.nix +++ b/modules/system/server.nix @@ -2,8 +2,8 @@ imports = [ ./homelab/share.nix ./homelab/dns.nix + ./homelab/git.nix + ./homelab/idp.nix ./base.nix ]; - - services.openssh.enable = true; } \ No newline at end of file