flake.nix

@@ -34,9 +34,7 @@
     
     nixosConfigWithHome = host: inputs.nixpkgs.lib.nixosSystem {
       inherit pkgs;
-      specialArgs = {
+      specialArgs = args;
-        hostname = host;
-      } // args;
       modules = [
         ./hosts/${host}/config.nix
         inputs.ctp.nixosModules.catppuccin

lib/options.nix

@@ -1,7 +1,9 @@
 {
   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
@@ -14,11 +16,7 @@
   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"; # root domain for dns, ssl certs, reverse proxy, etc.
+    domain = "satr14.my.id";
-    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 = {

modules/home/core/apps.nix

@@ -20,7 +20,6 @@
       #winboat
       libreoffice
       #keepassxc
-      kicad-small
       vlc
       remmina
       moonlight-qt

modules/home/rice/hyprland.nix

@@ -153,6 +153,8 @@
         "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| )$"

modules/home/rice/keybinds.nix

@@ -104,8 +104,6 @@
 
         "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"
 

modules/scans/homelab.nix

@@ -1,30 +0,0 @@
-# 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";
-}

modules/system/homelab/git.nix

@@ -1,3 +0,0 @@
-{ ... }: {
-  
-}

modules/system/homelab/idp.nix

@@ -1,3 +0,0 @@
-{ ... }: {
-  
-}

modules/system/homelab/share.nix

@@ -4,7 +4,7 @@
       enable = true;
       virtualHosts."cdn" = {
         listen = [{ ip = "*"; port = 3000; }];
-        documentRoot = "/mnt/share";
+        documentRoot = "/srv/dev-disk-by-uuid-f1ee1d17-e852-4e02-ae86-eaf6116a2aeb/NAS";
         extraConfig = ''
           Options +Indexes +FollowSymLinks
           Require all granted
@@ -22,7 +22,7 @@
           "server min protocol" = "SMB2_02";
         };
         "NAS" = {
-          path = "/mnt/share";
+          path = "/srv/dev-disk-by-uuid-f1ee1d17-e852-4e02-ae86-eaf6116a2aeb/NAS/";
           browseable = "yes";
           "read only" = "no";
           "create mask" = "0664";

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;
 }